fix clippy (toolchain 1.78.0)

Signed-off-by: Phani Sajja <[email protected]>
habitat-sh · May 3, 2024 · 57c1479 · 57c1479
1 parent cd903e2
commit 57c1479
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 11 deletions.
diff --git a/src/check/artifact/package.rs b/src/check/artifact/package.rs
@@ -524,7 +524,7 @@ impl ArtifactCheck for PackageBeforeCheck {
             .iter()
             .filter_map(|search_path| {
                 if let Some(dep_ident) = search_path.package_ident(artifact_context.target) {
-                    if tdep_artifacts.get(&dep_ident).is_some() {
+                    if tdep_artifacts.contains_key(&dep_ident) {
                         let artifact_ctx = artifact_cache.artifact(&dep_ident).unwrap();
                         if let Some(artifact_ctx) = &artifact_ctx {
                             for (elf_path, elf_metadata) in &artifact_ctx.elfs {

diff --git a/src/check/artifact/script.rs b/src/check/artifact/script.rs
@@ -559,20 +559,16 @@ impl ArtifactCheck for ScriptCheck {
                     used_deps.insert(interpreter_artifact_ctx.id.clone());
                     if interpreter_artifact_ctx
                         .elfs
-                        .get(command.as_path())
-                        .is_some()
+                        .contains_key(command.as_path())
                         || interpreter_artifact_ctx
                             .scripts
-                            .get(command.as_path())
-                            .is_some()
+                            .contains_key(command.as_path())
                         || interpreter_artifact_ctx
                             .links
-                            .get(command.as_path())
-                            .is_some()
+                            .contains_key(command.as_path())
                         || interpreter_artifact_ctx
                             .machos
-                            .get(command.as_path())
-                            .is_some()
+                            .contains_key(command.as_path())
                     {
                         let mut interpreter_listed = false;
                         for intermediate in intermediates.iter() {

diff --git a/src/check/mod.rs b/src/check/mod.rs
@@ -528,6 +528,7 @@ pub(crate) trait SourceCheck {
         plan_context: &PlanContext,
         source_context: &SourceContext,
     ) -> Vec<LeveledSourceCheckViolation>;
+    #[allow(dead_code)]
     fn source_context_check_with_artifact(
         &self,
         plan_config: &PlanContextConfig,

diff --git a/src/core/artifact.rs b/src/core/artifact.rs
@@ -1185,7 +1185,7 @@ impl ArtifactContext {
                 };
                 if let Some(next_artifact_ctx) = link.package_ident(artifact_ctx.target) {
                     if next_artifact_ctx == artifact_ctx.id
-                        && artifact_ctx.links.get(&link).is_none()
+                        && !artifact_ctx.links.contains_key(&link)
                     {
                         resolved_path = link.to_path_buf();
                         current_artifact = None;
@@ -1262,7 +1262,7 @@ impl ArtifactContext {
                 };
                 if let Some(next_artifact_ctx) = link.package_ident(artifact_ctx.target) {
                     if next_artifact_ctx == artifact_ctx.id
-                        && artifact_ctx.links.get(&link).is_none()
+                        && !artifact_ctx.links.contains_key(&link)
                     {
                         resolved_path = link.to_path_buf();
                         intermediate_paths.push(resolved_path.clone());

diff --git a/src/core/dep_graph.rs b/src/core/dep_graph.rs
@@ -141,6 +141,7 @@ impl Dependency {
 }
 
 #[derive(Debug, PartialEq, Eq)]
+#[allow(dead_code)]
 pub(crate) struct DependencyArtifactUpdated {
     latest_dep_artifact: PlanContextLatestArtifact,
     latest_plan_artifact: PlanContextLatestArtifact,

diff --git a/src/store/mod.rs b/src/store/mod.rs
@@ -126,6 +126,7 @@ impl AsRef<Path> for InvalidPackageSourceArchiveStorePath {
 }
 
 #[derive(Debug, PartialEq, Eq, PartialOrd, Ord, Clone)]
+#[allow(dead_code)]
 pub(crate) struct PackageSourceLicenseStorePath(PathBuf);
 
 impl AsRef<Path> for PackageSourceLicenseStorePath {