Clippy fixes for new Rust version (#3392)

crates/nu-cli/src/types/deduction.rs

@@ -377,10 +377,7 @@ impl VarSyntaxShapeDeductor {
             .iter()
             .map(|decl| {
                 let usage: VarUsage = decl.into();
-                let deduction = match deducer.inferences.get(&usage) {
+                let deduction = deducer.inferences.get(&usage).cloned();
-                    Some(vec) => Some(vec.clone()),
-                    None => None,
-                };
                 (decl.clone(), deduction)
             })
             .collect())
@@ -1023,7 +1020,7 @@ impl VarSyntaxShapeDeductor {
                                     Some(combination)
                                 }
                             })
-                            .filter_map(|elem| elem)
+                            .flatten()
                             .collect()
                         }
                         //No any's intersection of both is result
@@ -1044,7 +1041,7 @@ impl VarSyntaxShapeDeductor {
                                         Some(combination)
                                     }
                                 })
-                                .filter_map(|elem| elem)
+                                .flatten()
                                 .collect();
                             if intersection.is_empty() {
                                 //TODO pass all labels somehow

crates/nu-command/src/commands/each/window.rs

@@ -87,7 +87,7 @@ impl WholeStreamCommand for EachWindow {
                     None
                 }
             })
-            .filter_map(|x| x)
+            .flatten()
             .flatten()
             .to_action_stream())
     }

crates/nu-command/src/commands/get.rs

@@ -228,8 +228,8 @@ pub fn get_column_from_row_error(
         } => {
             let primary_label = format!("There isn't a column named '{}'", &column);
 
-            if let Some(suggestions) = did_you_mean(&obj_source, column_path_tried.as_string()) {
+            did_you_mean(&obj_source, column_path_tried.as_string()).map(|suggestions| {
-                Some(ShellError::labeled_error_with_secondary(
+                ShellError::labeled_error_with_secondary(
                     "Unknown column",
                     primary_label,
                     column_path_tried.span,
@@ -239,10 +239,8 @@ pub fn get_column_from_row_error(
                         &obj_source.data_descriptors().join(", ")
                     ),
                     column_path_tried.span.since(path_members_span),
-                ))
+                )
-            } else {
+            })
-                None
-            }
         }
         PathMember {
             unspanned: UnspannedPathMember::Int(idx),

crates/nu-command/src/commands/histogram.rs

@@ -76,10 +76,10 @@ pub fn histogram(args: CommandArgs) -> Result<ActionStream, ShellError> {
     };
 
     let column_grouper = if !columns.is_empty() {
-        match columns.remove(0).split_last() {
+        columns
-            Some((key, _)) => Some(key.as_string().tagged(&name)),
+            .remove(0)
-            None => None,
+            .split_last()
-        }
+            .map(|(key, _)| key.as_string().tagged(&name))
     } else {
         None
     };

crates/nu-command/src/commands/move_/command.rs

@@ -272,10 +272,7 @@ fn move_after(table: &Value, columns: &[String], from: &ColumnPath) -> Result<Va
 
     Ok(select_fields(
         table,
-        &reordered_columns
+        &reordered_columns.into_iter().flatten().collect::<Vec<_>>(),
-            .into_iter()
-            .filter_map(|v| v)
-            .collect::<Vec<_>>(),
         &table.tag,
     ))
 }
@@ -321,10 +318,7 @@ fn move_before(table: &Value, columns: &[String], from: &ColumnPath) -> Result<V
 
     Ok(select_fields(
         table,
-        &reordered_columns
+        &reordered_columns.into_iter().flatten().collect::<Vec<_>>(),
-            .into_iter()
-            .filter_map(|v| v)
-            .collect::<Vec<_>>(),
         &table.tag,
     ))
 }

crates/nu-command/src/commands/where_.rs

