diff --git a/Cargo.lock b/Cargo.lock index 4eea6c90b7..9823cd2820 100755 --- a/Cargo.lock +++ b/Cargo.lock @@ -413,9 +413,9 @@ checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" [[package]] name = "bytes" -version = "1.7.2" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "428d9aa8fbc0670b7b8d6030a7fadd0f86151cae55e4dbbece15f3780a3dfaf3" +checksum = "9ac0150caa2ae65ca5bd83f25c7de183dea78d4d366469f148435e2acfbad0da" [[package]] name = "cc" diff --git a/contracts/feature-tests/composability/interact/src/comp_interact_config.rs b/contracts/feature-tests/composability/interact/src/comp_interact_config.rs index cffff8e915..6bb265245b 100644 --- a/contracts/feature-tests/composability/interact/src/comp_interact_config.rs +++ b/contracts/feature-tests/composability/interact/src/comp_interact_config.rs @@ -65,10 +65,7 @@ impl Config { } pub fn token_amount(&self) -> BigUint { - match BigUint::from_str(&self.amount) { - Ok(amount) => amount, - Err(_) => BigUint::default(), - } + BigUint::from_str(&self.amount).unwrap_or_default() } pub fn token_nonce(&self) -> u64 { diff --git a/framework/meta-lib/src/cargo_toml/cargo_toml_contents.rs b/framework/meta-lib/src/cargo_toml/cargo_toml_contents.rs index d9a5c2e4f1..d37dd467ce 100644 --- a/framework/meta-lib/src/cargo_toml/cargo_toml_contents.rs +++ b/framework/meta-lib/src/cargo_toml/cargo_toml_contents.rs @@ -366,7 +366,7 @@ fn remove_quotes(var: &Value) -> String { #[cfg(test)] mod tests { use super::*; - use crate::cargo_toml::{GitCommitReference, VersionReq}; + use crate::cargo_toml::{DependencyReference, GitCommitReference, VersionReq}; #[test] fn test_change_from_base_to_adapter_path() { diff --git a/framework/meta-lib/src/cargo_toml/version_req.rs b/framework/meta-lib/src/cargo_toml/version_req.rs index f12e714fba..1e834dade5 100644 --- a/framework/meta-lib/src/cargo_toml/version_req.rs +++ b/framework/meta-lib/src/cargo_toml/version_req.rs @@ -22,7 +22,7 @@ impl VersionReq { } } else { VersionReq { - semver: find_version_by_str(&raw).unwrap_or(&LAST_VERSION).clone(), + semver: find_version_by_str(raw).unwrap_or(&LAST_VERSION).clone(), is_strict: false, } } diff --git a/framework/meta-lib/src/contract/wasm_cargo_toml_generate.rs b/framework/meta-lib/src/contract/wasm_cargo_toml_generate.rs index 419d9a8f99..598ea44ca4 100644 --- a/framework/meta-lib/src/contract/wasm_cargo_toml_generate.rs +++ b/framework/meta-lib/src/contract/wasm_cargo_toml_generate.rs @@ -55,7 +55,7 @@ fn add_wasm_crate_deps( ) { let mut wasm_adapter_dep = framework_dependency.clone(); if let Some(path) = &mut wasm_adapter_dep.path { - *path = change_from_base_to_adapter_path(&path); + *path = change_from_base_to_adapter_path(path); } cargo_toml_contents.insert_dependency_raw_value( diff --git a/framework/scenario/src/facade/scenario_world.rs b/framework/scenario/src/facade/scenario_world.rs index 056cbbe7f7..01b07ae211 100644 --- a/framework/scenario/src/facade/scenario_world.rs +++ b/framework/scenario/src/facade/scenario_world.rs @@ -21,7 +21,7 @@ pub struct ScenarioWorld { } pub(crate) enum Backend { - Debugger(DebuggerBackend), + Debugger(Box), VmGoBackend, } @@ -35,10 +35,10 @@ impl ScenarioWorld { pub fn debugger() -> Self { ScenarioWorld { current_dir: std::env::current_dir().unwrap(), - backend: Backend::Debugger(DebuggerBackend { + backend: Backend::Debugger(Box::new(DebuggerBackend { vm_runner: ScenarioVMRunner::new(), trace: None, - }), + })), } }