fix: clippy warning of rust 1.84

Author: blindFS

crates/nu-color-config/src/style_computer.rs

@@ -169,7 +169,7 @@ impl<'a> StyleComputer<'a> {
 
 // Because EngineState doesn't have Debug (Dec 2022),
 // this incomplete representation must be used.
-impl<'a> Debug for StyleComputer<'a> {
+impl Debug for StyleComputer<'_> {
     fn fmt(&self, f: &mut Formatter<'_>) -> Result {
         f.debug_struct("StyleComputer")
             .field("map", &self.map)

crates/nu-engine/src/scope.rs

@@ -529,14 +529,14 @@ impl<'e, 's> ScopeData<'e, 's> {
 }
 
 fn extract_custom_completion_from_arg(engine_state: &EngineState, shape: &SyntaxShape) -> String {
-    return match shape {
+    match shape {
         SyntaxShape::CompleterWrapper(_, custom_completion_decl_id) => {
             let custom_completion_command = engine_state.get_decl(*custom_completion_decl_id);
             let custom_completion_command_name: &str = custom_completion_command.name();
             custom_completion_command_name.to_string()
         }
         _ => "".to_string(),
-    };
+    }
 }
 
 fn sort_rows(decls: &mut [Value]) {

crates/nu-glob/src/lib.rs

@@ -294,7 +294,6 @@ pub fn glob_with(pattern: &str, options: MatchOptions) -> Result<Paths, PatternE
 /// This is provided primarily for testability, so multithreaded test runners can
 /// test pattern matches in different test directories at the same time without
 /// having to append the parent to the pattern under test.
-
 pub fn glob_with_parent(
     pattern: &str,
     options: MatchOptions,
@@ -790,7 +789,7 @@ impl Pattern {
     /// `Pattern` using the default match options (i.e. `MatchOptions::default()`).
     pub fn matches_path(&self, path: &Path) -> bool {
         // FIXME (#9639): This needs to handle non-utf8 paths
-        path.to_str().map_or(false, |s| self.matches(s))
+        path.to_str().is_some_and(|s| self.matches(s))
     }
 
     /// Return if the given `str` matches this `Pattern` using the specified
@@ -803,8 +802,7 @@ impl Pattern {
     /// `Pattern` using the specified match options.
     pub fn matches_path_with(&self, path: &Path, options: MatchOptions) -> bool {
         // FIXME (#9639): This needs to handle non-utf8 paths
-        path.to_str()
-            .map_or(false, |s| self.matches_with(s, options))
+        path.to_str().is_some_and(|s| self.matches_with(s, options))
     }
 
     /// Access the original glob pattern.
@@ -1069,7 +1067,7 @@ fn chars_eq(a: char, b: char, case_sensitive: bool) -> bool {
         true
     } else if !case_sensitive && a.is_ascii() && b.is_ascii() {
         // FIXME: work with non-ascii chars properly (issue #9084)
-        a.to_ascii_lowercase() == b.to_ascii_lowercase()
+        a.eq_ignore_ascii_case(&b)
     } else {
         a == b
     }

crates/nu-json/src/de.rs

@@ -505,7 +505,7 @@ where
     }
 }
 
-impl<'de, 'a, Iter> de::Deserializer<'de> for &'a mut Deserializer<Iter>
+impl<'de, Iter> de::Deserializer<'de> for &mut Deserializer<Iter>
 where
     Iter: Iterator<Item = u8>,
 {
@@ -565,7 +565,7 @@ impl<'a, Iter: Iterator<Item = u8>> SeqVisitor<'a, Iter> {
     }
 }
 
-impl<'de, 'a, Iter> de::SeqAccess<'de> for SeqVisitor<'a, Iter>
+impl<'de, Iter> de::SeqAccess<'de> for SeqVisitor<'_, Iter>
 where
     Iter: Iterator<Item = u8>,
 {
@@ -616,7 +616,7 @@ impl<'a, Iter: Iterator<Item = u8>> MapVisitor<'a, Iter> {
     }
 }
 
-impl<'de, 'a, Iter> de::MapAccess<'de> for MapVisitor<'a, Iter>
+impl<'de, Iter> de::MapAccess<'de> for MapVisitor<'_, Iter>
 where
     Iter: Iterator<Item = u8>,
 {
@@ -671,7 +671,7 @@ where
     }
 }
 
-impl<'de, 'a, Iter> de::VariantAccess<'de> for &'a mut Deserializer<Iter>
+impl<'de, Iter> de::VariantAccess<'de> for &mut Deserializer<Iter>
 where
     Iter: Iterator<Item = u8>,
 {

crates/nu-json/src/ser.rs

@@ -310,7 +310,7 @@ where
     }
 }
 
-impl<'a, W, F> ser::SerializeSeq for Compound<'a, W, F>
+impl<W, F> ser::SerializeSeq for Compound<'_, W, F>
 where
     W: io::Write,
     F: Formatter,
@@ -337,7 +337,7 @@ where
     }
 }
 
-impl<'a, W, F> ser::SerializeTuple for Compound<'a, W, F>
+impl<W, F> ser::SerializeTuple for Compound<'_, W, F>
 where
     W: io::Write,
     F: Formatter,
@@ -357,7 +357,7 @@ where
     }
 }
 
