Rustfmt

examples/input_validation.rs

@@ -8,7 +8,7 @@ struct InputValidator {}
 
 impl Validator for InputValidator {
     fn validate(&self, ctx: &mut ValidationContext) -> Result<ValidationResult, ReadlineError> {
-        use ValidationResult::{Incomplete,Invalid, Valid};
+        use ValidationResult::{Incomplete, Invalid, Valid};
         let input = ctx.input();
         let result = if !input.starts_with("SELECT") {
             Invalid(Some(" --< Expect: SELECT stmt".to_owned()))

rustfmt.toml

@@ -2,3 +2,12 @@ wrap_comments = true
 format_strings = true
 error_on_unformatted = false
 reorder_impl_items = true
+
+condense_wildcard_suffixes = true
+format_code_in_doc_comments = true
+format_macro_matchers = true
+format_macro_bodies = true
+#merge_imports = true
+normalize_doc_attributes = true
+use_field_init_shorthand = true
+use_try_shorthand = true

src/edit.rs

@@ -89,7 +89,7 @@ impl<'out, 'prompt, H: Helper> State<'out, 'prompt, H> {
                 self.refresh_line()?;
                 continue;
             }
-            if let Ok(Cmd::Replace(_, _)) = rc {
+            if let Ok(Cmd::Replace(..)) = rc {
                 self.changes.borrow_mut().begin();
             }
             return rc;

src/keymap.rs

@@ -106,24 +106,24 @@ impl Cmd {
             Cmd::Kill(Movement::BackwardChar(_)) | Cmd::Kill(Movement::ForwardChar(_)) => true,
             Cmd::ClearScreen
             | Cmd::Kill(_)
-            | Cmd::Replace(_, _)
+            | Cmd::Replace(..)
             | Cmd::Noop
             | Cmd::Suspend
-            | Cmd::Yank(_, _)
+            | Cmd::Yank(..)
             | Cmd::YankPop => false,
             _ => true,
         }
     }
 
     fn is_repeatable_change(&self) -> bool {
         match *self {
-            Cmd::Insert(_, _)
+            Cmd::Insert(..)
             | Cmd::Kill(_)
-            | Cmd::ReplaceChar(_, _)
-            | Cmd::Replace(_, _)
-            | Cmd::SelfInsert(_, _)
+            | Cmd::ReplaceChar(..)
+            | Cmd::Replace(..)
+            | Cmd::SelfInsert(..)
             | Cmd::ViYankTo(_)
-            | Cmd::Yank(_, _) => true,
+            | Cmd::Yank(..) => true,
             // Cmd::TransposeChars | TODO Validate
             _ => false,
         }
@@ -765,9 +765,9 @@ impl InputState {
         };
         debug!(target: "rustyline", "Vi insert: {:?}", cmd);
         if cmd.is_repeatable_change() {
-            if let (Cmd::Replace(_, _), Cmd::SelfInsert(_, _)) = (&self.last_cmd, &cmd) {
+            if let (Cmd::Replace(..), Cmd::SelfInsert(..)) = (&self.last_cmd, &cmd) {
                 // replacing...
-            } else if let (Cmd::SelfInsert(_, _), Cmd::SelfInsert(_, _)) = (&self.last_cmd, &cmd) {
+            } else if let (Cmd::SelfInsert(..), Cmd::SelfInsert(..)) = (&self.last_cmd, &cmd) {
                 // inserting...
             } else {
                 self.last_cmd = cmd.clone();