From b61c37373d301f54e07258f94ba4361ddbdee51a Mon Sep 17 00:00:00 2001 From: Riey Date: Wed, 18 Sep 2024 01:56:09 +0900 Subject: [PATCH] Fix compile error --- Cargo.lock | 12 +++++++----- crates/erars-ast/Cargo.toml | 2 +- crates/erars-compiler/src/compiler.rs | 2 +- crates/erars-vm/src/terminal_vm/executor.rs | 2 +- 4 files changed, 10 insertions(+), 8 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index cb96845..890964e 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -770,11 +770,12 @@ dependencies = [ [[package]] name = "dashmap" -version = "5.5.3" +version = "6.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "978747c1d849a7d2ee5e8adc0159961c48fb7e5db2f06af6723b80123bb53856" +checksum = "5041cc499144891f3790297212f32a74fb938e5136a14943f338ef9e0ae276cf" dependencies = [ "cfg-if", + "crossbeam-utils", "hashbrown 0.14.3", "lock_api", "once_cell", @@ -1585,6 +1586,7 @@ checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604" dependencies = [ "ahash", "allocator-api2", + "serde", ] [[package]] @@ -1846,13 +1848,13 @@ checksum = "e2db585e1d738fc771bf08a151420d3ed193d9d895a36df7f6f8a9456b911ddc" [[package]] name = "lasso" -version = "0.7.2" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4644821e1c3d7a560fe13d842d13f587c07348a1a05d3a797152d41c90c56df2" +checksum = "6e14eda50a3494b3bf7b9ce51c52434a761e383d7238ce1dd5dcec2fbc13e9fb" dependencies = [ "ahash", "dashmap", - "hashbrown 0.13.2", + "hashbrown 0.14.3", "serde", ] diff --git a/crates/erars-ast/Cargo.toml b/crates/erars-ast/Cargo.toml index fcae06c..02c51f8 100644 --- a/crates/erars-ast/Cargo.toml +++ b/crates/erars-ast/Cargo.toml @@ -15,7 +15,7 @@ ordered-float = { version = "3.0.0", features = ["serde"] } serde = { version = "1.0.142", features = ["derive"] } strum = { version = "0.24.1", features = ["derive", "phf"] } anyhow = { version = "1" } -lasso = { version = "0.7.2", features = ["multi-threaded", "ahasher", "serialize"] } +lasso = { version = "0.7.3", features = ["multi-threaded", "ahasher", "serialize"] } [dev-dependencies] k9 = "0.11.1" diff --git a/crates/erars-compiler/src/compiler.rs b/crates/erars-compiler/src/compiler.rs index dcfcb33..2b79d14 100644 --- a/crates/erars-compiler/src/compiler.rs +++ b/crates/erars-compiler/src/compiler.rs @@ -127,7 +127,7 @@ impl Compiler { if let Ok(i) = i.try_into() { self.push(Instruction::load_int(i)) } else { - #[cfg(target_engian = "big")] + #[cfg(target_endian = "big")] compile_error!("Big endian not supported"); let (l, r): (i32, i32) = unsafe { std::mem::transmute(i) }; self.push(Instruction::load_int(l)); diff --git a/crates/erars-vm/src/terminal_vm/executor.rs b/crates/erars-vm/src/terminal_vm/executor.rs index 9b949ca..e7928ef 100644 --- a/crates/erars-vm/src/terminal_vm/executor.rs +++ b/crates/erars-vm/src/terminal_vm/executor.rs @@ -115,7 +115,7 @@ pub(super) fn run_instruction( ctx.push(i as i64); } else if let Some(r) = inst.as_load_int_suffix() { let l = ctx.pop_int()? as i32; - #[cfg(target_engian = "big")] + #[cfg(target_endian = "big")] compile_error!("Big endian not supported"); let i: i64 = unsafe { std::mem::transmute((l, r)) }; ctx.push(i);