-impl<'a, W, F> ser::SerializeTupleStruct for Compound<'a, W, F>
+impl<W, F> ser::SerializeTupleStruct for Compound<'_, W, F>
 where
     W: io::Write,
     F: Formatter,
@@ -377,7 +377,7 @@ where
     }
 }
 
-impl<'a, W, F> ser::SerializeTupleVariant for Compound<'a, W, F>
+impl<W, F> ser::SerializeTupleVariant for Compound<'_, W, F>
 where
     W: io::Write,
     F: Formatter,
@@ -401,7 +401,7 @@ where
     }
 }
 
-impl<'a, W, F> ser::SerializeMap for Compound<'a, W, F>
+impl<W, F> ser::SerializeMap for Compound<'_, W, F>
 where
     W: io::Write,
     F: Formatter,
@@ -438,7 +438,7 @@ where
     }
 }
 
-impl<'a, W, F> ser::SerializeStruct for Compound<'a, W, F>
+impl<W, F> ser::SerializeStruct for Compound<'_, W, F>
 where
     W: io::Write,
     F: Formatter,
@@ -458,7 +458,7 @@ where
     }
 }
 
-impl<'a, W, F> ser::SerializeStructVariant for Compound<'a, W, F>
+impl<W, F> ser::SerializeStructVariant for Compound<'_, W, F>
 where
     W: io::Write,
     F: Formatter,
@@ -486,7 +486,7 @@ struct MapKeySerializer<'a, W: 'a, F: 'a> {
     ser: &'a mut Serializer<W, F>,
 }
 
-impl<'a, W, F> ser::Serializer for MapKeySerializer<'a, W, F>
+impl<W, F> ser::Serializer for MapKeySerializer<'_, W, F>
 where
     W: io::Write,
     F: Formatter,
@@ -694,7 +694,7 @@ struct HjsonFormatter<'a> {
     braces_same_line: bool,
 }
 
-impl<'a> Default for HjsonFormatter<'a> {
+impl Default for HjsonFormatter<'_> {
     fn default() -> Self {
         Self::new()
     }
@@ -719,7 +719,7 @@ impl<'a> HjsonFormatter<'a> {
     }
 }
 
-impl<'a> Formatter for HjsonFormatter<'a> {
+impl Formatter for HjsonFormatter<'_> {
     fn open<W>(&mut self, writer: &mut W, ch: u8) -> Result<()>
     where
         W: io::Write,

crates/nu-json/src/value.rs

@@ -432,7 +432,7 @@ struct WriterFormatter<'a, 'b: 'a> {
     inner: &'a mut fmt::Formatter<'b>,
 }
 