@@ -95,10 +95,10 @@ fn where_command(raw_args: CommandArgs) -> Result<OutputStream, ShellError> {
     };
 
     Ok(WhereIterator {
-        block,
         condition,
         context,
         input,
+        block,
     }
     .to_output_stream())
 }

crates/nu-command/src/utils/test_bins.rs

@@ -68,8 +68,7 @@ pub fn chop() {
     let stdin = io::stdin();
     let mut stdout = io::stdout();
 
-    for line in stdin.lock().lines() {
+    for given in stdin.lock().lines().flatten() {
-        if let Ok(given) = line {
         let chopped = if given.is_empty() {
             &given
         } else {
@@ -81,7 +80,6 @@ pub fn chop() {
             break;
         }
     }
-    }
 
     std::process::exit(0);
 }

crates/nu-data/src/config/nuconfig.rs

@@ -59,8 +59,8 @@ impl NuConfig {
         };
 
         Ok(NuConfig {
-            file_path,
             vars,
+            file_path,
             modified_at,
         })
     }

crates/nu-data/src/utils/internal.rs

@@ -16,19 +16,11 @@ pub struct Labels {
 
 impl Labels {
     pub fn at(&self, idx: usize) -> Option<&str> {
-        if let Some(k) = self.x.get(idx) {
+        self.x.get(idx).map(|k| &k[..])
-            Some(&k[..])
-        } else {
-            None
-        }
     }
 
     pub fn at_split(&self, idx: usize) -> Option<&str> {
-        if let Some(k) = self.y.get(idx) {
+        self.y.get(idx).map(|k| &k[..])
-            Some(&k[..])
-        } else {
-            None
-        }
     }
 
     pub fn grouped(&self) -> impl Iterator<Item = &String> {

crates/nu-engine/src/env/host.rs

@@ -114,10 +114,7 @@ impl Host for FakeHost {
     fn env_get(&mut self, key: OsString) -> Option<OsString> {
         let key = key.into_string().expect("Couldn't convert to string.");
 
-        match self.env_vars.get(&key) {
+        self.env_vars.get(&key).map(OsString::from)
-            Some(env) => Some(OsString::from(env)),
-            None => None,
-        }
     }
 
     fn env_set(&mut self, key: OsString, value: OsString) {

crates/nu-engine/src/evaluation_context.rs

@@ -178,10 +178,8 @@ impl EvaluationContext {
                     Some(env_paths)
                 } else if let Some(env_paths) = self.scope.get_env("Path") {
                     Some(env_paths)
-                } else if let Some(env_paths) = self.scope.get_env("path") {
-                    Some(env_paths)
                 } else {
-                    None
+                    self.scope.get_env("path")
                 };
 
                 if let Some(env_paths) = env_paths {
@@ -249,10 +247,8 @@ impl EvaluationContext {
                     Some(env_paths)
                 } else if let Some(env_paths) = self.scope.get_env("Path") {
                     Some(env_paths)
-                } else if let Some(env_paths) = self.scope.get_env("path") {
-                    Some(env_paths)
                 } else {
-                    None
+                    self.scope.get_env("path")
                 };
 
                 if let Some(env_paths) = env_paths {

crates/nu-engine/src/filesystem/filesystem_shell.rs

@@ -386,8 +386,7 @@ impl Shell for FilesystemShell {
             ));
         }
 
-        for entry in sources {
+        for entry in sources.into_iter().flatten() {
-            if let Ok(entry) = entry {
             let mut sources = FileStructure::new();
             sources.walk_decorate(&entry)?;
 
@@ -465,7 +464,6 @@ impl Shell for FilesystemShell {
                 }
             }
         }
-        }
 
         Ok(ActionStream::empty())
     }
@@ -574,14 +572,12 @@ impl Shell for FilesystemShell {
                 .collect();
         }
 
-        for entry in sources {
+        for entry in sources.into_iter().flatten() {
-            if let Ok(entry) = entry {
             move_file(
                 TaggedPathBuf(&entry, &src.tag),
                 TaggedPathBuf(&destination, &dst.tag),
             )?
         }
-        }
 
         Ok(ActionStream::empty())
     }

crates/nu-engine/src/maybe_text_codec.rs

@@ -27,8 +27,8 @@ pub struct BufCodecReader<R: Read> {
 impl<R: Read> BufCodecReader<R> {
     pub fn new(input: BufReader<R>, maybe_text_codec: MaybeTextCodec) -> Self {
         BufCodecReader {
-            input,
             maybe_text_codec,
+            input,
         }
     }
 }

crates/nu-json/src/value.rs

@@ -937,7 +937,7 @@ impl<'de> de::Deserializer<'de> for Value {
             }
         };
 
-        visitor.visit_enum(EnumDeserializer { value, variant })
+        visitor.visit_enum(EnumDeserializer { variant, value })
     }
 
     #[inline]

crates/nu-plugin/src/test_helpers.rs

@@ -62,10 +62,9 @@ impl<'a, T: Plugin> PluginTest<'a, T> {
         self.configure(|flags_configured| {
             let flags_registered = &call_stub.args.named;
 
-            let flag_passed = match flags_registered {
+            let flag_passed = flags_registered
-                Some(names) => Some(names.keys().map(String::from).collect::<Vec<String>>()),
+                .as_ref()
-                None => None,
+                .map(|names| names.keys().map(String::from).collect::<Vec<String>>());
-            };
 
             if let Some(flags) = flag_passed {
                 for flag in flags {

crates/nu-protocol/src/value/dict.rs

@@ -181,14 +181,10 @@ impl Dictionary {
 
     /// Get a mutable entry that matches a key, if possible
     pub fn get_mut_data_by_key(&mut self, name: &str) -> Option<&mut Value> {
-        match self
+        self.entries
-            .entries
             .iter_mut()
             .find(|(desc_name, _)| *desc_name == name)
-        {
+            .map(|(_, v)| v)
-            Some((_, v)) => Some(v),
-            None => None,
-        }
     }
 
     /// Insert a new key/value pair into the dictionary

crates/nu-source/src/meta.rs

@@ -794,10 +794,7 @@ where
 
 impl<T> HasFallibleSpan for Option<Spanned<T>> {
     fn maybe_span(&self) -> Option<Span> {
-        match self {
+        self.as_ref().map(|value| value.span)
-            None => None,
-            Some(value) => Some(value.span),
-        }
     }
 }
 
@@ -815,10 +812,7 @@ where
 
 impl<T> HasFallibleSpan for Option<Tagged<T>> {
     fn maybe_span(&self) -> Option<Span> {
-        match self {
+        self.as_ref().map(|value| value.tag.span)
-            None => None,
-            Some(value) => Some(value.tag.span),
-        }
     }
 }
 

crates/nu_plugin_binaryview/src/binaryview.rs

@@ -213,15 +213,9 @@ pub fn view_contents(
     skip: Option<&Value>,
     length: Option<&Value>,
 ) -> Result<(), Box<dyn std::error::Error>> {
-    let skip_bytes = match skip {
+    let skip_bytes = skip.map(|s| s.as_usize().unwrap_or(0));
-        Some(s) => Some(s.as_usize().unwrap_or(0)),
-        None => None,
-    };
 
-    let num_bytes = match length {
+    let num_bytes = length.map(|b| b.as_usize().unwrap_or(0));
-        Some(b) => Some(b.as_usize().unwrap_or(0)),
-        None => None,
-    };
 
     let config = HexConfig {
         title: true,

crates/nu_plugin_start/src/nu/mod.rs

@@ -19,6 +19,6 @@ impl Plugin for Start {
     }
     fn begin_filter(&mut self, call_info: CallInfo) -> Result<Vec<ReturnValue>, ShellError> {
         self.parse(call_info)?;
-        self.exec().map(|_| vec![])
+        self.exec().map(|_| Vec::new())
     }
 }