Fix some clippy warnings

Author: davidlattimore

src/checker.rs

@@ -356,21 +356,21 @@ impl Checker {
         Problem::UsesBuildScript(pkg_id.clone()).into()
     }
 
-    pub(crate) fn pkg_ids_from_source_path(
-        &self,
+    pub(crate) fn pkg_ids_from_source_path<'checker>(
+        &'checker self,
         source_path: &Path,
-    ) -> Result<Cow<Vec<PackageId>>> {
+    ) -> Result<Cow<'checker, [PackageId]>> {
         self.opt_pkg_ids_from_source_path(source_path)
             .ok_or_else(|| anyhow!("Couldn't find crate name for {}", source_path.display(),))
     }
 
-    pub(crate) fn opt_pkg_ids_from_source_path(
-        &self,
+    pub(crate) fn opt_pkg_ids_from_source_path<'checker>(
+        &'checker self,
         source_path: &Path,
-    ) -> Option<Cow<Vec<PackageId>>> {
+    ) -> Option<Cow<'checker, [PackageId]>> {
         self.path_to_pkg_ids
             .get(source_path)
-            .map(Cow::Borrowed)
+            .map(|ids| Cow::Borrowed(ids.as_slice()))
             .or_else(|| {
                 // If the source path is from the rust standard library, or from one of the
                 // precompiled crates that comes with the standard library, then report no crates.

src/config.rs

@@ -479,7 +479,7 @@ mod tests {
     fn check_unknown_field(context: &str) {
         // Make sure that without the unknown field, it parses OK.
         parse(context).unwrap();
-        assert!(parse(&format!("{}\n no_such_field = 1\n", context)).is_err());
+        assert!(parse(&format!("{context}\n no_such_field = 1\n")).is_err());
     }
 
     #[test]

src/crate_index.rs

@@ -248,10 +248,7 @@ impl PackageId {
         let name = get_env("CARGO_PKG_NAME")?;
         let version_string = get_env("CARGO_PKG_VERSION")?;
         let version = Version::parse(&version_string).with_context(|| {
-            format!(
-                "Package `{}` has invalid version string `{}`",
-                name, version_string
-            )
+            format!("Package `{name}` has invalid version string `{version_string}`")
         })?;
         let non_unique_pkg_names = get_env(MULTIPLE_VERSION_PKG_NAMES_ENV)?;
         let name_is_unique = non_unique_pkg_names.split(',').all(|p| p != name);
@@ -267,7 +264,7 @@ impl PackageId {
         &self.version
     }
 
-    pub(crate) fn crate_name(&self) -> Cow<str> {
+    pub(crate) fn crate_name<'id>(&'id self) -> Cow<'id, str> {
         if self.name.contains('-') {
             self.name.replace('-', "_").into()
         } else {

src/crate_index/lib_tree.rs

@@ -79,8 +79,7 @@ impl LibTreeBuilder<'_> {
             .context("Failed to parse package version from `cargo tree`")?;
         let packages_with_name = self.pkg_name_to_ids.get(pkg_name).with_context(|| {
             format!(
-                "`cargo tree` output contained package `{}` not in `cargo metadata` output",
-                pkg_name
+                "`cargo tree` output contained package `{pkg_name}` not in `cargo metadata` output"
             )
         })?;
         let package_id = packages_with_name

src/location.rs

@@ -50,7 +50,7 @@ impl Display for SourceLocation {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
         write!(f, "{} [{}", self.filename.display(), self.line)?;
         if let Some(column) = self.column {
-            write!(f, ":{}", column)?;
+            write!(f, ":{column}")?;
         }
         write!(f, "]")
     }

src/names.rs

@@ -81,8 +81,8 @@ impl Namespace {
     }
 }
 
-impl DebugName<'_> {
-    pub(crate) fn names_iterator(&self) -> NamesIterator<NonMangledIterator> {
+impl<'input> DebugName<'input> {
+    pub(crate) fn names_iterator<'a>(&'a self) -> NamesIterator<'a, NonMangledIterator<'a>> {
         NamesIterator::new(NonMangledIterator::new(
             &self.namespace.parts,
             self.name.as_ref(),
@@ -254,7 +254,7 @@ impl<'data, I: Clone + Iterator<Item = DemangleToken<'data>>> Iterator
                     if self.as_final == Some(text)
                         && self
                             .as_final
-                            .is_some_and(|t| t.as_ptr() as usize == text.as_ptr() as usize)
+                            .is_some_and(|t| std::ptr::eq(t.as_ptr(), text.as_ptr()))
                     {
                         // This text was already output as the final part of an as-name. Ignore it.
                         continue;
@@ -343,15 +343,15 @@ impl<'data, I: Clone + Iterator<Item = DemangleToken<'data>>> Iterator
     }
 }
 
-impl DebugName<'_> {
+impl<'input> DebugName<'input> {
     pub(crate) fn to_heap(&self) -> DebugName<'static> {
         DebugName {
             namespace: self.namespace.clone(),
             name: self.name.to_heap(),
         }
     }
 
-    pub(crate) fn new(namespace: Namespace, name: &str) -> DebugName {
+    pub(crate) fn new(namespace: Namespace, name: &'input str) -> DebugName<'input> {
         DebugName {
             namespace,
             name: Utf8Bytes::Borrowed(name),
@@ -449,7 +449,7 @@ impl Display for SymbolOrDebugName {
 
 impl Debug for Name {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        write!(f, "Name({})", self)
+        write!(f, "Name({self})")
     }
 }
 

src/problem.rs

@@ -427,7 +427,7 @@ fn display_usages(
             for u in local_usages {
                 write!(f, "      -> {} [{}", u.to_source, u.source_location.line(),)?;
                 if let Some(column) = u.source_location.column() {
-                    write!(f, ":{}", column)?;
+                    write!(f, ":{column}")?;
                 }
                 writeln!(f, "]")?;
             }

src/problem_store.rs

@@ -48,7 +48,7 @@ impl ProblemStoreRef {
         outcome.recv().unwrap_or(Outcome::GiveUp)
     }
 
-    pub(crate) fn lock(&self) -> MutexGuard<ProblemStore> {
+    pub(crate) fn lock<'a>(&'a self) -> MutexGuard<'a, ProblemStore> {
         self.inner.lock().unwrap()
     }
 }

src/sandbox/bubblewrap.rs

@@ -115,7 +115,7 @@ impl Display for CommandDisplay {
             let arg = arg.to_string_lossy();
             if arg.contains(' ') || arg.contains('"') || arg.is_empty() {
                 // Use debug print, since that gives us quotes.
-                write!(f, " {:?}", arg)?;
+                write!(f, " {arg:?}")?;
             } else {
                 // Print without quotes, since it probably isn't necessary.
                 write!(f, " {arg}")?

src/symbol.rs

@@ -15,8 +15,8 @@ pub(crate) struct Symbol<'data> {
     bytes: Bytes<'data>,
 }
 
-impl Symbol<'_> {
-    pub(crate) fn borrowed(data: &[u8]) -> Symbol {
+impl<'data> Symbol<'data> {
+    pub(crate) fn borrowed(data: &'data [u8]) -> Symbol<'data> {
         Symbol {
             bytes: Bytes::Borrowed(data),
         }
@@ -40,7 +40,7 @@ impl Symbol<'_> {
     }
 
     /// Splits the name of this symbol into names. See `crate::names::split_names` for details.
-    pub(crate) fn names(&self) -> Result<NamesIterator<DemangleIterator>> {
+    pub(crate) fn names<'a>(&'a self) -> Result<NamesIterator<'a, DemangleIterator<'a>>> {
         Ok(NamesIterator::new(DemangleIterator::new(self.to_str()?)))
     }
 

src/symbol_graph/dwarf.rs

@@ -494,7 +494,9 @@ impl<'input> SymbolDebugInfoScanner<'input> {
     }
 }
 
-fn path_from_opt_slice(slice: Option<gimli::EndianSlice<gimli::LittleEndian>>) -> &Path {
+fn path_from_opt_slice<'input>(
+    slice: Option<gimli::EndianSlice<'input, gimli::LittleEndian>>,
+) -> &'input Path {
     slice
         .map(|dir| Path::new(OsStr::from_bytes(dir.slice())))
         .unwrap_or_else(|| Path::new(""))

src/ui/full_term/problems_ui.rs

@@ -770,10 +770,7 @@ fn usage_source_lines(
         } else {
             "  "
         };
-        let mut spans = vec![Span::from(format!(
-            "{marker}{:gutter_width$}: ",
-            line_number
-        ))];
+        let mut spans = vec![Span::from(format!("{marker}{line_number:gutter_width$}: "))];
         let column = (line_number == target_line)
             .then(|| source_location.column())
             .flatten();

test_crates/crab-1/src/impl1.rs

@@ -1,6 +1,6 @@
 #[inline(never)]
 pub fn crab_1(v: u32) -> u32 {
-    #[allow(clippy::transmute_num_to_bytes)]
+    #[allow(unnecessary_transmutes)]
     unsafe {
         let mut v2: [u8; 4] = core::mem::transmute(v);
         v2.reverse();

test_crates/crab-2/src/lib.rs

@@ -33,7 +33,7 @@ pub mod stuff {
         println!("CRAB_2_EXT_ENV: {:?}", option_env!("CRAB_2_EXT_ENV"));
 
         let total: u32 = crate::DATA.iter().cloned().map(|byte| byte as u32).sum();
-        println!("{}", total);
+        println!("{total}");
     }
 }