From da202cd2a1a316ffb0b3d289814df30d9d83c90d Mon Sep 17 00:00:00 2001 From: Robin Freyler Date: Fri, 5 Dec 2025 11:18:29 +0100 Subject: [PATCH] rename wasmi_ir2 crate to wasmi_ir --- Cargo.lock | 6 +++--- Cargo.toml | 4 ++-- codecov.yml | 2 +- crates/{ir2 => ir}/Cargo.toml | 4 ++-- crates/{ir2 => ir}/build.rs | 0 crates/{ir2 => ir}/build/display/constructors.rs | 0 crates/{ir2 => ir}/build/display/decode.rs | 0 crates/{ir2 => ir}/build/display/encode.rs | 0 crates/{ir2 => ir}/build/display/ident.rs | 0 crates/{ir2 => ir}/build/display/mod.rs | 0 crates/{ir2 => ir}/build/display/op.rs | 0 crates/{ir2 => ir}/build/display/op_code.rs | 0 crates/{ir2 => ir}/build/display/result.rs | 0 crates/{ir2 => ir}/build/display/utils.rs | 0 crates/{ir2 => ir}/build/ident.rs | 0 crates/{ir2 => ir}/build/isa.rs | 0 crates/{ir2 => ir}/build/mod.rs | 0 crates/{ir2 => ir}/build/op.rs | 0 crates/{ir2 => ir}/src/decode/mod.rs | 0 crates/{ir2 => ir}/src/decode/op.rs | 0 crates/{ir2 => ir}/src/encode.rs | 0 crates/{ir2 => ir}/src/error.rs | 0 crates/{ir2 => ir}/src/index.rs | 0 crates/{ir2 => ir}/src/lib.rs | 0 crates/{ir2 => ir}/src/op.rs | 0 crates/{ir2 => ir}/src/opcode.rs | 0 crates/{ir2 => ir}/src/primitive.rs | 0 crates/{ir2 => ir}/src/span.rs | 0 crates/wasmi/Cargo.toml | 4 ++-- crates/wasmi/src/lib.rs | 2 +- 30 files changed, 11 insertions(+), 11 deletions(-) rename crates/{ir2 => ir}/Cargo.toml (90%) rename crates/{ir2 => ir}/build.rs (100%) rename crates/{ir2 => ir}/build/display/constructors.rs (100%) rename crates/{ir2 => ir}/build/display/decode.rs (100%) rename crates/{ir2 => ir}/build/display/encode.rs (100%) rename crates/{ir2 => ir}/build/display/ident.rs (100%) rename crates/{ir2 => ir}/build/display/mod.rs (100%) rename crates/{ir2 => ir}/build/display/op.rs (100%) rename crates/{ir2 => ir}/build/display/op_code.rs (100%) rename crates/{ir2 => ir}/build/display/result.rs (100%) rename crates/{ir2 => ir}/build/display/utils.rs (100%) rename crates/{ir2 => ir}/build/ident.rs (100%) rename crates/{ir2 => ir}/build/isa.rs (100%) rename crates/{ir2 => ir}/build/mod.rs (100%) rename crates/{ir2 => ir}/build/op.rs (100%) rename crates/{ir2 => ir}/src/decode/mod.rs (100%) rename crates/{ir2 => ir}/src/decode/op.rs (100%) rename crates/{ir2 => ir}/src/encode.rs (100%) rename crates/{ir2 => ir}/src/error.rs (100%) rename crates/{ir2 => ir}/src/index.rs (100%) rename crates/{ir2 => ir}/src/lib.rs (100%) rename crates/{ir2 => ir}/src/op.rs (100%) rename crates/{ir2 => ir}/src/opcode.rs (100%) rename crates/{ir2 => ir}/src/primitive.rs (100%) rename crates/{ir2 => ir}/src/span.rs (100%) diff --git a/Cargo.lock b/Cargo.lock index 3d4a34228df..0aa19904394 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1728,7 +1728,7 @@ dependencies = [ "spin", "wasmi_collections 0.49.1", "wasmi_core 0.49.1", - "wasmi_ir", + "wasmi_ir 0.49.1", "wasmparser 0.228.0", "wat", ] @@ -1742,7 +1742,7 @@ dependencies = [ "spin", "wasmi_collections 1.0.0", "wasmi_core 1.0.0", - "wasmi_ir2", + "wasmi_ir 1.0.0", "wasmparser 0.228.0", "wat", ] @@ -1857,7 +1857,7 @@ dependencies = [ ] [[package]] -name = "wasmi_ir2" +name = "wasmi_ir" version = "1.0.0" dependencies = [ "wasmi_core 1.0.0", diff --git a/Cargo.toml b/Cargo.toml index c39e405a79f..d7ec3aa323d 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -7,7 +7,7 @@ members = [ "crates/core", "crates/wasmi", "crates/wasi", - "crates/ir2", + "crates/ir", "crates/fuzz", "crates/wast", "fuzz", @@ -33,7 +33,7 @@ exclude = ["tests"] wasmi = { version = "1.0.0", path = "crates/wasmi", default-features = false } wasmi_wasi = { version = "1.0.0", path = "crates/wasi", default-features = false } wasmi_core = { version = "1.0.0", path = "crates/core", default-features = false } -wasmi_ir2 = { version = "1.0.0", path = "crates/ir2", default-features = false } +wasmi_ir = { version = "1.0.0", path = "crates/ir", default-features = false } wasmi_collections = { version = "1.0.0", path = "crates/collections", default-features = false } wasmi_c_api_impl = { version = "1.0.0", path = "crates/c_api" } wasmi_c_api_macros = { version = "1.0.0", path = "crates/c_api/macro" } diff --git a/codecov.yml b/codecov.yml index 91568e8d680..f3bc1bfe4c1 100644 --- a/codecov.yml +++ b/codecov.yml @@ -6,4 +6,4 @@ coverage: threshold: 1% ignore: - - "crates/ir2/**" + - "crates/ir/**" diff --git a/crates/ir2/Cargo.toml b/crates/ir/Cargo.toml similarity index 90% rename from crates/ir2/Cargo.toml rename to crates/ir/Cargo.toml index e6f84f5a078..82cf659c887 100644 --- a/crates/ir2/Cargo.toml +++ b/crates/ir/Cargo.toml @@ -1,8 +1,8 @@ [package] -name = "wasmi_ir2" +name = "wasmi_ir" version.workspace = true rust-version.workspace = true -documentation = "https://docs.rs/wasmi_ir2/" +documentation = "https://docs.rs/wasmi_ir/" description = "WebAssembly interpreter internal bytecode representation" authors.workspace = true repository.workspace = true diff --git a/crates/ir2/build.rs b/crates/ir/build.rs similarity index 100% rename from crates/ir2/build.rs rename to crates/ir/build.rs diff --git a/crates/ir2/build/display/constructors.rs b/crates/ir/build/display/constructors.rs similarity index 100% rename from crates/ir2/build/display/constructors.rs rename to crates/ir/build/display/constructors.rs diff --git a/crates/ir2/build/display/decode.rs b/crates/ir/build/display/decode.rs similarity index 100% rename from crates/ir2/build/display/decode.rs rename to crates/ir/build/display/decode.rs diff --git a/crates/ir2/build/display/encode.rs b/crates/ir/build/display/encode.rs similarity index 100% rename from crates/ir2/build/display/encode.rs rename to crates/ir/build/display/encode.rs diff --git a/crates/ir2/build/display/ident.rs b/crates/ir/build/display/ident.rs similarity index 100% rename from crates/ir2/build/display/ident.rs rename to crates/ir/build/display/ident.rs diff --git a/crates/ir2/build/display/mod.rs b/crates/ir/build/display/mod.rs similarity index 100% rename from crates/ir2/build/display/mod.rs rename to crates/ir/build/display/mod.rs diff --git a/crates/ir2/build/display/op.rs b/crates/ir/build/display/op.rs similarity index 100% rename from crates/ir2/build/display/op.rs rename to crates/ir/build/display/op.rs diff --git a/crates/ir2/build/display/op_code.rs b/crates/ir/build/display/op_code.rs similarity index 100% rename from crates/ir2/build/display/op_code.rs rename to crates/ir/build/display/op_code.rs diff --git a/crates/ir2/build/display/result.rs b/crates/ir/build/display/result.rs similarity index 100% rename from crates/ir2/build/display/result.rs rename to crates/ir/build/display/result.rs diff --git a/crates/ir2/build/display/utils.rs b/crates/ir/build/display/utils.rs similarity index 100% rename from crates/ir2/build/display/utils.rs rename to crates/ir/build/display/utils.rs diff --git a/crates/ir2/build/ident.rs b/crates/ir/build/ident.rs similarity index 100% rename from crates/ir2/build/ident.rs rename to crates/ir/build/ident.rs diff --git a/crates/ir2/build/isa.rs b/crates/ir/build/isa.rs similarity index 100% rename from crates/ir2/build/isa.rs rename to crates/ir/build/isa.rs diff --git a/crates/ir2/build/mod.rs b/crates/ir/build/mod.rs similarity index 100% rename from crates/ir2/build/mod.rs rename to crates/ir/build/mod.rs diff --git a/crates/ir2/build/op.rs b/crates/ir/build/op.rs similarity index 100% rename from crates/ir2/build/op.rs rename to crates/ir/build/op.rs diff --git a/crates/ir2/src/decode/mod.rs b/crates/ir/src/decode/mod.rs similarity index 100% rename from crates/ir2/src/decode/mod.rs rename to crates/ir/src/decode/mod.rs diff --git a/crates/ir2/src/decode/op.rs b/crates/ir/src/decode/op.rs similarity index 100% rename from crates/ir2/src/decode/op.rs rename to crates/ir/src/decode/op.rs diff --git a/crates/ir2/src/encode.rs b/crates/ir/src/encode.rs similarity index 100% rename from crates/ir2/src/encode.rs rename to crates/ir/src/encode.rs diff --git a/crates/ir2/src/error.rs b/crates/ir/src/error.rs similarity index 100% rename from crates/ir2/src/error.rs rename to crates/ir/src/error.rs diff --git a/crates/ir2/src/index.rs b/crates/ir/src/index.rs similarity index 100% rename from crates/ir2/src/index.rs rename to crates/ir/src/index.rs diff --git a/crates/ir2/src/lib.rs b/crates/ir/src/lib.rs similarity index 100% rename from crates/ir2/src/lib.rs rename to crates/ir/src/lib.rs diff --git a/crates/ir2/src/op.rs b/crates/ir/src/op.rs similarity index 100% rename from crates/ir2/src/op.rs rename to crates/ir/src/op.rs diff --git a/crates/ir2/src/opcode.rs b/crates/ir/src/opcode.rs similarity index 100% rename from crates/ir2/src/opcode.rs rename to crates/ir/src/opcode.rs diff --git a/crates/ir2/src/primitive.rs b/crates/ir/src/primitive.rs similarity index 100% rename from crates/ir2/src/primitive.rs rename to crates/ir/src/primitive.rs diff --git a/crates/ir2/src/span.rs b/crates/ir/src/span.rs similarity index 100% rename from crates/ir2/src/span.rs rename to crates/ir/src/span.rs diff --git a/crates/wasmi/Cargo.toml b/crates/wasmi/Cargo.toml index 72b1a18f80f..0dca6b87d11 100644 --- a/crates/wasmi/Cargo.toml +++ b/crates/wasmi/Cargo.toml @@ -21,7 +21,7 @@ exclude = [ [dependencies] wasmi_core = { workspace = true } wasmi_collections = { workspace = true } -wasmi_ir2 = { workspace = true } +wasmi_ir = { workspace = true } wasmparser = { workspace = true, features = ["validate", "features"] } wat = { workspace = true, optional = true } spin = { version = "0.9", default-features = false, features = [ @@ -51,7 +51,7 @@ prefer-btree-collections = [ "wasmparser/prefer-btree-collections", ] wat = ["dep:wat", "std"] -simd = ["wasmi_core/simd", "wasmi_ir2/simd", "wasmparser/simd"] +simd = ["wasmi_core/simd", "wasmi_ir/simd", "wasmparser/simd"] # Enables a portable dispatch scheme that avoids tail-call reliance. # Recommended for targets without stable or guaranteed tail-call support. diff --git a/crates/wasmi/src/lib.rs b/crates/wasmi/src/lib.rs index ac29e3897e2..d24afcf99f6 100644 --- a/crates/wasmi/src/lib.rs +++ b/crates/wasmi/src/lib.rs @@ -142,7 +142,7 @@ use wasmi_collections as collections; /// Definitions from the `wasmi_ir` crate. #[doc(inline)] -use wasmi_ir2 as ir; +use wasmi_ir as ir; /// Defines some errors that may occur upon interaction with Wasmi. pub mod errors {