chore: cargo clippy, round 1

Signed-off-by: Sam Gammon <[email protected]>

Author: sgammon

crates/nassun/src/resolver.rs

@@ -198,8 +198,7 @@ impl PackageResolver {
             && tag_version.is_some()
             && packument
                 .versions
-                .get(tag_version.as_ref().unwrap())
-                .is_some()
+                .contains_key(tag_version.as_ref().unwrap())
             && match spec {
                 PackageSpec::Npm {
                     requested: None, ..

crates/node-maintainer/src/into_kdl.rs

@@ -6,8 +6,8 @@ pub trait IntoKdl: IntoKdlSealed {}
 
 impl IntoKdl for KdlDocument {}
 impl IntoKdl for String {}
-impl<'a> IntoKdl for &'a str {}
-impl<'a> IntoKdl for &'a String {}
+impl IntoKdl for & str {}
+impl IntoKdl for & String {}
 
 impl IntoKdlSealed for KdlDocument {
     fn into_kdl(self) -> Result<KdlDocument, NodeMaintainerError> {
@@ -21,13 +21,13 @@ impl IntoKdlSealed for String {
     }
 }
 
-impl<'a> IntoKdlSealed for &'a str {
+impl IntoKdlSealed for & str {
     fn into_kdl(self) -> Result<KdlDocument, NodeMaintainerError> {
         Ok(self.parse()?)
     }
 }
 
-impl<'a> IntoKdlSealed for &'a String {
+impl IntoKdlSealed for & String {
     fn into_kdl(self) -> Result<KdlDocument, NodeMaintainerError> {
         Ok(self.parse()?)
     }

crates/node-maintainer/src/linkers/isolated.rs

@@ -105,13 +105,12 @@ impl IsolatedLinker {
         let expected_mut = &mut expected;
         let store_ref = &store;
         // Clean out individual node_modules within
-        let indices = graph.inner.node_indices().map(move |idx| {
+        let indices = graph.inner.node_indices().inspect(move |&idx| {
             if idx != graph.root {
                 let pkg_store_dir = store_ref.join(package_dir_name(graph, idx));
 
                 expected_mut.insert(pkg_store_dir);
             }
-            idx
         });
 
         let prefix_ref = &prefix;
@@ -572,7 +571,7 @@ impl IsolatedLinker {
         let node_path = store_ref
             .join(package_dir_name(graph, node))
             .join("node_modules")
-            .join(&graph[node].name.to_string());
+            .join(graph[node].name.to_string());
         let build_mani = BuildManifest::from_path(node_path.join("package.json")).map_err(|e| {
             NodeMaintainerError::BuildManifestReadError(node_path.join("package.json"), e)
         })?;
@@ -584,7 +583,7 @@ impl IsolatedLinker {
                 store_ref
                     .join(package_dir_name(graph, edge.source()))
                     .join("node_modules")
-                    .join(&dep_node.name.to_string())
+                    .join(dep_node.name.to_string())
             };
             let dep_bin_dir = dep_store_dir.join("node_modules").join(".bin");
             for (name, path) in &build_mani.bin {

crates/node-maintainer/src/resolver.rs

@@ -48,7 +48,7 @@ pub(crate) struct Resolver<'a> {
     pub(crate) on_resolve_progress: Option<ProgressHandler>,
 }
 
-impl<'a> Resolver<'a> {
+impl Resolver<'_> {
     pub(crate) async fn run_resolver(
         mut self,
         lockfile: Option<Lockfile>,

crates/oro-config/src/lib.rs

@@ -61,7 +61,7 @@ impl OroConfigLayerExt for Command {
         let matches = self
             .clone()
             .ignore_errors(true)
-            .get_matches_from(&args.clone());
+            .get_matches_from(args.clone());
         for opt in long_opts {
             // TODO: _prepend_ args unconditionally if they're coming from
             // config, so multi-args get parsed right. Right now, if you have

crates/oro-script/src/lib.rs

@@ -21,7 +21,7 @@ pub struct OroScript<'a> {
     workspace_path: Option<PathBuf>,
 }
 
-impl<'a> OroScript<'a> {
+impl OroScript<'_> {
     pub fn new(package_path: impl AsRef<Path>, event: impl AsRef<str>) -> Result<Self> {
         let package_path = package_path.as_ref();
         let package_path = dunce::canonicalize(package_path).io_context(|| format!("Failed to canonicalize package path at {} while preparing to run a package script.", package_path.display()))?;

src/lib.rs

@@ -609,7 +609,7 @@ impl Orogene {
         if let Some(dsn) = self
             .sentry_dsn
             .as_deref()
-            .or_else(|| option_env!("OROGENE_SENTRY_DSN"))
+            .or(option_env!("OROGENE_SENTRY_DSN"))
         {
             let ret = sentry::init(
                 sentry::ClientOptions {

src/main.rs

@@ -3,5 +3,5 @@ use orogene::Orogene;
 
 #[async_std::main]
 async fn main() -> Result<()> {
-    Ok(Orogene::load().await?)
+    Orogene::load().await
 }