-impl<'a, 'b> io::Write for WriterFormatter<'a, 'b> {
+impl io::Write for WriterFormatter<'_, '_> {
     fn write(&mut self, buf: &[u8]) -> io::Result<usize> {
         fn io_error<E>(_: E) -> io::Error {
             // Value does not matter because fmt::Debug and fmt::Display impls

crates/nu-path/src/tilde.rs

@@ -126,7 +126,7 @@ fn is_termux() -> bool {
 }
 
 fn expand_tilde_with_another_user_home(path: &Path) -> PathBuf {
-    return match path.to_str() {
+    match path.to_str() {
         Some(file_path) => {
             let mut file = file_path.to_string();
             match file_path.find(['/', '\\']) {
@@ -147,7 +147,7 @@ fn expand_tilde_with_another_user_home(path: &Path) -> PathBuf {
             }
         }
         None => path.to_path_buf(),
-    };
+    }
 }
 
 /// Expand tilde ("~") into a home directory if it is the first path component

crates/nu-protocol/src/engine/engine_state.rs

@@ -354,7 +354,7 @@ impl EngineState {
     pub fn active_overlay_ids<'a, 'b>(
         &'b self,
         removed_overlays: &'a [Vec<u8>],
-    ) -> impl DoubleEndedIterator<Item = &OverlayId> + 'a
+    ) -> impl DoubleEndedIterator<Item = &'b OverlayId> + 'a
     where
         'b: 'a,
     {
@@ -368,7 +368,7 @@ impl EngineState {
     pub fn active_overlays<'a, 'b>(
         &'b self,
         removed_overlays: &'a [Vec<u8>],
-    ) -> impl DoubleEndedIterator<Item = &OverlayFrame> + 'a
+    ) -> impl DoubleEndedIterator<Item = &'b OverlayFrame> + 'a
     where
         'b: 'a,
     {
@@ -379,7 +379,7 @@ impl EngineState {
     pub fn active_overlay_names<'a, 'b>(
         &'b self,
         removed_overlays: &'a [Vec<u8>],
-    ) -> impl DoubleEndedIterator<Item = &[u8]> + 'a
+    ) -> impl DoubleEndedIterator<Item = &'b [u8]> + 'a
     where
         'b: 'a,
     {
@@ -1061,7 +1061,7 @@ impl EngineState {
     }
 }
 
-impl<'a> GetSpan for &'a EngineState {
+impl GetSpan for &EngineState {
     /// Get existing span
     fn get_span(&self, span_id: SpanId) -> Span {
         *self

crates/nu-protocol/src/engine/overlay.rs

@@ -120,7 +120,7 @@ impl ScopeFrame {
     pub fn active_overlays<'a, 'b>(
         &'b self,
         removed_overlays: &'a mut Vec<Vec<u8>>,
-    ) -> impl DoubleEndedIterator<Item = &OverlayFrame> + 'a
+    ) -> impl DoubleEndedIterator<Item = &'b OverlayFrame> + 'a
     where
         'b: 'a,
     {

crates/nu-protocol/src/engine/stack_out_dest.rs

@@ -153,15 +153,15 @@ impl<'a> StackIoGuard<'a> {
     }
 }
 
-impl<'a> Deref for StackIoGuard<'a> {
+impl Deref for StackIoGuard<'_> {
     type Target = Stack;
 
     fn deref(&self) -> &Self::Target {
         self.stack
     }
 }
 
-impl<'a> DerefMut for StackIoGuard<'a> {
+impl DerefMut for StackIoGuard<'_> {
     fn deref_mut(&mut self) -> &mut Self::Target {
         self.stack
     }
@@ -202,15 +202,15 @@ impl<'a> StackCollectValueGuard<'a> {
     }
 }
 
-impl<'a> Deref for StackCollectValueGuard<'a> {
+impl Deref for StackCollectValueGuard<'_> {
     type Target = Stack;
 
     fn deref(&self) -> &Self::Target {
         &*self.stack
     }
 }
 
-impl<'a> DerefMut for StackCollectValueGuard<'a> {
+impl DerefMut for StackCollectValueGuard<'_> {
     fn deref_mut(&mut self) -> &mut Self::Target {
         self.stack
     }
@@ -258,15 +258,15 @@ impl<'a> StackCallArgGuard<'a> {
     }
 }
 
-impl<'a> Deref for StackCallArgGuard<'a> {
+impl Deref for StackCallArgGuard<'_> {
     type Target = Stack;
 
     fn deref(&self) -> &Self::Target {
         &*self.stack
     }
 }
 
-impl<'a> DerefMut for StackCallArgGuard<'a> {
+impl DerefMut for StackCallArgGuard<'_> {
     fn deref_mut(&mut self) -> &mut Self::Target {
         self.stack
     }