Bump rustyline (#1644)

* Bump rustyline

* Fix new clippy warnings

* Add pipeline command

.azure/azure-pipelines.yml

@@ -37,6 +37,8 @@ steps:
       fi
       if [ "$(uname)" == "Darwin" ]; then
         curl https://sh.rustup.rs -sSf | sh -s -- -y --no-modify-path --default-toolchain "stable"
+        echo "Installing clippy"
+        rustup component add clippy --toolchain stable-x86_64-apple-darwin
         export PATH=$HOME/.cargo/bin:$PATH
       fi
       rustup update

Cargo.lock

@@ -3175,9 +3175,9 @@ dependencies = [
 
 [[package]]
 name = "rustyline"
-version = "6.1.1"
+version = "6.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "61a7384a84da856bd163ef2c22982c816b0bcedaf17978ec13d8e0e277ddc332"
+checksum = "1cd20b28d972040c627e209eb29f19c24a71a19d661cc5a220089176e20ee202"
 dependencies = [
  "cfg-if",
  "dirs 2.0.2",
@@ -3185,6 +3185,7 @@ dependencies = [
  "log",
  "memchr",
  "nix 0.17.0",
+ "scopeguard",
  "unicode-segmentation",
  "unicode-width",
  "utf8parse 0.2.0",

crates/nu-cli/Cargo.toml

@@ -64,7 +64,7 @@ query_interface = "0.3.5"
 rand = "0.7"
 regex = "1"
 roxmltree = "0.10.1"
-rustyline = "6.1.1"
+rustyline = "6.1.2"
 serde = { version = "1.0.106", features = ["derive"] }
 serde-hjson = "0.9.1"
 serde_bytes = "0.11.3"

crates/nu-cli/src/data/value.rs

@@ -110,8 +110,6 @@ pub fn compare_values(
     left: &UntaggedValue,
     right: &UntaggedValue,
 ) -> Result<bool, (&'static str, &'static str)> {
-    match operator {
-        _ => {
     let coerced = coerce_compare(left, right)?;
     let ordering = coerced.compare();
 
@@ -119,9 +117,7 @@ pub fn compare_values(
 
     let result = match (operator, ordering) {
         (Operator::Equal, Ordering::Equal) => true,
-                (Operator::NotEqual, Ordering::Less) | (Operator::NotEqual, Ordering::Greater) => {
+        (Operator::NotEqual, Ordering::Less) | (Operator::NotEqual, Ordering::Greater) => true,
-                    true
-                }
         (Operator::LessThan, Ordering::Less) => true,
         (Operator::GreaterThan, Ordering::Greater) => true,
         (Operator::GreaterThanOrEqual, Ordering::Greater)
@@ -132,8 +128,6 @@ pub fn compare_values(
     };
 
     Ok(result)
-        }
-    }
 }
 
 pub fn format_type<'a>(value: impl Into<&'a UntaggedValue>, width: usize) -> String {

crates/nu-cli/src/shell/help_shell.rs

@@ -204,14 +204,11 @@ impl Shell for HelpShell {
         let mut possible_completion = vec![];
         let commands = self.commands();
         for cmd in commands {
-            match cmd {
+            let Value { value, .. } = cmd;
-                Value { value, .. } => {
             for desc in value.data_descriptors() {
                 possible_completion.push(desc);
             }
         }
-            }
-        }
 
         let line_chars: Vec<_> = line.chars().collect();
         let mut replace_pos = pos;

crates/nu-cli/src/shell/value_shell.rs

@@ -238,14 +238,11 @@ impl Shell for ValueShell {
         let mut possible_completion = vec![];
         let members = self.members();
         for member in members {
-            match member {
+            let Value { value, .. } = member;
-                Value { value, .. } => {
             for desc in value.data_descriptors() {
                 possible_completion.push(desc);
             }
         }
-            }
-        }
 
         let line_chars: Vec<_> = line.chars().collect();
         let mut replace_pos = pos;

crates/nu-protocol/src/hir.rs

@@ -152,15 +152,16 @@ impl ExternalCommand {
             SpannedExpression {
                 expr: Expression::Path(path),
                 ..
-            } => match &**path {
+            } => {
-                Path { head, .. } => match head {
+                let Path { head, .. } = &**path;
+                match head {
                     SpannedExpression {
                         expr: Expression::Variable(Variable::It(_)),
                         ..
                     } => true,
                     _ => false,
-                },
+                }
-            },
+            }
             _ => false,
         })
     }

crates/nu_plugin_fetch/src/fetch.rs

@@ -21,17 +21,16 @@ impl Fetch {
     }
 
     pub fn setup(&mut self, call_info: CallInfo) -> ReturnValue {
-        self.path = Some(
+        self.path = Some({
-            match call_info.args.nth(0).ok_or_else(|| {
+            let file = call_info.args.nth(0).ok_or_else(|| {
                 ShellError::labeled_error(
                     "No file or directory specified",
                     "for command",
                     &call_info.name_tag,
                 )
-            })? {
+            })?;
-                file => file.clone(),
+            file.clone()
-            },
+        });
-        );
 
         self.has_raw = call_info.args.has("raw");
 

crates/nu_plugin_post/src/post.rs

@@ -42,24 +42,24 @@ impl Post {
     }
 
     pub fn setup(&mut self, call_info: CallInfo) -> ReturnValue {
-        self.path = Some(
+        self.path = Some({
-            match call_info.args.nth(0).ok_or_else(|| {
+            let file = call_info.args.nth(0).ok_or_else(|| {
                 ShellError::labeled_error(
                     "No file or directory specified",
                     "for command",
                     &call_info.name_tag,
                 )
-            })? {
+            })?;
-                file => file.clone(),
+            file.clone()
-            },
+        });
-        );
 
         self.has_raw = call_info.args.has("raw");
 
-        self.body = match call_info.args.nth(1).ok_or_else(|| {
+        self.body = {
+            let file = call_info.args.nth(1).ok_or_else(|| {
                 ShellError::labeled_error("No body specified", "for command", &call_info.name_tag)
-        })? {
+            })?;
-            file => Some(file.clone()),
+            Some(file.clone())
         };
 
         self.user = match call_info.args.get("user") {

crates/nu_plugin_str/src/strutils.rs

@@ -68,12 +68,13 @@ impl Str {
                     }
                 }
             },
-            Some(Action::ToInteger) => match input.trim() {
+            Some(Action::ToInteger) => {
-                other => match other.parse::<i64>() {
+                let other = input.trim();
+                match other.parse::<i64>() {
                     Ok(v) => UntaggedValue::int(v),
                     Err(_) => UntaggedValue::string(input),
-                },
+                }
-            },
+            }
             Some(Action::ToDateTime(dt)) => match DateTime::parse_from_str(input, dt) {
                 Ok(d) => UntaggedValue::date(d),
                 Err(_) => UntaggedValue::string(input),