Merge branch 'master' into peg/version-measurement

* master: Bump uuid from 1.13.2 to 1.14.0 (#1312) Useless conversion clippy error (#1315)
entropyxyz · Feb 22, 2025 · 0183d6f · 0183d6f
2 parents b5c42b9 + 2f45d11
commit 0183d6f
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 4 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/crates/threshold-signature-server/Cargo.toml b/crates/threshold-signature-server/Cargo.toml
@@ -55,7 +55,7 @@ tracing-subscriber      ={ version="0.3.19", features=["env-filter", "json"] }
 tracing-loki            ="0.2"
 tower-http              ={ version="0.6.2", features=["trace", "cors"] }
 tracing-bunyan-formatter="0.3.10"
-uuid                    ={ version="1.13.2", features=["v4"] }
+uuid                    ={ version="1.14.0", features=["v4"] }
 
 # Misc
 tokio-tungstenite="0.26.1"

diff --git a/pallets/programs/src/lib.rs b/pallets/programs/src/lib.rs
@@ -35,6 +35,7 @@
 //! `remove_program` - Allows a deployer to remove a program if not in use.
 
 #![cfg_attr(not(feature = "std"), no_std)]
+#![allow(clippy::useless_conversion)]
 pub use pallet::*;
 
 #[cfg(test)]

diff --git a/pallets/registry/src/lib.rs b/pallets/registry/src/lib.rs
@@ -37,6 +37,7 @@
 #![allow(clippy::new_without_default)]
 #![allow(clippy::or_fun_call)]
 #![allow(clippy::derive_partial_eq_without_eq)] // Substrate confuses clippy
+#![allow(clippy::useless_conversion)]
 pub use pallet::*;
 
 #[cfg(test)]

diff --git a/pallets/staking/src/lib.rs b/pallets/staking/src/lib.rs
@@ -15,7 +15,7 @@
 
 #![cfg_attr(not(feature = "std"), no_std)]
 #![allow(clippy::needless_range_loop)]
-#![allow(clippy::or_fun_call)]
+#![allow(clippy::useless_conversion)]
 //! # Staking Pallet
 //!
 //!