From cf5aca58e7966f49f5b2e5052d892ad4a42f802c Mon Sep 17 00:00:00 2001
From: Severin Siffert <severin.siffert@dfinity.org>
Date: Tue, 10 Dec 2024 15:41:42 +0100
Subject: [PATCH] bump Rust version because a dependency requires it

---
 rust-toolchain.toml                                 | 2 +-
 src/canisters/frontend/ic-asset/src/asset/config.rs | 2 +-
 src/dfx/src/lib/deps/mod.rs                         | 2 +-
 src/dfx/src/lib/deps/pull/mod.rs                    | 8 +++++---
 src/dfx/src/lib/environment.rs                      | 2 +-
 src/dfx/src/lib/manifest.rs                         | 2 +-
 6 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/rust-toolchain.toml b/rust-toolchain.toml
index 4df24c986f..ca5876ebc6 100644
--- a/rust-toolchain.toml
+++ b/rust-toolchain.toml
@@ -1,4 +1,4 @@
 [toolchain]
-channel = "1.76.0"
+channel = "1.78.0"
 components = ["rustfmt", "clippy"]
 targets = ["wasm32-unknown-unknown"]
diff --git a/src/canisters/frontend/ic-asset/src/asset/config.rs b/src/canisters/frontend/ic-asset/src/asset/config.rs
index 9eb4995da0..356e2614a4 100644
--- a/src/canisters/frontend/ic-asset/src/asset/config.rs
+++ b/src/canisters/frontend/ic-asset/src/asset/config.rs
@@ -315,7 +315,7 @@ impl AssetConfig {
         }
 
         if other.encodings.is_some() {
-            self.encodings = other.encodings.clone();
+            self.encodings.clone_from(&other.encodings);
         }
 
         if other.security_policy.is_some() {
diff --git a/src/dfx/src/lib/deps/mod.rs b/src/dfx/src/lib/deps/mod.rs
index 90e7ba973d..77225eba96 100644
--- a/src/dfx/src/lib/deps/mod.rs
+++ b/src/dfx/src/lib/deps/mod.rs
@@ -300,7 +300,7 @@ pub fn get_pull_canister_or_principal(
             let p = Principal::from_text(canister).with_context(||
                 format!("{canister} is not a valid Principal nor a `type: pull` canister specified in dfx.json")
             )?;
-            if pulled_json.canisters.get(&p).is_none() {
+            if pulled_json.canisters.contains_key(&p) {
                 bail!("Could not find {} in pulled.json", &p);
             }
             Ok(p)
diff --git a/src/dfx/src/lib/deps/pull/mod.rs b/src/dfx/src/lib/deps/pull/mod.rs
index 5358eec4ee..0db305b485 100644
--- a/src/dfx/src/lib/deps/pull/mod.rs
+++ b/src/dfx/src/lib/deps/pull/mod.rs
@@ -173,9 +173,11 @@ async fn download_and_generate_pulled_canister(
     let dfx_metadata_str = get_metadata_as_string(&module, DFX, &wasm_path)?;
     let dfx_metadata: DfxMetadata = serde_json::from_str(&dfx_metadata_str)?;
     let pullable = dfx_metadata.get_pullable()?;
-    pulled_canister.dependencies = pullable.dependencies.clone();
-    pulled_canister.init_guide = pullable.init_guide.clone();
-    pulled_canister.init_arg = pullable.init_arg.clone();
+    pulled_canister
+        .dependencies
+        .clone_from(&pullable.dependencies);
+    pulled_canister.init_guide.clone_from(&pullable.init_guide);
+    pulled_canister.init_arg.clone_from(&pullable.init_arg);
 
     Ok(pulled_canister)
 }
diff --git a/src/dfx/src/lib/environment.rs b/src/dfx/src/lib/environment.rs
index f1535949af..8e993bbc3e 100644
--- a/src/dfx/src/lib/environment.rs
+++ b/src/dfx/src/lib/environment.rs
@@ -61,7 +61,7 @@ pub trait Environment {
     }
 
     // Explicit lifetimes are actually needed for mockall to work properly.
-    #[allow(clippy::needless_lifetimes)]
+    #[allow(clippy::needless_lifetimes, unused)]
     fn log<'a>(&self, record: &Record<'a>) {
         self.get_logger().log(record);
     }
diff --git a/src/dfx/src/lib/manifest.rs b/src/dfx/src/lib/manifest.rs
index aa731a6105..d759752e9c 100644
--- a/src/dfx/src/lib/manifest.rs
+++ b/src/dfx/src/lib/manifest.rs
@@ -100,7 +100,7 @@ pub fn get_latest_version(
         .tags
         .get("latest")
         .ok_or_else(|| error_invalid_data!("expected field 'latest' in 'tags'"))
-        .map(|v| v.clone())
+        .cloned()
 }
 
 #[cfg(test)]