Merge pull request #2352 from CosmWasm/aw/fix-warnings

Fix warnings on nightly
CosmWasm · Jan 28, 2025 · c365711 · c365711
2 parents 7ef262e + 35d8c3a
commit c365711
Show file tree

Hide file tree

Showing 20 changed files with 56 additions and 31 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/contracts/burner/Cargo.lock b/contracts/burner/Cargo.lock
diff --git a/contracts/crypto-verify/Cargo.lock b/contracts/crypto-verify/Cargo.lock
diff --git a/contracts/cyberpunk/Cargo.lock b/contracts/cyberpunk/Cargo.lock
diff --git a/contracts/empty/Cargo.lock b/contracts/empty/Cargo.lock
diff --git a/contracts/floaty/Cargo.lock b/contracts/floaty/Cargo.lock
diff --git a/contracts/hackatom/Cargo.lock b/contracts/hackatom/Cargo.lock
diff --git a/contracts/ibc-callbacks/Cargo.lock b/contracts/ibc-callbacks/Cargo.lock
diff --git a/contracts/ibc-reflect-send/Cargo.lock b/contracts/ibc-reflect-send/Cargo.lock
diff --git a/contracts/ibc-reflect/Cargo.lock b/contracts/ibc-reflect/Cargo.lock
diff --git a/contracts/nested-contracts/Cargo.lock b/contracts/nested-contracts/Cargo.lock
diff --git a/contracts/queue/Cargo.lock b/contracts/queue/Cargo.lock
diff --git a/contracts/reflect/Cargo.lock b/contracts/reflect/Cargo.lock
diff --git a/contracts/staking/Cargo.lock b/contracts/staking/Cargo.lock
diff --git a/contracts/virus/Cargo.lock b/contracts/virus/Cargo.lock
diff --git a/packages/go-gen/src/schema.rs b/packages/go-gen/src/schema.rs
@@ -62,7 +62,7 @@ pub fn schema_object_type(
         replace_custom_type(&replace_acronyms(
             reference
                 .split('/')
-                .last()
+                .next_back()
                 .expect("split should always return at least one item"),
         ))
     } else if let Some(t) = &schema.instance_type {
@@ -273,7 +273,7 @@ pub fn is_null(schema: &SchemaObject) -> bool {
     schema
         .instance_type
         .as_ref()
-        .map_or(false, |s| s.contains(&InstanceType::Null))
+        .is_some_and(|s| s.contains(&InstanceType::Null))
 }
 
 pub fn documentation(schema: &SchemaObject) -> Option<String> {

diff --git a/packages/std/Cargo.toml b/packages/std/Cargo.toml
@@ -61,7 +61,7 @@ base64 = "0.22.0"
 bnum = "0.11.0"
 cosmwasm-core = { version = "2.2.0-rc.1", path = "../core" }
 cosmwasm-derive = { version = "2.2.0-rc.1", path = "../derive" }
-derive_more = { version = "1.0.0-beta.6", default-features = false, features = [
+derive_more = { version = "=1.0.0-beta.6", default-features = false, features = [
     "debug",
 ] }
 hex = "0.4"

diff --git a/packages/std/src/lib.rs b/packages/std/src/lib.rs
@@ -125,7 +125,7 @@ mod _warning {
     #[must_use = "cosmwasm-std feature `abort` is deprecated and will be removed in the next major release. You can just remove the feature as this functionality is now the default"]
     struct CompileWarning;
 
-    #[allow(dead_code)]
+    #[allow(dead_code, path_statements)]
     fn trigger_warning() {
         CompileWarning;
     }

diff --git a/packages/vm/Cargo.toml b/packages/vm/Cargo.toml
@@ -52,7 +52,9 @@ cosmwasm-std = { version = "2.2.0-rc.1", path = "../std", default-features = fal
 ] }
 cosmwasm-crypto = { version = "2.2.0-rc.1", path = "../crypto" }
 cosmwasm-vm-derive = { version = "2.2.0-rc.1", path = "../vm-derive" }
-derivative = "2"
+derive_more = { version = "=1.0.0-beta.6", default-features = false, features = [
+    "debug",
+] }
 hex = "0.4"
 rand_core = { version = "0.6", features = ["getrandom"] }
 schemars = { workspace = true }

diff --git a/packages/vm/src/environment.rs b/packages/vm/src/environment.rs
@@ -6,7 +6,7 @@ use std::ptr::NonNull;
 use std::rc::Rc;
 use std::sync::{Arc, RwLock};
 
-use derivative::Derivative;
+use derive_more::Debug;
 use wasmer::{AsStoreMut, Instance as WasmerInstance, Memory, MemoryView, Value};
 use wasmer_middlewares::metering::{get_remaining_points, set_remaining_points, MeteringPoints};
 
@@ -146,15 +146,14 @@ impl GasState {
 ///
 /// The currently unused lifetime parameter 'a allows accessing referenced data in the debug implementation
 /// without cloning it.
-#[derive(Derivative)]
-#[derivative(Debug)]
+#[derive(Debug)]
 #[non_exhaustive]
 pub struct DebugInfo<'a> {
     pub gas_remaining: u64,
     // This field is just to allow us to add the unused lifetime parameter. It can be removed
     // at any time.
     #[doc(hidden)]
-    #[derivative(Debug = "ignore")]
+    #[debug(skip)]
     pub(crate) __lifetime: PhantomData<&'a ()>,
 }