From 658a0e920a0c29a9714b2c100db9bf548f0912a8 Mon Sep 17 00:00:00 2001 From: Christoph Otter Date: Tue, 12 Nov 2024 21:44:58 +0700 Subject: [PATCH] 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 1753662084..a7f4715f59 100644 --- a/packages/std/src/math/signed_decimal_256.rs +++ b/packages/std/src/math/signed_decimal_256.rs @@ -108,7 +108,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 5d16e8d25a..416a7818ec 100644 --- a/packages/vm/src/modules/file_system_cache.rs +++ b/packages/vm/src/modules/file_system_cache.rs @@ -406,12 +406,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\\v12-wasmer17\\x86_64-nintendo-fuchsia-gnu-coff-01E9F9FE" } else { "modules/v12-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) } ); }