From a78a053fb698247b5c48a1f7cc9a1bf0a490ddf5 Mon Sep 17 00:00:00 2001 From: Ivan Kalinin Date: Thu, 20 Feb 2025 17:24:22 +0100 Subject: [PATCH] Update dependencies --- Cargo.lock | 11 +++++++++-- Cargo.toml | 2 +- asm/src/asm/opcodes.rs | 12 ++++++------ asm/src/ast.rs | 2 +- asm/src/lib.rs | 2 +- 5 files changed, 18 insertions(+), 11 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 8ee2ecc..87affc7 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -310,7 +310,7 @@ dependencies = [ [[package]] name = "everscale-types" version = "0.1.2" -source = "git+https://github.com/broxus/everscale-types.git?rev=69c344eac4e1f95d66b045ae90db904ad8afdfaf#69c344eac4e1f95d66b045ae90db904ad8afdfaf" +source = "git+https://github.com/broxus/everscale-types.git?rev=9dcfe1aa2ebeca82428cc860267653ec8036725e#9dcfe1aa2ebeca82428cc860267653ec8036725e" dependencies = [ "ahash", "base64", @@ -322,12 +322,13 @@ dependencies = [ "sha2", "smallvec", "thiserror", + "typeid", ] [[package]] name = "everscale-types-proc" version = "0.1.5" -source = "git+https://github.com/broxus/everscale-types.git?rev=69c344eac4e1f95d66b045ae90db904ad8afdfaf#69c344eac4e1f95d66b045ae90db904ad8afdfaf" +source = "git+https://github.com/broxus/everscale-types.git?rev=9dcfe1aa2ebeca82428cc860267653ec8036725e#9dcfe1aa2ebeca82428cc860267653ec8036725e" dependencies = [ "proc-macro2", "quote", @@ -1301,6 +1302,12 @@ dependencies = [ "unicode-width 0.1.14", ] +[[package]] +name = "typeid" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0e13db2e0ccd5e14a544e8a246ba2312cd25223f616442d7f2cb0e3db614236e" + [[package]] name = "typenum" version = "1.17.0" diff --git a/Cargo.toml b/Cargo.toml index cd9f48e..fb4735a 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -34,4 +34,4 @@ unicode-width = "0.1" everscale-types = { version = "0.1.2", default-features = false } [patch.crates-io] -everscale-types = { git = "https://github.com/broxus/everscale-types.git", rev = "69c344eac4e1f95d66b045ae90db904ad8afdfaf" } +everscale-types = { git = "https://github.com/broxus/everscale-types.git", rev = "9dcfe1aa2ebeca82428cc860267653ec8036725e" } diff --git a/asm/src/asm/opcodes.rs b/asm/src/asm/opcodes.rs index adb476d..3f4805c 100644 --- a/asm/src/asm/opcodes.rs +++ b/asm/src/asm/opcodes.rs @@ -1456,7 +1456,7 @@ fn op_stsliceconst(ctx: &mut Context, instr: &ast::Instr<'_>) -> Result<(), AsmE b.store_bit_one()?; b.store_small_uint(refs, 2)?; b.store_small_uint(l as u8, 3)?; - b.store_slice(c.as_slice_allow_pruned())?; + b.store_slice(c.as_slice_allow_exotic())?; write_slice_padding(padding, b) } } @@ -1487,7 +1487,7 @@ fn write_pushslice(ctx: &mut Context, c: Cell) -> Result<(), Error> { let b = ctx.get_builder_ext(8 + 4 + bits + padding, refs + 1); b.store_u8(0x8b)?; b.store_small_uint(l as u8, 4)?; - b.store_slice(c.as_slice_allow_pruned())?; + b.store_slice(c.as_slice_allow_exotic())?; write_slice_padding(padding, b) } else if bits <= 248 && refs >= 1 { let l = (bits + 7) / 8; @@ -1496,7 +1496,7 @@ fn write_pushslice(ctx: &mut Context, c: Cell) -> Result<(), Error> { b.store_u8(0x8c)?; b.store_small_uint(refs - 1, 2)?; b.store_small_uint(l as u8, 5)?; - b.store_slice(c.as_slice_allow_pruned())?; + b.store_slice(c.as_slice_allow_exotic())?; write_slice_padding(padding, b) } else { let l = (bits + 2) / 8; @@ -1505,7 +1505,7 @@ fn write_pushslice(ctx: &mut Context, c: Cell) -> Result<(), Error> { b.store_u8(0x8d)?; b.store_small_uint(refs, 3)?; b.store_small_uint(l as u8, 7)?; - b.store_slice(c.as_slice_allow_pruned())?; + b.store_slice(c.as_slice_allow_exotic())?; write_slice_padding(padding, b) } } @@ -1534,11 +1534,11 @@ fn op_pushcont(ctx: &mut Context, instr: &ast::Instr<'_>) -> Result<(), AsmError } else if bits <= 120 && refs == 0 { let b = ctx.get_builder(8 + bits); b.store_u8(0x90 | (bits / 8) as u8)?; - b.store_slice(c.as_slice_allow_pruned()) + b.store_slice(c.as_slice_allow_exotic()) } else { let b = ctx.get_builder_ext(16 + bits, refs + 1); b.store_u16(0x8e00 | ((refs as u16) << 7) | (bits / 8))?; - b.store_slice(c.as_slice_allow_pruned()) + b.store_slice(c.as_slice_allow_exotic()) } } diff --git a/asm/src/ast.rs b/asm/src/ast.rs index 17bef2e..6978115 100644 --- a/asm/src/ast.rs +++ b/asm/src/ast.rs @@ -241,7 +241,7 @@ fn nat<'a>() -> impl Parser<'a, &'a str, BigInt, extra::Err> + Clon let number = choice(( just("0x") - .ignore_then(num_slice.clone()) + .ignore_then(num_slice) .try_map(|s, span| parse_int(s, 16, span)), just("0b") .ignore_then(num_slice) diff --git a/asm/src/lib.rs b/asm/src/lib.rs index 6876a0c..ae30ca7 100644 --- a/asm/src/lib.rs +++ b/asm/src/lib.rs @@ -274,7 +274,7 @@ mod tests { #[test] fn stsliceconst() -> anyhow::Result<()> { let code = Code::assemble("STSLICECONST x{cf_}")?; - assert_eq!(code.as_slice_allow_pruned().load_uint(24)?, 0xcf873c); + assert_eq!(code.as_slice_allow_exotic().load_uint(24)?, 0xcf873c); Ok(()) } }