From 6555f97f6b4fede4a65717996a8d12705d058b98 Mon Sep 17 00:00:00 2001 From: Christoph Otter Date: Tue, 12 Nov 2024 21:44:58 +0700 Subject: [PATCH 1/2] Fix typos (cherry picked from commit af9d6cb29db40cce7ffac8501cad39836a690dd6) # Conflicts: # packages/vm/src/modules/file_system_cache.rs --- packages/std/src/math/signed_decimal_256.rs | 2 +- packages/vm/src/modules/file_system_cache.rs | 15 +++++++++++++++ 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/packages/std/src/math/signed_decimal_256.rs b/packages/std/src/math/signed_decimal_256.rs index 9468729c02..978d60d838 100644 --- a/packages/std/src/math/signed_decimal_256.rs +++ b/packages/std/src/math/signed_decimal_256.rs @@ -107,7 +107,7 @@ impl SignedDecimal256 { /// Create a -1.0 SignedDecimal256 #[inline] pub const fn negative_one() -> Self { - // -DECIMAL_FRATIONAL + // -DECIMAL_FRACTIONAL Self(Int256::from_i128(-1_000_000_000_000_000_000)) } diff --git a/packages/vm/src/modules/file_system_cache.rs b/packages/vm/src/modules/file_system_cache.rs index 719d9c913a..01e9855d1c 100644 --- a/packages/vm/src/modules/file_system_cache.rs +++ b/packages/vm/src/modules/file_system_cache.rs @@ -405,12 +405,27 @@ mod tests { }; let target = Target::new(triple, wasmer::CpuFeature::POPCNT.into()); let p = modules_path(&base, 17, &target); +<<<<<<< HEAD assert_eq!( p.as_os_str(), if cfg!(windows) { "modules\\v11-wasmer17\\x86_64-nintendo-fuchsia-gnu-coff-01E9F9FE" } else { "modules/v11-wasmer17/x86_64-nintendo-fuchsia-gnu-coff-01E9F9FE" +======= + let discriminator = raw_module_version_discriminator(); + + assert_eq!( + p.as_os_str(), + if cfg!(windows) { + format!( + "modules\\{discriminator}-wasmer17\\x86_64-nintendo-fuchsia-gnu-coff-01E9F9FE" + ) + } else { + format!( + "modules/{discriminator}-wasmer17/x86_64-nintendo-fuchsia-gnu-coff-01E9F9FE" + ) +>>>>>>> af9d6cb29 (Fix typos) } ); } From d6e5daad89876f3d968fe1d8c36fd45f9f2e6027 Mon Sep 17 00:00:00 2001 From: Christoph Otter Date: Mon, 16 Dec 2024 09:52:29 +0100 Subject: [PATCH 2/2] Fix conflict --- packages/vm/src/modules/file_system_cache.rs | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/packages/vm/src/modules/file_system_cache.rs b/packages/vm/src/modules/file_system_cache.rs index 01e9855d1c..719d9c913a 100644 --- a/packages/vm/src/modules/file_system_cache.rs +++ b/packages/vm/src/modules/file_system_cache.rs @@ -405,27 +405,12 @@ mod tests { }; let target = Target::new(triple, wasmer::CpuFeature::POPCNT.into()); let p = modules_path(&base, 17, &target); -<<<<<<< HEAD assert_eq!( p.as_os_str(), if cfg!(windows) { "modules\\v11-wasmer17\\x86_64-nintendo-fuchsia-gnu-coff-01E9F9FE" } else { "modules/v11-wasmer17/x86_64-nintendo-fuchsia-gnu-coff-01E9F9FE" -======= - let discriminator = raw_module_version_discriminator(); - - assert_eq!( - p.as_os_str(), - if cfg!(windows) { - format!( - "modules\\{discriminator}-wasmer17\\x86_64-nintendo-fuchsia-gnu-coff-01E9F9FE" - ) - } else { - format!( - "modules/{discriminator}-wasmer17/x86_64-nintendo-fuchsia-gnu-coff-01E9F9FE" - ) ->>>>>>> af9d6cb29 (Fix typos) } ); }