Rustfmt
diff --git a/src/keymap.rs b/src/keymap.rs
index fdb15d2..b370600 100644
--- a/src/keymap.rs
+++ b/src/keymap.rs
@@ -7,7 +7,7 @@
use config::EditMode;
use consts::KeyPress;
use tty::RawReader;
-use super::{Result, Refresher};
+use super::{Refresher, Result};
/// The number of times one command should be repeated.
pub type RepeatCount = usize;
@@ -280,7 +280,12 @@
}
// TODO dynamic prompt (arg: ?)
- fn emacs_digit_argument<R: RawReader>(&mut self, rdr: &mut R, wrt: &mut Refresher, digit: char) -> Result<KeyPress> {
+ fn emacs_digit_argument<R: RawReader>(
+ &mut self,
+ rdr: &mut R,
+ wrt: &mut Refresher,
+ digit: char,
+ ) -> Result<KeyPress> {
match digit {
'0'...'9' => {
self.num_args = digit.to_digit(10).unwrap() as i16;
@@ -307,8 +312,8 @@
KeyPress::Char('-') | KeyPress::Meta('-') => {}
_ => {
try!(wrt.refresh_line());
- return Ok(key)
- },
+ return Ok(key);
+ }
};
}
}
@@ -403,7 +408,12 @@
Ok(cmd)
}
- fn vi_arg_digit<R: RawReader>(&mut self, rdr: &mut R, wrt: &mut Refresher, digit: char) -> Result<KeyPress> {
+ fn vi_arg_digit<R: RawReader>(
+ &mut self,
+ rdr: &mut R,
+ wrt: &mut Refresher,
+ digit: char,
+ ) -> Result<KeyPress> {
self.num_args = digit.to_digit(10).unwrap() as i16;
loop {
try!(wrt.refresh_prompt_and_line(&format!("(arg: {}) ", self.num_args)));
@@ -419,8 +429,8 @@
}
_ => {
try!(wrt.refresh_line());
- return Ok(key)
- },
+ return Ok(key);
+ }
};
}
}
diff --git a/src/lib.rs b/src/lib.rs
index eb1b9e3..ec458d3 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -189,7 +189,6 @@
let hint = self.hint();
self.refresh(prompt, prompt_size, hint)
}
-
}
impl<'out, 'prompt> fmt::Debug for State<'out, 'prompt> {
@@ -268,7 +267,13 @@
}
// Yank/paste `text` at current position.
-fn edit_yank(s: &mut State, edit_state: &EditState, text: &str, anchor: Anchor, n: RepeatCount) -> Result<()> {
+fn edit_yank(
+ s: &mut State,
+ edit_state: &EditState,
+ text: &str,
+ anchor: Anchor,
+ n: RepeatCount,
+) -> Result<()> {
if let Anchor::After = anchor {
s.line.move_forward(1);
}
@@ -823,12 +828,7 @@
let mut stdout = editor.term.create_writer();
editor.reset_kill_ring();
- let mut s = State::new(
- &mut stdout,
- prompt,
- editor.history.len(),
- hinter,
- );
+ let mut s = State::new(&mut stdout, prompt, editor.history.len(), hinter);
let mut edit_state = EditState::new(&editor.config, Rc::clone(&editor.custom_bindings));
s.line.set_delete_listener(editor.kill_ring.clone());
@@ -1412,7 +1412,13 @@
let keys = &[KeyPress::Enter];
let mut rdr = keys.iter();
let completer = SimpleCompleter;
- let cmd = super::complete_line(&mut rdr, &mut s, &mut edit_state, &completer, &Config::default()).unwrap();
+ let cmd = super::complete_line(
+ &mut rdr,
+ &mut s,
+ &mut edit_state,
+ &completer,
+ &Config::default(),
+ ).unwrap();
assert_eq!(Some(Cmd::AcceptLine), cmd);
assert_eq!("rust", s.line.as_str());
assert_eq!(4, s.line.pos());
diff --git a/src/undo.rs b/src/undo.rs
index f8adf62..639638b 100644
--- a/src/undo.rs
+++ b/src/undo.rs
@@ -132,10 +132,7 @@
fn insert_char(idx: usize, c: char) -> Change {
let mut text = String::new();
text.push(c);
- Change::Insert {
- idx,
- text,
- }
+ Change::Insert { idx, text }
}
pub fn insert(&mut self, idx: usize, c: char) {
