From d6da17ff27d4d3b11a3094420d9f87e23efb2759 Mon Sep 17 00:00:00 2001 From: Alex Crichton Date: Thu, 10 Apr 2025 12:42:10 -0700 Subject: [PATCH 1/4] Migrate `options` test to `wit-bindgen test` --- crates/test-rust-wasm/Cargo.toml | 4 -- crates/test-rust-wasm/src/bin/options.rs | 3 - tests/runtime-new/options/runner.cs | 20 ++++++ tests/runtime-new/options/runner.rs | 14 ++++ tests/runtime-new/options/test.cs | 37 ++++++++++ tests/runtime-new/options/test.rs | 30 ++++++++ .../options/test.wit} | 11 +-- tests/runtime/main.rs | 1 - tests/runtime/options.rs | 72 ------------------- tests/runtime/options/wasm.cs | 56 --------------- tests/runtime/options/wasm.rs | 48 ------------- 11 files changed, 107 insertions(+), 189 deletions(-) delete mode 100644 crates/test-rust-wasm/src/bin/options.rs create mode 100644 tests/runtime-new/options/runner.cs create mode 100644 tests/runtime-new/options/runner.rs create mode 100644 tests/runtime-new/options/test.cs create mode 100644 tests/runtime-new/options/test.rs rename tests/{runtime/options/world.wit => runtime-new/options/test.wit} (79%) delete mode 100644 tests/runtime/options.rs delete mode 100644 tests/runtime/options/wasm.cs delete mode 100644 tests/runtime/options/wasm.rs diff --git a/crates/test-rust-wasm/Cargo.toml b/crates/test-rust-wasm/Cargo.toml index 943015ee1..a2d6c000b 100644 --- a/crates/test-rust-wasm/Cargo.toml +++ b/crates/test-rust-wasm/Cargo.toml @@ -14,7 +14,3 @@ doctest = false [[bin]] name = "results" test = false - -[[bin]] -name = "options" -test = false diff --git a/crates/test-rust-wasm/src/bin/options.rs b/crates/test-rust-wasm/src/bin/options.rs deleted file mode 100644 index b5ecf242a..000000000 --- a/crates/test-rust-wasm/src/bin/options.rs +++ /dev/null @@ -1,3 +0,0 @@ -include!("../../../../tests/runtime/options/wasm.rs"); - -fn main() {} diff --git a/tests/runtime-new/options/runner.cs b/tests/runtime-new/options/runner.cs new file mode 100644 index 000000000..8f145e343 --- /dev/null +++ b/tests/runtime-new/options/runner.cs @@ -0,0 +1,20 @@ +using System.Diagnostics; +using RunnerWorld.wit.imports.test.options; + +namespace RunnerWorld +{ + public class Program + { + public static void Main() + { + ToTestInterop.OptionNoneParam(null); + ToTestInterop.OptionSomeParam("foo"); + Debug.Assert(ToTestInterop.OptionNoneResult() == null); + Debug.Assert(ToTestInterop.OptionSomeResult() == "foo"); + Debug.Assert(ToTestInterop.OptionRoundtrip("foo") == "foo"); + Debug.Assert(ToTestInterop.DoubleOptionRoundtrip(new Option(42)).Value == 42); + Debug.Assert(ToTestInterop.DoubleOptionRoundtrip(new Option(null)).Value == null); + Debug.Assert(!ToTestInterop.DoubleOptionRoundtrip(Option.None).HasValue); + } + } +} diff --git a/tests/runtime-new/options/runner.rs b/tests/runtime-new/options/runner.rs new file mode 100644 index 000000000..9e346bded --- /dev/null +++ b/tests/runtime-new/options/runner.rs @@ -0,0 +1,14 @@ +include!(env!("BINDINGS")); + +use test::options::to_test::*; + +fn main() { + option_none_param(None); + option_some_param(Some("foo")); + assert!(option_none_result().is_none()); + assert_eq!(option_some_result(), Some("foo".to_string())); + assert_eq!(option_roundtrip(Some("foo")), Some("foo".to_string())); + assert_eq!(double_option_roundtrip(Some(Some(42))), Some(Some(42))); + assert_eq!(double_option_roundtrip(Some(None)), Some(None)); + assert_eq!(double_option_roundtrip(None), None); +} diff --git a/tests/runtime-new/options/test.cs b/tests/runtime-new/options/test.cs new file mode 100644 index 000000000..38380c82c --- /dev/null +++ b/tests/runtime-new/options/test.cs @@ -0,0 +1,37 @@ +using System.Diagnostics; + +namespace TestWorld.wit.exports.test.options +{ + public class ToTestImpl : IToTest + { + public static void OptionNoneParam(string? a) + { + Debug.Assert(a == null); + } + + public static string? OptionNoneResult() + { + return null; + } + + public static void OptionSomeParam(string? a) + { + Debug.Assert(a == "foo"); + } + + public static string? OptionSomeResult() + { + return "foo"; + } + + public static string? OptionRoundtrip(string? a) + { + return a; + } + + public static Option DoubleOptionRoundtrip(Option a) + { + return a; + } + } +} diff --git a/tests/runtime-new/options/test.rs b/tests/runtime-new/options/test.rs new file mode 100644 index 000000000..35eb08bbd --- /dev/null +++ b/tests/runtime-new/options/test.rs @@ -0,0 +1,30 @@ +include!(env!("BINDINGS")); +struct Component; + +export!(Component); + +impl exports::test::options::to_test::Guest for Component { + fn option_none_param(a: Option) { + assert!(a.is_none()); + } + + fn option_none_result() -> Option { + None + } + + fn option_some_param(a: Option) { + assert_eq!(a, Some("foo".to_string())); + } + + fn option_some_result() -> Option { + Some("foo".to_string()) + } + + fn option_roundtrip(a: Option) -> Option { + a + } + + fn double_option_roundtrip(a: Option>) -> Option> { + a + } +} diff --git a/tests/runtime/options/world.wit b/tests/runtime-new/options/test.wit similarity index 79% rename from tests/runtime/options/world.wit rename to tests/runtime-new/options/test.wit index b7a2ff180..29cf232e2 100644 --- a/tests/runtime/options/world.wit +++ b/tests/runtime-new/options/test.wit @@ -1,6 +1,6 @@ package test:options; -interface test { +interface to-test { option-none-param: func(a: option); option-some-param: func(a: option); option-none-result: func() -> option; @@ -11,9 +11,10 @@ interface test { double-option-roundtrip: func(a: option>) -> option>; } -world options { - import test; - export test; +world test { + export to-test; +} - export test-imports: func(); +world runner { + import to-test; } diff --git a/tests/runtime/main.rs b/tests/runtime/main.rs index 2de2cf007..c6893f0f3 100644 --- a/tests/runtime/main.rs +++ b/tests/runtime/main.rs @@ -13,7 +13,6 @@ use wasmtime_wasi::{WasiCtx, WasiCtxBuilder, WasiView}; use wit_component::{ComponentEncoder, StringEncoding}; use wit_parser::{Resolve, WorldId, WorldItem}; -mod options; mod results; struct MyCtx {} diff --git a/tests/runtime/options.rs b/tests/runtime/options.rs deleted file mode 100644 index f0238e0fa..000000000 --- a/tests/runtime/options.rs +++ /dev/null @@ -1,72 +0,0 @@ -use anyhow::Result; -use wasmtime::Store; - -wasmtime::component::bindgen!(in "tests/runtime/options"); - -#[derive(Default)] -pub struct MyImports; - -impl test::options::test::Host for MyImports { - fn option_none_param(&mut self, a: Option) { - assert!(a.is_none()); - } - - fn option_none_result(&mut self) -> Option { - None - } - - fn option_some_param(&mut self, a: Option) { - assert_eq!(a, Some("foo".to_string())); - } - - fn option_some_result(&mut self) -> Option { - Some("foo".to_string()) - } - - fn option_roundtrip(&mut self, a: Option) -> Option { - a - } - - fn double_option_roundtrip(&mut self, a: Option>) -> Option> { - a - } -} - -#[test] -fn run() -> Result<()> { - crate::run_test( - "options", - |linker| Options::add_to_linker(linker, |x| &mut x.0), - |store, component, linker| Options::instantiate(store, component, linker), - run_test, - ) -} - -fn run_test(exports: Options, store: &mut Store>) -> Result<()> { - exports.call_test_imports(&mut *store)?; - let exports = exports.test_options_test(); - assert!(exports.call_option_none_result(&mut *store)?.is_none()); - assert_eq!( - exports.call_option_some_result(&mut *store)?, - Some("foo".to_string()) - ); - exports.call_option_none_param(&mut *store, None)?; - exports.call_option_some_param(&mut *store, Some("foo"))?; - assert_eq!( - exports.call_option_roundtrip(&mut *store, Some("foo"))?, - Some("foo".to_string()) - ); - assert_eq!( - exports.call_double_option_roundtrip(&mut *store, Some(Some(42)))?, - Some(Some(42)) - ); - assert_eq!( - exports.call_double_option_roundtrip(&mut *store, Some(None))?, - Some(None) - ); - assert_eq!( - exports.call_double_option_roundtrip(&mut *store, None)?, - None - ); - Ok(()) -} diff --git a/tests/runtime/options/wasm.cs b/tests/runtime/options/wasm.cs deleted file mode 100644 index 477474332..000000000 --- a/tests/runtime/options/wasm.cs +++ /dev/null @@ -1,56 +0,0 @@ -using System.Diagnostics; -using OptionsWorld.wit.imports.test.options; - -namespace OptionsWorld.wit.exports.test.options -{ - public class TestImpl : ITest - { - public static void OptionNoneParam(string? a) - { - Debug.Assert(a == null); - } - - public static string? OptionNoneResult() - { - return null; - } - - public static void OptionSomeParam(string? a) - { - Debug.Assert(a == "foo"); - } - - public static string? OptionSomeResult() - { - return "foo"; - } - - public static string? OptionRoundtrip(string? a) - { - return a; - } - - public static Option DoubleOptionRoundtrip(Option a) - { - return a; - } - } -} - -namespace OptionsWorld -{ - public class OptionsWorldImpl : IOptionsWorld - { - public static void TestImports() - { - TestInterop.OptionNoneParam(null); - TestInterop.OptionSomeParam("foo"); - Debug.Assert(TestInterop.OptionNoneResult() == null); - Debug.Assert(TestInterop.OptionSomeResult() == "foo"); - Debug.Assert(TestInterop.OptionRoundtrip("foo") == "foo"); - Debug.Assert(TestInterop.DoubleOptionRoundtrip(new Option(42)).Value == 42); - Debug.Assert(TestInterop.DoubleOptionRoundtrip(new Option(null)).Value == null); - Debug.Assert(!TestInterop.DoubleOptionRoundtrip(Option.None).HasValue); - } - } -} diff --git a/tests/runtime/options/wasm.rs b/tests/runtime/options/wasm.rs deleted file mode 100644 index 34fed3137..000000000 --- a/tests/runtime/options/wasm.rs +++ /dev/null @@ -1,48 +0,0 @@ -wit_bindgen::generate!({ - path: "../../tests/runtime/options", -}); - -struct Component; - -export!(Component); - -impl Guest for Component { - fn test_imports() { - use test::options::test::*; - - option_none_param(None); - option_some_param(Some("foo")); - assert!(option_none_result().is_none()); - assert_eq!(option_some_result(), Some("foo".to_string())); - assert_eq!(option_roundtrip(Some("foo")), Some("foo".to_string())); - assert_eq!(double_option_roundtrip(Some(Some(42))), Some(Some(42))); - assert_eq!(double_option_roundtrip(Some(None)), Some(None)); - assert_eq!(double_option_roundtrip(None), None); - } -} - -impl exports::test::options::test::Guest for Component { - fn option_none_param(a: Option) { - assert!(a.is_none()); - } - - fn option_none_result() -> Option { - None - } - - fn option_some_param(a: Option) { - assert_eq!(a, Some("foo".to_string())); - } - - fn option_some_result() -> Option { - Some("foo".to_string()) - } - - fn option_roundtrip(a: Option) -> Option { - a - } - - fn double_option_roundtrip(a: Option>) -> Option> { - a - } -} From 66c45803baf997563c95fc31f0f60c058b5f20f8 Mon Sep 17 00:00:00 2001 From: Alex Crichton Date: Thu, 10 Apr 2025 12:51:29 -0700 Subject: [PATCH 2/4] Migrate `results` test to `wit-bindgen test` --- crates/test-rust-wasm/Cargo.toml | 4 - crates/test-rust-wasm/src/bin/results.rs | 3 - tests/runtime-new/results/compose.wac | 7 + .../results/intermediate.cs} | 8 +- .../results/intermediate.rs} | 4 +- .../results/intermediate_with_wit_results.cs} | 4 +- tests/runtime-new/results/leaf.rs | 76 ++++++++ tests/runtime-new/results/runner.rs | 45 +++++ .../results/test.wit} | 13 +- tests/runtime/main.rs | 2 - tests/runtime/results.rs | 170 ------------------ 11 files changed, 148 insertions(+), 188 deletions(-) delete mode 100644 crates/test-rust-wasm/src/bin/results.rs create mode 100644 tests/runtime-new/results/compose.wac rename tests/{runtime/results/wasm.cs => runtime-new/results/intermediate.cs} (96%) rename tests/{runtime/results/wasm.rs => runtime-new/results/intermediate.rs} (96%) rename tests/{runtime/results/wasm_with_wit_results.cs => runtime-new/results/intermediate_with_wit_results.cs} (97%) create mode 100644 tests/runtime-new/results/leaf.rs create mode 100644 tests/runtime-new/results/runner.rs rename tests/{runtime/results/world.wit => runtime-new/results/test.wit} (75%) delete mode 100644 tests/runtime/results.rs diff --git a/crates/test-rust-wasm/Cargo.toml b/crates/test-rust-wasm/Cargo.toml index a2d6c000b..9535dc0be 100644 --- a/crates/test-rust-wasm/Cargo.toml +++ b/crates/test-rust-wasm/Cargo.toml @@ -10,7 +10,3 @@ wit-bindgen = { path = "../guest-rust" } [lib] test = false doctest = false - -[[bin]] -name = "results" -test = false diff --git a/crates/test-rust-wasm/src/bin/results.rs b/crates/test-rust-wasm/src/bin/results.rs deleted file mode 100644 index 6493a815a..000000000 --- a/crates/test-rust-wasm/src/bin/results.rs +++ /dev/null @@ -1,3 +0,0 @@ -include!("../../../../tests/runtime/results/wasm.rs"); - -fn main() {} diff --git a/tests/runtime-new/results/compose.wac b/tests/runtime-new/results/compose.wac new file mode 100644 index 000000000..c9f9e05b6 --- /dev/null +++ b/tests/runtime-new/results/compose.wac @@ -0,0 +1,7 @@ +package example:composition; + +let a = new test:leaf { ... }; +let b = new test:intermediate { ...a, ... }; +let c = new test:runner { ...b, ... }; + +export c...; diff --git a/tests/runtime/results/wasm.cs b/tests/runtime-new/results/intermediate.cs similarity index 96% rename from tests/runtime/results/wasm.cs rename to tests/runtime-new/results/intermediate.cs index 63af4b29b..7f09fa335 100644 --- a/tests/runtime/results/wasm.cs +++ b/tests/runtime-new/results/intermediate.cs @@ -1,4 +1,4 @@ -namespace ResultsWorld.wit.exports.test.results +namespace IntermediateWorld.wit.exports.test.results { public class TestImpl : ITest { @@ -29,10 +29,10 @@ public static float VariantError(float a) { try { return imports.test.results.TestInterop.VariantError(a); - } catch (WitException e) + } catch (WitException e) when (e.TypedValue.Tag == imports.test.results.ITest.E3.Tags.E1) { throw new WitException(ITest.E3.E1((ITest.E)Enum.Parse(typeof(ITest.E), e.TypedValue.AsE1.ToString())), 0); - } catch (WitException e) + } catch (WitException e) when (e.TypedValue.Tag == imports.test.results.ITest.E3.Tags.E2) { throw new WitException(ITest.E3.E2(new ITest.E2(e.TypedValue.AsE2.line, e.TypedValue.AsE2.column)), 0); } @@ -49,6 +49,6 @@ public static uint EmptyError(uint a) public static void DoubleError(uint a) { imports.test.results.TestInterop.DoubleError(a); - } + } } } diff --git a/tests/runtime/results/wasm.rs b/tests/runtime-new/results/intermediate.rs similarity index 96% rename from tests/runtime/results/wasm.rs rename to tests/runtime-new/results/intermediate.rs index 03627dde6..b82d40c68 100644 --- a/tests/runtime/results/wasm.rs +++ b/tests/runtime-new/results/intermediate.rs @@ -1,6 +1,4 @@ -wit_bindgen::generate!({ - path: "../../tests/runtime/results", -}); +include!(env!("BINDINGS")); struct Exports; diff --git a/tests/runtime/results/wasm_with_wit_results.cs b/tests/runtime-new/results/intermediate_with_wit_results.cs similarity index 97% rename from tests/runtime/results/wasm_with_wit_results.cs rename to tests/runtime-new/results/intermediate_with_wit_results.cs index e32ab8bb9..d8710dd5c 100644 --- a/tests/runtime/results/wasm_with_wit_results.cs +++ b/tests/runtime-new/results/intermediate_with_wit_results.cs @@ -1,4 +1,6 @@ -namespace ResultsWorld.wit.exports.test.results +//@ args = '--with-wit-results' + +namespace IntermediateWorld.wit.exports.test.results { public class TestImpl : ITest { diff --git a/tests/runtime-new/results/leaf.rs b/tests/runtime-new/results/leaf.rs new file mode 100644 index 000000000..38cb973c4 --- /dev/null +++ b/tests/runtime-new/results/leaf.rs @@ -0,0 +1,76 @@ +include!(env!("BINDINGS")); + +use exports::test::results::test as imports; + +pub struct Component; + +export!(Component); + +impl exports::test::results::test::Guest for Component { + fn string_error(a: f32) -> Result { + if a == 0.0 { + Err("zero".to_owned()) + } else { + Ok(a) + } + } + + fn enum_error(a: f32) -> Result { + if a == 0.0 { + Err(imports::E::A) + } else { + Ok(a) + } + } + + fn record_error(a: f32) -> Result { + if a == 0.0 { + Err(imports::E2 { + line: 420, + column: 0, + }) + } else if a == 1.0 { + Err(imports::E2 { + line: 77, + column: 2, + }) + } else { + Ok(a) + } + } + + fn variant_error(a: f32) -> Result { + if a == 0.0 { + Err(imports::E3::E2(imports::E2 { + line: 420, + column: 0, + })) + } else if a == 1.0 { + Err(imports::E3::E1(imports::E::B)) + } else if a == 2.0 { + Err(imports::E3::E1(imports::E::C)) + } else { + Ok(a) + } + } + + fn empty_error(a: u32) -> Result { + if a == 0 { + Err(()) + } else if a == 1 { + Ok(42) + } else { + Ok(a) + } + } + + fn double_error(a: u32) -> Result, String> { + if a == 0 { + Ok(Ok(())) + } else if a == 1 { + Ok(Err("one".into())) + } else { + Err("two".into()) + } + } +} diff --git a/tests/runtime-new/results/runner.rs b/tests/runtime-new/results/runner.rs new file mode 100644 index 000000000..fd6754bdc --- /dev/null +++ b/tests/runtime-new/results/runner.rs @@ -0,0 +1,45 @@ +include!(env!("BINDINGS")); + +use test::results::test::*; + +fn main() { + assert_eq!(string_error(0.0), Err("zero".to_owned())); + assert_eq!(string_error(1.0), Ok(1.0)); + + assert_eq!(enum_error(0.0), Err(E::A)); + assert_eq!(enum_error(1.0), Ok(1.0)); + + assert!(matches!( + record_error(0.0), + Err(E2 { + line: 420, + column: 0 + }) + )); + assert!(matches!( + record_error(1.0), + Err(E2 { + line: 77, + column: 2 + }) + )); + assert!(record_error(2.0).is_ok()); + + assert!(matches!( + variant_error(0.0), + Err(E3::E2(E2 { + line: 420, + column: 0 + })) + )); + assert!(matches!(variant_error(1.0), Err(E3::E1(E::B)))); + assert!(matches!(variant_error(2.0), Err(E3::E1(E::C)))); + + assert_eq!(empty_error(0), Err(())); + assert_eq!(empty_error(1), Ok(42)); + assert_eq!(empty_error(2), Ok(2)); + + assert_eq!(double_error(0), Ok(Ok(()))); + assert_eq!(double_error(1), Ok(Err("one".into()))); + assert_eq!(double_error(2), Err("two".into())); +} diff --git a/tests/runtime/results/world.wit b/tests/runtime-new/results/test.wit similarity index 75% rename from tests/runtime/results/world.wit rename to tests/runtime-new/results/test.wit index 4b6af124f..f237d623e 100644 --- a/tests/runtime/results/world.wit +++ b/tests/runtime-new/results/test.wit @@ -1,3 +1,6 @@ +//@ dependencies = ['intermediate', 'leaf'] +//@ wac = 'compose.wac' + package test:results; interface test { @@ -18,7 +21,15 @@ interface test { double-error: func(a: u32) -> result, string>; } -world results { +world leaf { + export test; +} + +world intermediate { import test; export test; } + +world runner { + import test; +} diff --git a/tests/runtime/main.rs b/tests/runtime/main.rs index c6893f0f3..56dbfb1db 100644 --- a/tests/runtime/main.rs +++ b/tests/runtime/main.rs @@ -13,8 +13,6 @@ use wasmtime_wasi::{WasiCtx, WasiCtxBuilder, WasiView}; use wit_component::{ComponentEncoder, StringEncoding}; use wit_parser::{Resolve, WorldId, WorldItem}; -mod results; - struct MyCtx {} struct Wasi(T, MyCtx, ResourceTable, WasiCtx); diff --git a/tests/runtime/results.rs b/tests/runtime/results.rs deleted file mode 100644 index ce04368a4..000000000 --- a/tests/runtime/results.rs +++ /dev/null @@ -1,170 +0,0 @@ -use anyhow::Result; -use wasmtime::Store; - -wasmtime::component::bindgen!({ - path: "tests/runtime/results", -}); - -use test::results::test as imports; - -#[derive(Default)] -pub struct MyImports; - -impl test::results::test::Host for MyImports { - fn string_error(&mut self, a: f32) -> Result { - if a == 0.0 { - Err("zero".to_owned()) - } else { - Ok(a) - } - } - - fn enum_error(&mut self, a: f32) -> Result { - if a == 0.0 { - Err(imports::E::A) - } else { - Ok(a) - } - } - - fn record_error(&mut self, a: f32) -> Result { - if a == 0.0 { - Err(imports::E2 { - line: 420, - column: 0, - }) - } else if a == 1.0 { - Err(imports::E2 { - line: 77, - column: 2, - }) - } else { - Ok(a) - } - } - - fn variant_error(&mut self, a: f32) -> Result { - if a == 0.0 { - Err(imports::E3::E2(imports::E2 { - line: 420, - column: 0, - })) - } else if a == 1.0 { - Err(imports::E3::E1(imports::E::B)) - } else if a == 2.0 { - Err(imports::E3::E1(imports::E::C)) - } else { - Ok(a) - } - } - - fn empty_error(&mut self, a: u32) -> Result { - if a == 0 { - Err(()) - } else if a == 1 { - Ok(42) - } else { - Ok(a) - } - } - - fn double_error(&mut self, a: u32) -> Result, String> { - if a == 0 { - Ok(Ok(())) - } else if a == 1 { - Ok(Err("one".into())) - } else { - Err("two".into()) - } - } -} - -#[test] -fn run() -> Result<()> { - crate::run_test( - "results", - |linker| Results::add_to_linker(linker, |x| &mut x.0), - |store, component, linker| Results::instantiate(store, component, linker), - run_test, - ) -} - -fn run_test(results: Results, store: &mut Store>) -> Result<()> { - use exports::test::results::test::{E, E2, E3}; - - assert_eq!( - results.interface0.call_string_error(&mut *store, 0.0)?, - Err("zero".to_owned()) - ); - assert_eq!( - results.interface0.call_string_error(&mut *store, 1.0)?, - Ok(1.0) - ); - - assert_eq!( - results.interface0.call_enum_error(&mut *store, 0.0)?, - Err(E::A) - ); - assert_eq!( - results.interface0.call_enum_error(&mut *store, 0.0)?, - Err(E::A) - ); - - assert!(matches!( - results.interface0.call_record_error(&mut *store, 0.0)?, - Err(E2 { - line: 420, - column: 0 - }) - )); - assert!(matches!( - results.interface0.call_record_error(&mut *store, 1.0)?, - Err(E2 { - line: 77, - column: 2 - }) - )); - - assert!(results - .interface0 - .call_record_error(&mut *store, 2.0)? - .is_ok()); - - assert!(matches!( - results.interface0.call_variant_error(&mut *store, 0.0)?, - Err(E3::E2(E2 { - line: 420, - column: 0 - })) - )); - assert!(matches!( - results.interface0.call_variant_error(&mut *store, 1.0)?, - Err(E3::E1(E::B)) - )); - assert!(matches!( - results.interface0.call_variant_error(&mut *store, 2.0)?, - Err(E3::E1(E::C)) - )); - - assert_eq!( - results.interface0.call_empty_error(&mut *store, 0)?, - Err(()) - ); - assert_eq!(results.interface0.call_empty_error(&mut *store, 1)?, Ok(42)); - assert_eq!(results.interface0.call_empty_error(&mut *store, 2)?, Ok(2)); - - assert_eq!( - results.interface0.call_double_error(&mut *store, 0)?, - Ok(Ok(())) - ); - assert_eq!( - results.interface0.call_double_error(&mut *store, 1)?, - Ok(Err("one".into())) - ); - assert_eq!( - results.interface0.call_double_error(&mut *store, 2)?, - Err("two".into()) - ); - - Ok(()) -} From 28d4440d101e712a3f66314bcb75f7873c82b435 Mon Sep 17 00:00:00 2001 From: Alex Crichton Date: Thu, 10 Apr 2025 12:52:51 -0700 Subject: [PATCH 3/4] Remove old `runtime` test infrastructure Closes #1220 --- .github/workflows/main.yml | 10 +- Cargo.lock | 2880 ++++---------------- Cargo.toml | 12 - crates/test-rust-wasm/Cargo.toml | 12 - crates/test-rust-wasm/artifacts/Cargo.toml | 4 - crates/test-rust-wasm/artifacts/build.rs | 63 - crates/test-rust-wasm/artifacts/src/lib.rs | 1 - crates/test-rust-wasm/src/lib.rs | 47 - tests/runtime/main.rs | 523 ---- 9 files changed, 480 insertions(+), 3072 deletions(-) delete mode 100644 crates/test-rust-wasm/Cargo.toml delete mode 100644 crates/test-rust-wasm/artifacts/Cargo.toml delete mode 100644 crates/test-rust-wasm/artifacts/build.rs delete mode 100644 crates/test-rust-wasm/artifacts/src/lib.rs delete mode 100644 crates/test-rust-wasm/src/lib.rs delete mode 100644 tests/runtime/main.rs diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 185301efe..8c89e61cf 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -98,15 +98,6 @@ jobs: shell: powershell if: matrix.os == 'windows-latest' && matrix.lang == 'moonbit' - # Run (now legacy) crate tests. This'll eventually go away - - run: | - cargo test \ - -p wit-bindgen-cli \ - -p wit-bindgen-${{ matrix.lang }} \ - --no-default-features \ - --features ${{ matrix.lang }} \ - --release - # Run all codegen tests for this language - run: | cargo run test --languages ${{ matrix.lang }} tests/codegen \ @@ -130,6 +121,7 @@ jobs: - name: Install Rust run: rustup update stable --no-self-update && rustup default stable - run: rustup target add wasm32-wasip1 + - run: cargo test - run: cargo test -p wit-bindgen-core - run: cargo test -p wit-bindgen - run: cargo test --workspace --exclude 'wit-bindgen*' diff --git a/Cargo.lock b/Cargo.lock index 7a24deb53..cb28f0c78 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2,42 +2,6 @@ # It is not intended for manual editing. version = 4 -[[package]] -name = "addr2line" -version = "0.22.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e4503c46a5c0c7844e948c9a4d6acd9f50cccb4de1c48eb9e291ea17470c678" -dependencies = [ - "gimli 0.29.0", -] - -[[package]] -name = "addr2line" -version = "0.24.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dfbe277e56a376000877090da837660b4427aad530e3028d44e0bffe4f89a1c1" -dependencies = [ - "gimli 0.31.1", -] - -[[package]] -name = "adler2" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "512761e0bb2578dd7380c6baaa0f4ce03e84f95e960231d1dec8bf4d7d6e2627" - -[[package]] -name = "ahash" -version = "0.8.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011" -dependencies = [ - "cfg-if", - "once_cell", - "version_check", - "zerocopy 0.7.35", -] - [[package]] name = "aho-corasick" version = "1.1.3" @@ -47,21 +11,6 @@ dependencies = [ "memchr", ] -[[package]] -name = "ambient-authority" -version = "0.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e9d4ee0d472d1cd2e28c97dfa124b3d8d992e10eb0a035f33f5d12e3a177ba3b" - -[[package]] -name = "android_system_properties" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311" -dependencies = [ - "libc", -] - [[package]] name = "anstream" version = "0.6.18" @@ -98,7 +47,7 @@ version = "1.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "79947af37f4177cfead1110013d678905c37501914fba0efea834c3fe9a8d60c" dependencies = [ - "windows-sys 0.59.0", + "windows-sys", ] [[package]] @@ -109,7 +58,7 @@ checksum = "ca3534e77181a9cc07539ad51f2141fe32f6c3ffd4df76db8ad92346b003ae4e" dependencies = [ "anstyle", "once_cell", - "windows-sys 0.59.0", + "windows-sys", ] [[package]] @@ -118,50 +67,12 @@ version = "1.0.97" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dcfed56ad506cb2c684a14971b8861fdc3baaaae314b9e5f9bb532cbe3ba7a4f" -[[package]] -name = "arbitrary" -version = "1.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dde20b3d026af13f561bdd0f15edf01fc734f0dafcedbaf42bba506a9517f223" - -[[package]] -name = "async-trait" -version = "0.1.88" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e539d3fca749fcee5236ab05e93a52867dd549cc157c8cb7f99595f3cedffdb5" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - [[package]] name = "autocfg" version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26" -[[package]] -name = "backtrace" -version = "0.3.74" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d82cb332cdfaed17ae235a638438ac4d4839913cc2af585c3c6746e8f8bee1a" -dependencies = [ - "addr2line 0.24.2", - "cfg-if", - "libc", - "miniz_oxide", - "object", - "rustc-demangle", - "windows-targets", -] - -[[package]] -name = "base64" -version = "0.21.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567" - [[package]] name = "beef" version = "0.5.2" @@ -174,121 +85,12 @@ version = "2.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5c8214115b7bf84099f1309324e63141d4c5d7cc26862f97a0a857dbefe165bd" -[[package]] -name = "block-buffer" -version = "0.10.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71" -dependencies = [ - "generic-array", -] - [[package]] name = "bumpalo" version = "3.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1628fb46dfa0b37568d12e5edd512553eccf6a22a78e8bde00bb4aed84d5bdbf" -[[package]] -name = "byteorder" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" - -[[package]] -name = "bytes" -version = "1.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d71b6127be86fdcfddb610f7182ac57211d4b18a3e9c82eb2d17662f2227ad6a" - -[[package]] -name = "cap-fs-ext" -version = "3.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f78efdd7378980d79c0f36b519e51191742d2c9f91ffa5e228fba9f3806d2e1" -dependencies = [ - "cap-primitives", - "cap-std", - "io-lifetimes", - "windows-sys 0.59.0", -] - -[[package]] -name = "cap-net-ext" -version = "3.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ac68674a6042af2bcee1adad9f6abd432642cf03444ce3a5b36c3f39f23baf8" -dependencies = [ - "cap-primitives", - "cap-std", - "rustix 0.38.44", - "smallvec", -] - -[[package]] -name = "cap-primitives" -version = "3.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8fc15faeed2223d8b8e8cc1857f5861935a06d06713c4ac106b722ae9ce3c369" -dependencies = [ - "ambient-authority", - "fs-set-times", - "io-extras", - "io-lifetimes", - "ipnet", - "maybe-owned", - "rustix 0.38.44", - "windows-sys 0.59.0", - "winx", -] - -[[package]] -name = "cap-rand" -version = "3.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dea13372b49df066d1ae654e5c6e41799c1efd9f6b36794b921e877ea4037977" -dependencies = [ - "ambient-authority", - "rand", -] - -[[package]] -name = "cap-std" -version = "3.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3dbd3e8e8d093d6ccb4b512264869e1281cdb032f7940bd50b2894f96f25609" -dependencies = [ - "cap-primitives", - "io-extras", - "io-lifetimes", - "rustix 0.38.44", -] - -[[package]] -name = "cap-time-ext" -version = "3.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd736b20fc033f564a1995fb82fc349146de43aabba19c7368b4cb17d8f9ea53" -dependencies = [ - "ambient-authority", - "cap-primitives", - "iana-time-zone", - "once_cell", - "rustix 0.38.44", - "winx", -] - -[[package]] -name = "cc" -version = "1.2.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1fcb57c740ae1daf453ae85f16e37396f672b039e00d9d866e07ddb24e328e3a" -dependencies = [ - "jobserver", - "libc", - "shlex", -] - [[package]] name = "cfg-if" version = "1.0.0" @@ -324,7 +126,7 @@ version = "4.5.32" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "09176aae279615badda0765c0c0b3f6ed53f4709118af73cf4655d85d1530cd7" dependencies = [ - "heck 0.5.0", + "heck", "proc-macro2", "quote", "syn", @@ -336,17 +138,11 @@ version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f46ad14479a25103f283c0f10005961cf086d8dc42205bb44c46ac563475dca6" -[[package]] -name = "cobs" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67ba02a97a2bd10f4b59b25c7973101c79642302776489e030cd13cdab09ed15" - [[package]] name = "codegen-macro" version = "0.0.0" dependencies = [ - "heck 0.5.0", + "heck", "quote", ] @@ -357,440 +153,344 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5b63caa9aa9397e2d9480a9b13673856c78d8ac123288526c37d7839f2a86990" [[package]] -name = "core-foundation-sys" -version = "0.8.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b" - -[[package]] -name = "cpp_demangle" -version = "0.4.4" +name = "crossbeam-deque" +version = "0.8.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96e58d342ad113c2b878f16d5d034c03be492ae460cdbc02b7f0f2284d310c7d" +checksum = "9dd111b7b7f7d55b72c0a6ae361660ee5853c9af73f70c3c2ef6858b950e2e51" dependencies = [ - "cfg-if", + "crossbeam-epoch", + "crossbeam-utils", ] [[package]] -name = "cpufeatures" -version = "0.2.17" +name = "crossbeam-epoch" +version = "0.9.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59ed5838eebb26a2bb2e58f6d5b5316989ae9d08bab10e0e6d103e656d1b0280" +checksum = "5b82ac4a3c2ca9c3460964f020e1402edd5753411d7737aa39c3714ad1b5420e" dependencies = [ - "libc", + "crossbeam-utils", ] [[package]] -name = "cranelift-bforest" -version = "0.112.3" +name = "crossbeam-utils" +version = "0.8.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "69792bd40d21be8059f7c709f44200ded3bbd073df7eb3fa3c282b387c7ffa5b" -dependencies = [ - "cranelift-entity", -] +checksum = "d0a5c400df2834b80a4c3327b3aad3a4c4cd4de0629063962b03235697506a28" [[package]] -name = "cranelift-bitset" -version = "0.112.3" +name = "either" +version = "1.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38da1eb6f7d8cdfa92f05acfae63c9a1d7a337e49ce7a2d0769c7fa03a2613a5" -dependencies = [ - "serde", - "serde_derive", -] +checksum = "48c757948c5ede0e46177b7add2e67155f70e33c07fea8284df6576da70b3719" [[package]] -name = "cranelift-codegen" -version = "0.112.3" +name = "env_filter" +version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "709f5567a2bff9f06edf911a7cb5ebb091e4c81701714dc6ab574d08b4a69a0d" +checksum = "186e05a59d4c50738528153b83b0b0194d3a29507dfec16eccd4b342903397d0" dependencies = [ - "bumpalo", - "cranelift-bforest", - "cranelift-bitset", - "cranelift-codegen-meta", - "cranelift-codegen-shared", - "cranelift-control", - "cranelift-entity", - "cranelift-isle", - "gimli 0.29.0", - "hashbrown 0.14.5", "log", - "regalloc2", - "rustc-hash", - "smallvec", - "target-lexicon", + "regex", ] [[package]] -name = "cranelift-codegen-meta" -version = "0.112.3" +name = "env_logger" +version = "0.11.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72d39a6b194c069fd091ca1f17b9d86ff1a4627ccad8806095828f61989a691f" +checksum = "c3716d7a920fb4fac5d84e9d4bce8ceb321e9414b4409da61b07b75c1e3d0697" dependencies = [ - "cranelift-codegen-shared", + "anstream", + "anstyle", + "env_filter", + "jiff", + "log", ] [[package]] -name = "cranelift-codegen-shared" -version = "0.112.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "18f81aefad1f80ed4132ae33f40b92779eeb57edeb1e28bb24424a4098c963a2" - -[[package]] -name = "cranelift-control" -version = "0.112.3" +name = "equivalent" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6adbaac785ad4683c4f199686f9e15c1471f52ae2f4c013a3be039b4719db754" -dependencies = [ - "arbitrary", -] +checksum = "877a4ace8713b0bcf2a4e7eec82529c029f1d0619886d18145fea96c3ffe5c0f" [[package]] -name = "cranelift-entity" -version = "0.112.3" +name = "errno" +version = "0.3.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70b85ed43567e13782cd1b25baf42a8167ee57169a60dfd3d7307c6ca3839da0" +checksum = "33d852cb9b869c2a9b3df2f71a3074817f01e1844f839a144f5fcef059a4eb5d" dependencies = [ - "cranelift-bitset", - "serde", - "serde_derive", + "libc", + "windows-sys", ] [[package]] -name = "cranelift-frontend" -version = "0.112.3" +name = "fixedbitset" +version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8349f71373bb69c6f73992c6c1606236a66c8134e7a60e04e03fbd64b1aa7dcf" -dependencies = [ - "cranelift-codegen", - "log", - "smallvec", - "target-lexicon", -] +checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80" [[package]] -name = "cranelift-isle" -version = "0.112.3" +name = "fnv" +version = "1.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "464a6b958ce05e0c237c8b25508012b6c644e8c37348213a8c786ba29e28cfdb" +checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" [[package]] -name = "cranelift-native" -version = "0.112.3" +name = "foldhash" +version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffc4acaf6894ee323ff4e9ce786bec09f0ebbe49941e8012f1c1052f1d965034" -dependencies = [ - "cranelift-codegen", - "libc", - "target-lexicon", -] +checksum = "d9c4f5dac5e15c24eb999c26181a6ca40b39fe946cbe4c263c7209467bc83af2" [[package]] -name = "cranelift-wasm" -version = "0.112.3" +name = "futures" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b878860895cca97454ef8d8b12bfda9d0889dd49efee175dba78d54ff8363ec2" +checksum = "65bc07b1a8bc7c85c5f2e110c476c7389b4554ba72af57d8445ea63a576b0876" dependencies = [ - "cranelift-codegen", - "cranelift-entity", - "cranelift-frontend", - "itertools", - "log", - "smallvec", - "wasmparser 0.217.1", - "wasmtime-types", + "futures-channel", + "futures-core", + "futures-executor", + "futures-io", + "futures-sink", + "futures-task", + "futures-util", ] [[package]] -name = "crc32fast" -version = "1.4.2" +name = "futures-channel" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a97769d94ddab943e4510d138150169a2758b5ef3eb191a9ee688de3e23ef7b3" +checksum = "2dff15bf788c671c1934e366d07e30c1814a8ef514e1af724a602e8a2fbe1b10" dependencies = [ - "cfg-if", + "futures-core", + "futures-sink", ] [[package]] -name = "crossbeam-deque" -version = "0.8.6" +name = "futures-core" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9dd111b7b7f7d55b72c0a6ae361660ee5853c9af73f70c3c2ef6858b950e2e51" -dependencies = [ - "crossbeam-epoch", - "crossbeam-utils", -] +checksum = "05f29059c0c2090612e8d742178b0580d2dc940c837851ad723096f87af6663e" [[package]] -name = "crossbeam-epoch" -version = "0.9.18" +name = "futures-executor" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b82ac4a3c2ca9c3460964f020e1402edd5753411d7737aa39c3714ad1b5420e" +checksum = "1e28d1d997f585e54aebc3f97d39e72338912123a67330d723fdbb564d646c9f" dependencies = [ - "crossbeam-utils", + "futures-core", + "futures-task", + "futures-util", ] [[package]] -name = "crossbeam-utils" -version = "0.8.21" +name = "futures-io" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d0a5c400df2834b80a4c3327b3aad3a4c4cd4de0629063962b03235697506a28" +checksum = "9e5c1b78ca4aae1ac06c48a526a655760685149f0d465d21f37abfe57ce075c6" [[package]] -name = "crypto-common" -version = "0.1.6" +name = "futures-macro" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3" +checksum = "162ee34ebcb7c64a8abebc059ce0fee27c2262618d7b60ed8faf72fef13c3650" dependencies = [ - "generic-array", - "typenum", + "proc-macro2", + "quote", + "syn", ] [[package]] -name = "debugid" -version = "0.8.0" +name = "futures-sink" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bef552e6f588e446098f6ba40d89ac146c8c7b64aade83c051ee00bb5d2bc18d" -dependencies = [ - "uuid", -] +checksum = "e575fab7d1e0dcb8d0c7bcf9a63ee213816ab51902e6d244a95819acacf1d4f7" [[package]] -name = "digest" -version = "0.10.7" +name = "futures-task" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292" -dependencies = [ - "block-buffer", - "crypto-common", -] +checksum = "f90f7dce0722e95104fcb095585910c0977252f286e354b5e3bd38902cd99988" [[package]] -name = "directories-next" -version = "2.0.0" +name = "futures-util" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "339ee130d97a610ea5a5872d2bbb130fdf68884ff09d3028b81bec8a1ac23bbc" +checksum = "9fa08315bb612088cc391249efdc3bc77536f16c91f6cf495e6fbe85b20a4a81" dependencies = [ - "cfg-if", - "dirs-sys-next", + "futures-channel", + "futures-core", + "futures-io", + "futures-macro", + "futures-sink", + "futures-task", + "memchr", + "pin-project-lite", + "pin-utils", + "slab", ] [[package]] -name = "dirs" -version = "4.0.0" +name = "hashbrown" +version = "0.15.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca3aa72a6f96ea37bbc5aa912f6788242832f75369bdfdadcb0e38423f100059" +checksum = "bf151400ff0baff5465007dd2f3e717f3fe502074ca563069ce3a6629d07b289" dependencies = [ - "dirs-sys", + "foldhash", + "serde", ] [[package]] -name = "dirs-sys" -version = "0.3.7" +name = "heck" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b1d1d91c932ef41c0f2663aa8b0ca0342d444d842c06914aa0a7e352d0bada6" -dependencies = [ - "libc", - "redox_users", - "winapi", -] +checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea" [[package]] -name = "dirs-sys-next" -version = "0.1.2" +name = "id-arena" +version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ebda144c4fe02d1f7ea1a7d9641b6fc6b580adcfa024ae48797ecdeb6825b4d" -dependencies = [ - "libc", - "redox_users", - "winapi", -] +checksum = "25a2bc672d1148e28034f176e01fffebb08b35768468cc954630da77a1449005" [[package]] -name = "displaydoc" -version = "0.2.5" +name = "indexmap" +version = "2.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0" +checksum = "3954d50fe15b02142bf25d3b8bdadb634ec3948f103d04ffe3031bc8fe9d7058" dependencies = [ - "proc-macro2", - "quote", - "syn", + "equivalent", + "hashbrown", + "serde", ] [[package]] -name = "either" -version = "1.15.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "48c757948c5ede0e46177b7add2e67155f70e33c07fea8284df6576da70b3719" - -[[package]] -name = "embedded-io" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef1a6892d9eef45c8fa6b9e0086428a2cca8491aca8f787c534a3d6d0bcb3ced" - -[[package]] -name = "embedded-io" -version = "0.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "edd0f118536f44f5ccd48bcb8b111bdc3de888b58c74639dfb034a357d0f206d" - -[[package]] -name = "encoding_rs" -version = "0.8.35" +name = "is_terminal_polyfill" +version = "1.70.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75030f3c4f45dafd7586dd6780965a8c7e8e285a5ecb86713e63a79c5b2766f3" -dependencies = [ - "cfg-if", -] +checksum = "7943c866cc5cd64cbc25b2e01621d07fa8eb2a1a23160ee81ce38704e97b8ecf" [[package]] -name = "env_filter" -version = "0.1.3" +name = "itoa" +version = "1.0.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "186e05a59d4c50738528153b83b0b0194d3a29507dfec16eccd4b342903397d0" -dependencies = [ - "log", - "regex", -] +checksum = "4a5f13b858c8d314ee3e8f639011f7ccefe71f97f96e50151fb991f267928e2c" [[package]] -name = "env_logger" -version = "0.11.7" +name = "jiff" +version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3716d7a920fb4fac5d84e9d4bce8ceb321e9414b4409da61b07b75c1e3d0697" +checksum = "c102670231191d07d37a35af3eb77f1f0dbf7a71be51a962dcd57ea607be7260" dependencies = [ - "anstream", - "anstyle", - "env_filter", - "jiff", + "jiff-static", "log", + "portable-atomic", + "portable-atomic-util", + "serde", ] [[package]] -name = "equivalent" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "877a4ace8713b0bcf2a4e7eec82529c029f1d0619886d18145fea96c3ffe5c0f" - -[[package]] -name = "errno" -version = "0.3.10" +name = "jiff-static" +version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "33d852cb9b869c2a9b3df2f71a3074817f01e1844f839a144f5fcef059a4eb5d" +checksum = "4cdde31a9d349f1b1f51a0b3714a5940ac022976f4b49485fc04be052b183b4c" dependencies = [ - "libc", - "windows-sys 0.59.0", + "proc-macro2", + "quote", + "syn", ] [[package]] -name = "fallible-iterator" -version = "0.3.0" +name = "lazy_static" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2acce4a10f12dc2fb14a218589d4f1f62ef011b2d0cc4b3cb1bba8e94da14649" +checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" [[package]] -name = "fd-lock" -version = "4.0.4" +name = "leb128" +version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ce92ff622d6dadf7349484f42c93271a0d49b7cc4d466a936405bacbe10aa78" -dependencies = [ - "cfg-if", - "rustix 1.0.3", - "windows-sys 0.59.0", -] +checksum = "884e2677b40cc8c339eaefcb701c32ef1fd2493d71118dc0ca4b6a736c93bd67" [[package]] -name = "fixedbitset" -version = "0.4.2" +name = "leb128fmt" +version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80" +checksum = "09edd9e8b54e49e587e4f6295a7d29c3ea94d469cb40ab8ca70b288248a81db2" [[package]] -name = "fnv" -version = "1.0.7" +name = "libc" +version = "0.2.171" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" +checksum = "c19937216e9d3aa9956d9bb8dfc0b0c8beb6058fc4f7a4dc4d850edf86a237d6" [[package]] -name = "foldhash" -version = "0.1.5" +name = "linux-raw-sys" +version = "0.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9c4f5dac5e15c24eb999c26181a6ca40b39fe946cbe4c263c7209467bc83af2" +checksum = "fe7db12097d22ec582439daf8618b8fdd1a7bef6270e9af3b1ebcd30893cf413" [[package]] -name = "form_urlencoded" -version = "1.2.1" +name = "log" +version = "0.4.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e13624c2627564efccf4934284bdd98cbaa14e79b0b5a141218e507b3a823456" -dependencies = [ - "percent-encoding", -] +checksum = "13dc2df351e3202783a1fe0d44375f7295ffb4049267b0f3018346dc122a1d94" [[package]] -name = "fs-set-times" -version = "0.20.3" +name = "logos" +version = "0.14.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94e7099f6313ecacbe1256e8ff9d617b75d1bcb16a6fddef94866d225a01a14a" +checksum = "7251356ef8cb7aec833ddf598c6cb24d17b689d20b993f9d11a3d764e34e6458" dependencies = [ - "io-lifetimes", - "rustix 1.0.3", - "windows-sys 0.59.0", + "logos-derive", ] [[package]] -name = "futures" -version = "0.3.31" +name = "logos-codegen" +version = "0.14.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "65bc07b1a8bc7c85c5f2e110c476c7389b4554ba72af57d8445ea63a576b0876" +checksum = "59f80069600c0d66734f5ff52cc42f2dabd6b29d205f333d61fd7832e9e9963f" dependencies = [ - "futures-channel", - "futures-core", - "futures-executor", - "futures-io", - "futures-sink", - "futures-task", - "futures-util", + "beef", + "fnv", + "lazy_static", + "proc-macro2", + "quote", + "regex-syntax", + "syn", ] [[package]] -name = "futures-channel" -version = "0.3.31" +name = "logos-derive" +version = "0.14.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2dff15bf788c671c1934e366d07e30c1814a8ef514e1af724a602e8a2fbe1b10" +checksum = "24fb722b06a9dc12adb0963ed585f19fc61dc5413e6a9be9422ef92c091e731d" dependencies = [ - "futures-core", - "futures-sink", + "logos-codegen", ] [[package]] -name = "futures-core" -version = "0.3.31" +name = "memchr" +version = "2.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05f29059c0c2090612e8d742178b0580d2dc940c837851ad723096f87af6663e" +checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3" [[package]] -name = "futures-executor" -version = "0.3.31" +name = "miette" +version = "7.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e28d1d997f585e54aebc3f97d39e72338912123a67330d723fdbb564d646c9f" +checksum = "1a955165f87b37fd1862df2a59547ac542c77ef6d17c666f619d1ad22dd89484" dependencies = [ - "futures-core", - "futures-task", - "futures-util", + "cfg-if", + "miette-derive", + "serde", + "thiserror", + "unicode-width 0.1.14", ] [[package]] -name = "futures-io" -version = "0.3.31" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e5c1b78ca4aae1ac06c48a526a655760685149f0d465d21f37abfe57ce075c6" - -[[package]] -name = "futures-macro" -version = "0.3.31" +name = "miette-derive" +version = "7.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "162ee34ebcb7c64a8abebc059ce0fee27c2262618d7b60ed8faf72fef13c3650" +checksum = "bf45bf44ab49be92fd1227a3be6fc6f617f1a337c06af54981048574d8783147" dependencies = [ "proc-macro2", "quote", @@ -798,1944 +498,515 @@ dependencies = [ ] [[package]] -name = "futures-sink" -version = "0.3.31" +name = "once_cell" +version = "1.21.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e575fab7d1e0dcb8d0c7bcf9a63ee213816ab51902e6d244a95819acacf1d4f7" +checksum = "c2806eaa3524762875e21c3dcd057bc4b7bfa01ce4da8d46be1cd43649e1cc6b" [[package]] -name = "futures-task" -version = "0.3.31" +name = "petgraph" +version = "0.6.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f90f7dce0722e95104fcb095585910c0977252f286e354b5e3bd38902cd99988" +checksum = "b4c5cc86750666a3ed20bdaf5ca2a0344f9c67674cae0515bec2da16fbaa47db" +dependencies = [ + "fixedbitset", + "indexmap", +] [[package]] -name = "futures-util" -version = "0.3.31" +name = "pin-project-lite" +version = "0.2.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9fa08315bb612088cc391249efdc3bc77536f16c91f6cf495e6fbe85b20a4a81" -dependencies = [ - "futures-channel", - "futures-core", - "futures-io", - "futures-macro", - "futures-sink", - "futures-task", - "memchr", - "pin-project-lite", - "pin-utils", - "slab", -] +checksum = "3b3cff922bd51709b605d9ead9aa71031d81447142d828eb4a6eba76fe619f9b" [[package]] -name = "fxhash" -version = "0.2.1" +name = "pin-utils" +version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c31b6d751ae2c7f11320402d34e41349dd1016f8d5d45e48c4312bc8625af50c" -dependencies = [ - "byteorder", -] +checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" [[package]] -name = "fxprof-processed-profile" -version = "0.6.0" +name = "portable-atomic" +version = "1.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "27d12c0aed7f1e24276a241aadc4cb8ea9f83000f34bc062b7cc2d51e3b0fabd" -dependencies = [ - "bitflags", - "debugid", - "fxhash", - "serde", - "serde_json", -] +checksum = "350e9b48cbc6b0e028b0473b114454c6316e57336ee184ceab6e53f72c178b3e" [[package]] -name = "generic-array" -version = "0.14.7" +name = "portable-atomic-util" +version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a" +checksum = "d8a2f0d8d040d7848a709caf78912debcc3f33ee4b3cac47d73d1e1069e83507" dependencies = [ - "typenum", - "version_check", + "portable-atomic", ] [[package]] -name = "getrandom" -version = "0.2.15" +name = "prettyplease" +version = "0.2.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7" +checksum = "5316f57387668042f561aae71480de936257848f9c43ce528e311d89a07cadeb" dependencies = [ - "cfg-if", - "libc", - "wasi", + "proc-macro2", + "syn", ] [[package]] -name = "gimli" -version = "0.29.0" +name = "proc-macro2" +version = "1.0.94" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "40ecd4077b5ae9fd2e9e169b102c6c330d0605168eb0e8bf79952b256dbefffd" +checksum = "a31971752e70b8b2686d7e46ec17fb38dad4051d94024c88df49b667caea9c84" dependencies = [ - "fallible-iterator", - "indexmap", - "stable_deref_trait", + "unicode-ident", ] [[package]] -name = "gimli" -version = "0.31.1" +name = "pulldown-cmark" +version = "0.9.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07e28edb80900c19c28f1072f2e8aeca7fa06b23cd4169cefe1af5aa3260783f" +checksum = "57206b407293d2bcd3af849ce869d52068623f19e1b5ff8e8778e3309439682b" +dependencies = [ + "bitflags", + "memchr", + "unicase", +] [[package]] -name = "hashbrown" -version = "0.14.5" +name = "quote" +version = "1.0.40" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1" +checksum = "1885c039570dc00dcb4ff087a89e185fd56bae234ddc7f056a945bf36467248d" dependencies = [ - "ahash", - "serde", + "proc-macro2", ] [[package]] -name = "hashbrown" -version = "0.15.2" +name = "rayon" +version = "1.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf151400ff0baff5465007dd2f3e717f3fe502074ca563069ce3a6629d07b289" -dependencies = [ - "foldhash", - "serde", -] - -[[package]] -name = "heck" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" - -[[package]] -name = "heck" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea" - -[[package]] -name = "iana-time-zone" -version = "0.1.62" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2fd658b06e56721792c5df4475705b6cda790e9298d19d2f8af083457bcd127" -dependencies = [ - "android_system_properties", - "core-foundation-sys", - "iana-time-zone-haiku", - "js-sys", - "log", - "wasm-bindgen", - "windows-core", -] - -[[package]] -name = "iana-time-zone-haiku" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f31827a206f56af32e590ba56d5d2d085f558508192593743f16b2306495269f" -dependencies = [ - "cc", -] - -[[package]] -name = "icu_collections" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db2fa452206ebee18c4b5c2274dbf1de17008e874b4dc4f0aea9d01ca79e4526" -dependencies = [ - "displaydoc", - "yoke", - "zerofrom", - "zerovec", -] - -[[package]] -name = "icu_locid" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "13acbb8371917fc971be86fc8057c41a64b521c184808a698c02acc242dbf637" -dependencies = [ - "displaydoc", - "litemap", - "tinystr", - "writeable", - "zerovec", -] - -[[package]] -name = "icu_locid_transform" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01d11ac35de8e40fdeda00d9e1e9d92525f3f9d887cdd7aa81d727596788b54e" -dependencies = [ - "displaydoc", - "icu_locid", - "icu_locid_transform_data", - "icu_provider", - "tinystr", - "zerovec", -] - -[[package]] -name = "icu_locid_transform_data" -version = "1.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7515e6d781098bf9f7205ab3fc7e9709d34554ae0b21ddbcb5febfa4bc7df11d" - -[[package]] -name = "icu_normalizer" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19ce3e0da2ec68599d193c93d088142efd7f9c5d6fc9b803774855747dc6a84f" -dependencies = [ - "displaydoc", - "icu_collections", - "icu_normalizer_data", - "icu_properties", - "icu_provider", - "smallvec", - "utf16_iter", - "utf8_iter", - "write16", - "zerovec", -] - -[[package]] -name = "icu_normalizer_data" -version = "1.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c5e8338228bdc8ab83303f16b797e177953730f601a96c25d10cb3ab0daa0cb7" - -[[package]] -name = "icu_properties" -version = "1.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93d6020766cfc6302c15dbbc9c8778c37e62c14427cb7f6e601d849e092aeef5" -dependencies = [ - "displaydoc", - "icu_collections", - "icu_locid_transform", - "icu_properties_data", - "icu_provider", - "tinystr", - "zerovec", -] - -[[package]] -name = "icu_properties_data" -version = "1.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85fb8799753b75aee8d2a21d7c14d9f38921b54b3dbda10f5a3c7a7b82dba5e2" - -[[package]] -name = "icu_provider" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ed421c8a8ef78d3e2dbc98a973be2f3770cb42b606e3ab18d6237c4dfde68d9" -dependencies = [ - "displaydoc", - "icu_locid", - "icu_provider_macros", - "stable_deref_trait", - "tinystr", - "writeable", - "yoke", - "zerofrom", - "zerovec", -] - -[[package]] -name = "icu_provider_macros" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ec89e9337638ecdc08744df490b221a7399bf8d164eb52a665454e60e075ad6" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "id-arena" -version = "2.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25a2bc672d1148e28034f176e01fffebb08b35768468cc954630da77a1449005" - -[[package]] -name = "idna" -version = "1.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "686f825264d630750a544639377bae737628043f20d38bbc029e8f29ea968a7e" -dependencies = [ - "idna_adapter", - "smallvec", - "utf8_iter", -] - -[[package]] -name = "idna_adapter" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "daca1df1c957320b2cf139ac61e7bd64fed304c5040df000a745aa1de3b4ef71" -dependencies = [ - "icu_normalizer", - "icu_properties", -] - -[[package]] -name = "indexmap" -version = "2.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3954d50fe15b02142bf25d3b8bdadb634ec3948f103d04ffe3031bc8fe9d7058" -dependencies = [ - "equivalent", - "hashbrown 0.15.2", - "serde", -] - -[[package]] -name = "io-extras" -version = "0.18.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2285ddfe3054097ef4b2fe909ef8c3bcd1ea52a8f0d274416caebeef39f04a65" -dependencies = [ - "io-lifetimes", - "windows-sys 0.59.0", -] - -[[package]] -name = "io-lifetimes" -version = "2.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06432fb54d3be7964ecd3649233cddf80db2832f47fec34c01f65b3d9d774983" - -[[package]] -name = "ipnet" -version = "2.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "469fb0b9cefa57e3ef31275ee7cacb78f2fdca44e4765491884a2b119d4eb130" - -[[package]] -name = "is_terminal_polyfill" -version = "1.70.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7943c866cc5cd64cbc25b2e01621d07fa8eb2a1a23160ee81ce38704e97b8ecf" - -[[package]] -name = "itertools" -version = "0.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba291022dbbd398a455acf126c1e341954079855bc60dfdda641363bd6922569" -dependencies = [ - "either", -] - -[[package]] -name = "itoa" -version = "1.0.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4a5f13b858c8d314ee3e8f639011f7ccefe71f97f96e50151fb991f267928e2c" - -[[package]] -name = "ittapi" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b996fe614c41395cdaedf3cf408a9534851090959d90d54a535f675550b64b1" -dependencies = [ - "anyhow", - "ittapi-sys", - "log", -] - -[[package]] -name = "ittapi-sys" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "52f5385394064fa2c886205dba02598013ce83d3e92d33dbdc0c52fe0e7bf4fc" -dependencies = [ - "cc", -] - -[[package]] -name = "jiff" -version = "0.2.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c102670231191d07d37a35af3eb77f1f0dbf7a71be51a962dcd57ea607be7260" -dependencies = [ - "jiff-static", - "log", - "portable-atomic", - "portable-atomic-util", - "serde", -] - -[[package]] -name = "jiff-static" -version = "0.2.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4cdde31a9d349f1b1f51a0b3714a5940ac022976f4b49485fc04be052b183b4c" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "jobserver" -version = "0.1.32" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "48d1dbcbbeb6a7fec7e059840aa538bd62aaccf972c7346c4d9d2059312853d0" -dependencies = [ - "libc", -] - -[[package]] -name = "js-sys" -version = "0.3.77" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1cfaf33c695fc6e08064efbc1f72ec937429614f25eef83af942d0e227c3a28f" -dependencies = [ - "once_cell", - "wasm-bindgen", -] - -[[package]] -name = "lazy_static" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" - -[[package]] -name = "leb128" -version = "0.2.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "884e2677b40cc8c339eaefcb701c32ef1fd2493d71118dc0ca4b6a736c93bd67" - -[[package]] -name = "leb128fmt" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09edd9e8b54e49e587e4f6295a7d29c3ea94d469cb40ab8ca70b288248a81db2" - -[[package]] -name = "libc" -version = "0.2.171" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c19937216e9d3aa9956d9bb8dfc0b0c8beb6058fc4f7a4dc4d850edf86a237d6" - -[[package]] -name = "libm" -version = "0.2.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8355be11b20d696c8f18f6cc018c4e372165b1fa8126cef092399c9951984ffa" - -[[package]] -name = "libredox" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d" -dependencies = [ - "bitflags", - "libc", -] - -[[package]] -name = "linux-raw-sys" -version = "0.4.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d26c52dbd32dccf2d10cac7725f8eae5296885fb5703b261f7d0a0739ec807ab" - -[[package]] -name = "linux-raw-sys" -version = "0.9.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe7db12097d22ec582439daf8618b8fdd1a7bef6270e9af3b1ebcd30893cf413" - -[[package]] -name = "litemap" -version = "0.7.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23fb14cb19457329c82206317a5663005a4d404783dc74f4252769b0d5f42856" - -[[package]] -name = "log" -version = "0.4.27" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "13dc2df351e3202783a1fe0d44375f7295ffb4049267b0f3018346dc122a1d94" - -[[package]] -name = "logos" -version = "0.14.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7251356ef8cb7aec833ddf598c6cb24d17b689d20b993f9d11a3d764e34e6458" -dependencies = [ - "logos-derive", -] - -[[package]] -name = "logos-codegen" -version = "0.14.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59f80069600c0d66734f5ff52cc42f2dabd6b29d205f333d61fd7832e9e9963f" -dependencies = [ - "beef", - "fnv", - "lazy_static", - "proc-macro2", - "quote", - "regex-syntax", - "syn", -] - -[[package]] -name = "logos-derive" -version = "0.14.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24fb722b06a9dc12adb0963ed585f19fc61dc5413e6a9be9422ef92c091e731d" -dependencies = [ - "logos-codegen", -] - -[[package]] -name = "mach2" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19b955cdeb2a02b9117f121ce63aa52d08ade45de53e48fe6a38b39c10f6f709" -dependencies = [ - "libc", -] - -[[package]] -name = "maybe-owned" -version = "0.3.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4facc753ae494aeb6e3c22f839b158aebd4f9270f55cd3c79906c45476c47ab4" - -[[package]] -name = "memchr" -version = "2.7.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3" - -[[package]] -name = "memfd" -version = "0.6.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2cffa4ad52c6f791f4f8b15f0c05f9824b2ced1160e88cc393d64fff9a8ac64" -dependencies = [ - "rustix 0.38.44", -] - -[[package]] -name = "miette" -version = "7.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a955165f87b37fd1862df2a59547ac542c77ef6d17c666f619d1ad22dd89484" -dependencies = [ - "cfg-if", - "miette-derive", - "serde", - "thiserror", - "unicode-width 0.1.14", -] - -[[package]] -name = "miette-derive" -version = "7.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf45bf44ab49be92fd1227a3be6fc6f617f1a337c06af54981048574d8783147" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "miniz_oxide" -version = "0.8.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e3e04debbb59698c15bacbb6d93584a8c0ca9cc3213cb423d31f760d8843ce5" -dependencies = [ - "adler2", -] - -[[package]] -name = "mio" -version = "1.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2886843bf800fba2e3377cff24abf6379b4c4d5c6681eaf9ea5b0d15090450bd" -dependencies = [ - "libc", - "wasi", - "windows-sys 0.52.0", -] - -[[package]] -name = "object" -version = "0.36.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62948e14d923ea95ea2c7c86c71013138b66525b86bdc08d2dcc262bdb497b87" -dependencies = [ - "crc32fast", - "hashbrown 0.15.2", - "indexmap", - "memchr", -] - -[[package]] -name = "once_cell" -version = "1.21.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c2806eaa3524762875e21c3dcd057bc4b7bfa01ce4da8d46be1cd43649e1cc6b" - -[[package]] -name = "paste" -version = "1.0.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a" - -[[package]] -name = "percent-encoding" -version = "2.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" - -[[package]] -name = "petgraph" -version = "0.6.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4c5cc86750666a3ed20bdaf5ca2a0344f9c67674cae0515bec2da16fbaa47db" -dependencies = [ - "fixedbitset", - "indexmap", -] - -[[package]] -name = "pin-project-lite" -version = "0.2.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b3cff922bd51709b605d9ead9aa71031d81447142d828eb4a6eba76fe619f9b" - -[[package]] -name = "pin-utils" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" - -[[package]] -name = "pkg-config" -version = "0.3.32" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7edddbd0b52d732b21ad9a5fab5c704c14cd949e5e9a1ec5929a24fded1b904c" - -[[package]] -name = "portable-atomic" -version = "1.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "350e9b48cbc6b0e028b0473b114454c6316e57336ee184ceab6e53f72c178b3e" - -[[package]] -name = "portable-atomic-util" -version = "0.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8a2f0d8d040d7848a709caf78912debcc3f33ee4b3cac47d73d1e1069e83507" -dependencies = [ - "portable-atomic", -] - -[[package]] -name = "postcard" -version = "1.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "170a2601f67cc9dba8edd8c4870b15f71a6a2dc196daec8c83f72b59dff628a8" -dependencies = [ - "cobs", - "embedded-io 0.4.0", - "embedded-io 0.6.1", - "serde", -] - -[[package]] -name = "ppv-lite86" -version = "0.2.21" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85eae3c4ed2f50dcfe72643da4befc30deadb458a9b590d720cde2f2b1e97da9" -dependencies = [ - "zerocopy 0.8.24", -] - -[[package]] -name = "prettyplease" -version = "0.2.31" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5316f57387668042f561aae71480de936257848f9c43ce528e311d89a07cadeb" -dependencies = [ - "proc-macro2", - "syn", -] - -[[package]] -name = "proc-macro2" -version = "1.0.94" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a31971752e70b8b2686d7e46ec17fb38dad4051d94024c88df49b667caea9c84" -dependencies = [ - "unicode-ident", -] - -[[package]] -name = "psm" -version = "0.1.25" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f58e5423e24c18cc840e1c98370b3993c6649cd1678b4d24318bcf0a083cbe88" -dependencies = [ - "cc", -] - -[[package]] -name = "pulldown-cmark" -version = "0.9.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57206b407293d2bcd3af849ce869d52068623f19e1b5ff8e8778e3309439682b" -dependencies = [ - "bitflags", - "memchr", - "unicase", -] - -[[package]] -name = "quote" -version = "1.0.40" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1885c039570dc00dcb4ff087a89e185fd56bae234ddc7f056a945bf36467248d" -dependencies = [ - "proc-macro2", -] - -[[package]] -name = "rand" -version = "0.8.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" -dependencies = [ - "libc", - "rand_chacha", - "rand_core", -] - -[[package]] -name = "rand_chacha" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" -dependencies = [ - "ppv-lite86", - "rand_core", -] - -[[package]] -name = "rand_core" -version = "0.6.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" -dependencies = [ - "getrandom", -] - -[[package]] -name = "rayon" -version = "1.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b418a60154510ca1a002a752ca9714984e21e4241e804d32555251faf8b78ffa" +checksum = "b418a60154510ca1a002a752ca9714984e21e4241e804d32555251faf8b78ffa" dependencies = [ "either", "rayon-core", -] - -[[package]] -name = "rayon-core" -version = "1.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1465873a3dfdaa8ae7cb14b4383657caab0b3e8a0aa9ae8e04b044854c8dfce2" -dependencies = [ - "crossbeam-deque", - "crossbeam-utils", -] - -[[package]] -name = "redox_users" -version = "0.4.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba009ff324d1fc1b900bd1fdb31564febe58a8ccc8a6fdbb93b543d33b13ca43" -dependencies = [ - "getrandom", - "libredox", - "thiserror", -] - -[[package]] -name = "regalloc2" -version = "0.10.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12908dbeb234370af84d0579b9f68258a0f67e201412dd9a2814e6f45b2fc0f0" -dependencies = [ - "hashbrown 0.14.5", - "log", - "rustc-hash", - "slice-group-by", - "smallvec", -] - -[[package]] -name = "regex" -version = "1.11.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b544ef1b4eac5dc2db33ea63606ae9ffcfac26c1416a2806ae0bf5f56b201191" -dependencies = [ - "aho-corasick", - "memchr", - "regex-automata", - "regex-syntax", -] - -[[package]] -name = "regex-automata" -version = "0.4.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "809e8dc61f6de73b46c85f4c96486310fe304c434cfa43669d7b40f711150908" -dependencies = [ - "aho-corasick", - "memchr", - "regex-syntax", -] - -[[package]] -name = "regex-syntax" -version = "0.8.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c" - -[[package]] -name = "rustc-demangle" -version = "0.1.24" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f" - -[[package]] -name = "rustc-hash" -version = "2.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "357703d41365b4b27c590e3ed91eabb1b663f07c4c084095e60cbed4362dff0d" - -[[package]] -name = "rustix" -version = "0.38.44" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fdb5bc1ae2baa591800df16c9ca78619bf65c0488b41b96ccec5d11220d8c154" -dependencies = [ - "bitflags", - "errno", - "itoa", - "libc", - "linux-raw-sys 0.4.15", - "once_cell", - "windows-sys 0.59.0", -] - -[[package]] -name = "rustix" -version = "1.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e56a18552996ac8d29ecc3b190b4fdbb2d91ca4ec396de7bbffaf43f3d637e96" -dependencies = [ - "bitflags", - "errno", - "libc", - "linux-raw-sys 0.9.3", - "windows-sys 0.59.0", -] - -[[package]] -name = "rustversion" -version = "1.0.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eded382c5f5f786b989652c49544c4877d9f015cc22e145a5ea8ea66c2921cd2" - -[[package]] -name = "ryu" -version = "1.0.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28d3b2b1366ec20994f1fd18c3c594f05c5dd4bc44d8bb0c1c632c8d6829481f" - -[[package]] -name = "semver" -version = "1.0.26" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56e6fa9c48d24d85fb3de5ad847117517440f6beceb7798af16b4a87d616b8d0" -dependencies = [ - "serde", -] - -[[package]] -name = "serde" -version = "1.0.219" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f0e2c6ed6606019b4e29e69dbaba95b11854410e5347d525002456dbbb786b6" -dependencies = [ - "serde_derive", -] - -[[package]] -name = "serde_derive" -version = "1.0.219" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b0276cf7f2c73365f7157c8123c21cd9a50fbbd844757af28ca1f5925fc2a00" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "serde_json" -version = "1.0.140" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "20068b6e96dc6c9bd23e01df8827e6c7e1f2fddd43c21810382803c136b99373" -dependencies = [ - "itoa", - "memchr", - "ryu", - "serde", -] - -[[package]] -name = "serde_spanned" -version = "0.6.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87607cb1398ed59d48732e575a4c28a7a8ebf2454b964fe3f224f2afc07909e1" -dependencies = [ - "serde", -] - -[[package]] -name = "sha2" -version = "0.10.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "793db75ad2bcafc3ffa7c68b215fee268f537982cd901d132f89c6343f3a3dc8" -dependencies = [ - "cfg-if", - "cpufeatures", - "digest", -] - -[[package]] -name = "shellexpand" -version = "2.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ccc8076840c4da029af4f87e4e8daeb0fca6b87bbb02e10cb60b791450e11e4" -dependencies = [ - "dirs", -] - -[[package]] -name = "shlex" -version = "1.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64" - -[[package]] -name = "slab" -version = "0.4.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f92a496fb766b417c996b9c5e57daf2f7ad3b0bebe1ccfca4856390e3d3bb67" -dependencies = [ - "autocfg", -] - -[[package]] -name = "slice-group-by" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "826167069c09b99d56f31e9ae5c99049e932a98c9dc2dac47645b08dbbf76ba7" - -[[package]] -name = "smallvec" -version = "1.14.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7fcf8323ef1faaee30a44a340193b1ac6814fd9b7b4e88e9d4519a3e4abe1cfd" -dependencies = [ - "serde", -] - -[[package]] -name = "socket2" -version = "0.5.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c970269d99b64e60ec3bd6ad27270092a5394c4e309314b18ae3fe575695fbe8" -dependencies = [ - "libc", - "windows-sys 0.52.0", -] - -[[package]] -name = "spdx" -version = "0.10.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "58b69356da67e2fc1f542c71ea7e654a361a79c938e4424392ecf4fa065d2193" -dependencies = [ - "smallvec", -] - -[[package]] -name = "sptr" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b9b39299b249ad65f3b7e96443bad61c02ca5cd3589f46cb6d610a0fd6c0d6a" - -[[package]] -name = "stable_deref_trait" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3" - -[[package]] -name = "strsim" -version = "0.11.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f" - -[[package]] -name = "syn" -version = "2.0.100" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b09a44accad81e1ba1cd74a32461ba89dee89095ba17b32f5d03683b1b1fc2a0" -dependencies = [ - "proc-macro2", - "quote", - "unicode-ident", -] - -[[package]] -name = "synstructure" -version = "0.13.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8af7666ab7b6390ab78131fb5b0fce11d6b7a6951602017c35fa82800708971" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "system-interface" -version = "0.27.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc4592f674ce18521c2a81483873a49596655b179f71c5e05d10c1fe66c78745" -dependencies = [ - "bitflags", - "cap-fs-ext", - "cap-std", - "fd-lock", - "io-lifetimes", - "rustix 0.38.44", - "windows-sys 0.59.0", - "winx", -] - -[[package]] -name = "target-lexicon" -version = "0.12.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61c41af27dd6d1e27b1b16b489db798443478cef1f06a660c96db617ba5de3b1" - -[[package]] -name = "termcolor" -version = "1.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06794f8f6c5c898b3275aebefa6b8a1cb24cd2c6c79397ab15774837a0bc5755" -dependencies = [ - "winapi-util", -] - -[[package]] -name = "terminal_size" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "45c6481c4829e4cc63825e62c49186a34538b7b2750b73b266581ffb612fb5ed" -dependencies = [ - "rustix 1.0.3", - "windows-sys 0.59.0", -] - -[[package]] -name = "test-artifacts" -version = "0.0.0" - -[[package]] -name = "test-helpers" -version = "0.0.0" -dependencies = [ - "codegen-macro", - "wasm-encoder 0.228.0", - "wit-bindgen-core", - "wit-component", - "wit-parser 0.228.0", -] - -[[package]] -name = "test-rust-wasm" -version = "0.0.0" -dependencies = [ - "wit-bindgen", -] - -[[package]] -name = "thiserror" -version = "1.0.69" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6aaf5339b578ea85b50e080feb250a3e8ae8cfcdff9a461c9ec2904bc923f52" -dependencies = [ - "thiserror-impl", -] - -[[package]] -name = "thiserror-impl" -version = "1.0.69" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fee6c4efc90059e10f81e6d42c60a18f76588c3d74cb83a0b242a2b6c7504c1" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "tinystr" -version = "0.7.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9117f5d4db391c1cf6927e7bea3db74b9a1c1add8f7eda9ffd5364f40f57b82f" -dependencies = [ - "displaydoc", - "zerovec", -] - -[[package]] -name = "tokio" -version = "1.44.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f382da615b842244d4b8738c82ed1275e6c5dd90c459a30941cd07080b06c91a" -dependencies = [ - "backtrace", - "bytes", - "libc", - "mio", - "pin-project-lite", - "socket2", - "windows-sys 0.52.0", -] - -[[package]] -name = "toml" -version = "0.8.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd87a5cdd6ffab733b2f74bc4fd7ee5fff6634124999ac278c35fc78c6120148" -dependencies = [ - "serde", - "serde_spanned", - "toml_datetime", - "toml_edit", -] - -[[package]] -name = "toml_datetime" -version = "0.6.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0dd7358ecb8fc2f8d014bf86f6f638ce72ba252a2c3a2572f2a795f1d23efb41" -dependencies = [ - "serde", -] - -[[package]] -name = "toml_edit" -version = "0.22.24" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17b4795ff5edd201c7cd6dca065ae59972ce77d1b80fa0a84d94950ece7d1474" -dependencies = [ - "indexmap", - "serde", - "serde_spanned", - "toml_datetime", - "winnow", -] - -[[package]] -name = "tracing" -version = "0.1.41" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "784e0ac535deb450455cbfa28a6f0df145ea1bb7ae51b821cf5e7927fdcfbdd0" -dependencies = [ - "pin-project-lite", - "tracing-attributes", - "tracing-core", -] - -[[package]] -name = "tracing-attributes" -version = "0.1.28" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "395ae124c09f9e6918a2310af6038fba074bcf474ac352496d5910dd59a2226d" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "tracing-core" -version = "0.1.33" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e672c95779cf947c5311f83787af4fa8fffd12fb27e4993211a84bdfd9610f9c" -dependencies = [ - "once_cell", -] - -[[package]] -name = "typenum" -version = "1.18.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1dccffe3ce07af9386bfd29e80c0ab1a8205a2fc34e4bcd40364df902cfa8f3f" - -[[package]] -name = "unicase" -version = "2.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75b844d17643ee918803943289730bec8aac480150456169e647ed0b576ba539" - -[[package]] -name = "unicode-ident" -version = "1.0.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a5f39404a5da50712a4c1eecf25e90dd62b613502b7e925fd4e4d19b5c96512" - -[[package]] -name = "unicode-width" -version = "0.1.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7dd6e30e90baa6f72411720665d41d89b9a3d039dc45b8faea1ddd07f617f6af" - -[[package]] -name = "unicode-width" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1fc81956842c57dac11422a97c3b8195a1ff727f06e85c84ed2e8aa277c9a0fd" - -[[package]] -name = "unicode-xid" -version = "0.2.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ebc1c04c71510c7f702b52b7c350734c9ff1295c464a03335b00bb84fc54f853" - -[[package]] -name = "url" -version = "2.5.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32f8b686cadd1473f4bd0117a5d28d36b1ade384ea9b5069a1c40aefed7fda60" -dependencies = [ - "form_urlencoded", - "idna", - "percent-encoding", -] - -[[package]] -name = "utf16_iter" -version = "1.0.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8232dd3cdaed5356e0f716d285e4b40b932ac434100fe9b7e0e8e935b9e6246" - -[[package]] -name = "utf8_iter" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6c140620e7ffbb22c2dee59cafe6084a59b5ffc27a8859a5f0d494b5d52b6be" - -[[package]] -name = "utf8parse" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821" - -[[package]] -name = "uuid" -version = "1.16.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "458f7a779bf54acc9f347480ac654f68407d3aab21269a6e3c9f922acd9e2da9" - -[[package]] -name = "version_check" -version = "0.9.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a" - -[[package]] -name = "wac-graph" -version = "0.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d94268a683b67ae20210565b5f91e106fe05034c36b931e739fe90377ed80b98" -dependencies = [ - "anyhow", - "id-arena", - "indexmap", - "log", - "petgraph", - "semver", - "thiserror", - "wac-types", - "wasm-encoder 0.202.0", - "wasm-metadata 0.202.0", - "wasmparser 0.202.0", -] - -[[package]] -name = "wac-parser" -version = "0.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "616ec0c4f63641fa095b4a551263fe35a15c72c9680b650b8f08f70db0fdbd19" -dependencies = [ - "anyhow", - "id-arena", - "indexmap", - "log", - "logos", - "miette", - "semver", - "serde", - "thiserror", - "wac-graph", - "wasm-encoder 0.202.0", - "wasm-metadata 0.202.0", - "wasmparser 0.202.0", -] - -[[package]] -name = "wac-types" -version = "0.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f5028a15e266f4c8fed48beb95aebb76af5232dcd554fd849a305a4e5cce1563" -dependencies = [ - "anyhow", - "id-arena", - "indexmap", - "semver", - "wasm-encoder 0.202.0", - "wasmparser 0.202.0", -] - -[[package]] -name = "wasi" -version = "0.11.0+wasi-snapshot-preview1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" - -[[package]] -name = "wasi-preview1-component-adapter-provider" -version = "30.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ddbd7f2a9e3635abe5d4df93b12cadc8d6818079785ee4fab3719ae3c85a064e" +] [[package]] -name = "wasm-bindgen" -version = "0.2.100" +name = "rayon-core" +version = "1.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1edc8929d7499fc4e8f0be2262a241556cfc54a0bea223790e71446f2aab1ef5" +checksum = "1465873a3dfdaa8ae7cb14b4383657caab0b3e8a0aa9ae8e04b044854c8dfce2" dependencies = [ - "cfg-if", - "once_cell", - "rustversion", - "wasm-bindgen-macro", + "crossbeam-deque", + "crossbeam-utils", ] [[package]] -name = "wasm-bindgen-backend" -version = "0.2.100" +name = "regex" +version = "1.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2f0a0651a5c2bc21487bde11ee802ccaf4c51935d0d3d42a6101f98161700bc6" +checksum = "b544ef1b4eac5dc2db33ea63606ae9ffcfac26c1416a2806ae0bf5f56b201191" dependencies = [ - "bumpalo", - "log", - "proc-macro2", - "quote", - "syn", - "wasm-bindgen-shared", + "aho-corasick", + "memchr", + "regex-automata", + "regex-syntax", ] [[package]] -name = "wasm-bindgen-macro" -version = "0.2.100" +name = "regex-automata" +version = "0.4.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7fe63fc6d09ed3792bd0897b314f53de8e16568c2b3f7982f468c0bf9bd0b407" +checksum = "809e8dc61f6de73b46c85f4c96486310fe304c434cfa43669d7b40f711150908" dependencies = [ - "quote", - "wasm-bindgen-macro-support", + "aho-corasick", + "memchr", + "regex-syntax", ] [[package]] -name = "wasm-bindgen-macro-support" -version = "0.2.100" +name = "regex-syntax" +version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ae87ea40c9f689fc23f209965b6fb8a99ad69aeeb0231408be24920604395de" -dependencies = [ - "proc-macro2", - "quote", - "syn", - "wasm-bindgen-backend", - "wasm-bindgen-shared", -] +checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c" [[package]] -name = "wasm-bindgen-shared" -version = "0.2.100" +name = "rustix" +version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a05d73b933a847d6cccdda8f838a22ff101ad9bf93e33684f39c1f5f0eece3d" +checksum = "e56a18552996ac8d29ecc3b190b4fdbb2d91ca4ec396de7bbffaf43f3d637e96" dependencies = [ - "unicode-ident", + "bitflags", + "errno", + "libc", + "linux-raw-sys", + "windows-sys", ] [[package]] -name = "wasm-encoder" -version = "0.202.0" +name = "ryu" +version = "1.0.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfd106365a7f5f7aa3c1916a98cbb3ad477f5ff96ddb130285a91c6e7429e67a" +checksum = "28d3b2b1366ec20994f1fd18c3c594f05c5dd4bc44d8bb0c1c632c8d6829481f" + +[[package]] +name = "semver" +version = "1.0.26" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "56e6fa9c48d24d85fb3de5ad847117517440f6beceb7798af16b4a87d616b8d0" dependencies = [ - "leb128", + "serde", ] [[package]] -name = "wasm-encoder" -version = "0.217.1" +name = "serde" +version = "1.0.219" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "10961fd76db420582926af70816dd205019d8152d9e51e1b939125dd1639f854" +checksum = "5f0e2c6ed6606019b4e29e69dbaba95b11854410e5347d525002456dbbb786b6" dependencies = [ - "leb128", + "serde_derive", ] [[package]] -name = "wasm-encoder" -version = "0.228.0" +name = "serde_derive" +version = "1.0.219" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05d30290541f2d4242a162bbda76b8f2d8b1ac59eab3568ed6f2327d52c9b2c4" +checksum = "5b0276cf7f2c73365f7157c8123c21cd9a50fbbd844757af28ca1f5925fc2a00" dependencies = [ - "leb128fmt", - "wasmparser 0.228.0", + "proc-macro2", + "quote", + "syn", ] [[package]] -name = "wasm-metadata" -version = "0.202.0" +name = "serde_json" +version = "1.0.140" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "094aea3cb90e09f16ee25a4c0e324b3e8c934e7fd838bfa039aef5352f44a917" +checksum = "20068b6e96dc6c9bd23e01df8827e6c7e1f2fddd43c21810382803c136b99373" dependencies = [ - "anyhow", - "indexmap", + "itoa", + "memchr", + "ryu", "serde", - "serde_derive", - "serde_json", - "spdx", - "wasm-encoder 0.202.0", - "wasmparser 0.202.0", ] [[package]] -name = "wasm-metadata" -version = "0.228.0" +name = "serde_spanned" +version = "0.6.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc79a7e49646e1591d26649eac7ad2b09488aa02c086f3d076705830eae61031" +checksum = "87607cb1398ed59d48732e575a4c28a7a8ebf2454b964fe3f224f2afc07909e1" dependencies = [ - "anyhow", - "indexmap", - "wasm-encoder 0.228.0", - "wasmparser 0.228.0", + "serde", ] [[package]] -name = "wasmparser" -version = "0.202.0" +name = "slab" +version = "0.4.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d6998515d3cf3f8b980ef7c11b29a9b1017d4cf86b99ae93b546992df9931413" +checksum = "8f92a496fb766b417c996b9c5e57daf2f7ad3b0bebe1ccfca4856390e3d3bb67" dependencies = [ - "bitflags", - "indexmap", - "semver", + "autocfg", ] [[package]] -name = "wasmparser" -version = "0.217.1" +name = "smallvec" +version = "1.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7fcf8323ef1faaee30a44a340193b1ac6814fd9b7b4e88e9d4519a3e4abe1cfd" + +[[package]] +name = "spdx" +version = "0.10.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "65a5a0689975b9fd93c02f5400cfd9669858b99607e54e7b892c6080cba598bb" +checksum = "58b69356da67e2fc1f542c71ea7e654a361a79c938e4424392ecf4fa065d2193" dependencies = [ - "ahash", - "bitflags", - "hashbrown 0.14.5", - "indexmap", - "semver", - "serde", + "smallvec", ] [[package]] -name = "wasmparser" -version = "0.228.0" +name = "strsim" +version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4abf1132c1fdf747d56bbc1bb52152400c70f336870f968b85e89ea422198ae3" +checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f" + +[[package]] +name = "syn" +version = "2.0.100" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b09a44accad81e1ba1cd74a32461ba89dee89095ba17b32f5d03683b1b1fc2a0" dependencies = [ - "bitflags", - "hashbrown 0.15.2", - "indexmap", - "semver", - "serde", + "proc-macro2", + "quote", + "unicode-ident", ] [[package]] -name = "wasmprinter" -version = "0.217.1" +name = "terminal_size" +version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "324c6782d7b81c01625335d252653b26ea68e835ddb4aef4cb1ed3ea40ae3a49" +checksum = "45c6481c4829e4cc63825e62c49186a34538b7b2750b73b266581ffb612fb5ed" dependencies = [ - "anyhow", - "termcolor", - "wasmparser 0.217.1", + "rustix", + "windows-sys", ] [[package]] -name = "wasmtime" -version = "25.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f38dbf42dc56a6fe41ccd77211ea8ec90855de05e52cd00df5a0a3bca87d6147" +name = "test-helpers" +version = "0.0.0" dependencies = [ - "addr2line 0.22.0", - "anyhow", - "async-trait", - "bitflags", - "bumpalo", - "cc", - "cfg-if", - "encoding_rs", - "fxprof-processed-profile", - "gimli 0.29.0", - "hashbrown 0.14.5", - "indexmap", - "ittapi", - "libc", - "libm", - "log", - "mach2", - "memfd", - "object", - "once_cell", - "paste", - "postcard", - "psm", - "rayon", - "rustix 0.38.44", - "semver", - "serde", - "serde_derive", - "serde_json", - "smallvec", - "sptr", - "target-lexicon", - "wasm-encoder 0.217.1", - "wasmparser 0.217.1", - "wasmtime-asm-macros", - "wasmtime-cache", - "wasmtime-component-macro", - "wasmtime-component-util", - "wasmtime-cranelift", - "wasmtime-environ", - "wasmtime-fiber", - "wasmtime-jit-debug", - "wasmtime-jit-icache-coherence", - "wasmtime-slab", - "wasmtime-versioned-export-macros", - "wasmtime-winch", - "wat", - "windows-sys 0.52.0", + "codegen-macro", + "wasm-encoder 0.228.0", + "wit-bindgen-core", + "wit-component", + "wit-parser", ] [[package]] -name = "wasmtime-asm-macros" -version = "25.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30e0c7f9983c2d60109a939d9ab0e0df301901085c3608e1c22c27c98390a027" +name = "test-rust-wasm" +version = "0.0.0" dependencies = [ - "cfg-if", + "wit-bindgen", ] [[package]] -name = "wasmtime-cache" -version = "25.0.3" +name = "thiserror" +version = "1.0.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e52eaa50abc14a9a2550d05e99e5e72d43ba75ea99cac1a440b61f1b9b87cd11" +checksum = "b6aaf5339b578ea85b50e080feb250a3e8ae8cfcdff9a461c9ec2904bc923f52" dependencies = [ - "anyhow", - "base64", - "directories-next", - "log", - "postcard", - "rustix 0.38.44", - "serde", - "serde_derive", - "sha2", - "toml", - "windows-sys 0.52.0", - "zstd", + "thiserror-impl", ] [[package]] -name = "wasmtime-component-macro" -version = "25.0.3" +name = "thiserror-impl" +version = "1.0.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0929ffffaca32dd8770b56848c94056036963ca05de25fb47cac644e20262168" +checksum = "4fee6c4efc90059e10f81e6d42c60a18f76588c3d74cb83a0b242a2b6c7504c1" dependencies = [ - "anyhow", "proc-macro2", "quote", "syn", - "wasmtime-component-util", - "wasmtime-wit-bindgen", - "wit-parser 0.217.1", ] [[package]] -name = "wasmtime-component-util" -version = "25.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fdc29d2b56629d66d2fd791d1b46471d0016e0d684ed2dc299e870d127082268" - -[[package]] -name = "wasmtime-cranelift" -version = "25.0.3" +name = "toml" +version = "0.8.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8c8af1197703f4de556a274384adf5db36a146f9892bc9607bad16881e75c80" +checksum = "cd87a5cdd6ffab733b2f74bc4fd7ee5fff6634124999ac278c35fc78c6120148" dependencies = [ - "anyhow", - "cfg-if", - "cranelift-codegen", - "cranelift-control", - "cranelift-entity", - "cranelift-frontend", - "cranelift-native", - "cranelift-wasm", - "gimli 0.29.0", - "log", - "object", - "smallvec", - "target-lexicon", - "thiserror", - "wasmparser 0.217.1", - "wasmtime-environ", - "wasmtime-versioned-export-macros", + "serde", + "serde_spanned", + "toml_datetime", + "toml_edit", ] [[package]] -name = "wasmtime-environ" -version = "25.0.3" +name = "toml_datetime" +version = "0.6.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f1b5af7bac868c5bce3b78a366a10677caacf6e6467c156301297e36ed31f3e" +checksum = "0dd7358ecb8fc2f8d014bf86f6f638ce72ba252a2c3a2572f2a795f1d23efb41" dependencies = [ - "anyhow", - "cpp_demangle", - "cranelift-bitset", - "cranelift-entity", - "gimli 0.29.0", - "indexmap", - "log", - "object", - "postcard", - "rustc-demangle", - "semver", "serde", - "serde_derive", - "target-lexicon", - "wasm-encoder 0.217.1", - "wasmparser 0.217.1", - "wasmprinter", - "wasmtime-component-util", - "wasmtime-types", ] [[package]] -name = "wasmtime-fiber" -version = "25.0.3" +name = "toml_edit" +version = "0.22.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "665ccc1bb0f28496e6fa02e94c575ee9ad6e3202c7df8591e5dda78106d5aa4a" +checksum = "17b4795ff5edd201c7cd6dca065ae59972ce77d1b80fa0a84d94950ece7d1474" dependencies = [ - "anyhow", - "cc", - "cfg-if", - "rustix 0.38.44", - "wasmtime-asm-macros", - "wasmtime-versioned-export-macros", - "windows-sys 0.52.0", + "indexmap", + "serde", + "serde_spanned", + "toml_datetime", + "winnow", ] [[package]] -name = "wasmtime-jit-debug" -version = "25.0.3" +name = "unicase" +version = "2.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "106731c6ebe1d551362ee8c876d450bdc2d517988b20eb3653dc4837b1949437" -dependencies = [ - "object", - "once_cell", - "rustix 0.38.44", - "wasmtime-versioned-export-macros", -] +checksum = "75b844d17643ee918803943289730bec8aac480150456169e647ed0b576ba539" [[package]] -name = "wasmtime-jit-icache-coherence" -version = "25.0.3" +name = "unicode-ident" +version = "1.0.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d7314e32c624f645ad7d6b9fc3ac89eb7d2b9aa06695d6445cec087958ec27d" -dependencies = [ - "anyhow", - "cfg-if", - "libc", - "windows-sys 0.52.0", -] +checksum = "5a5f39404a5da50712a4c1eecf25e90dd62b613502b7e925fd4e4d19b5c96512" [[package]] -name = "wasmtime-slab" -version = "25.0.3" +name = "unicode-width" +version = "0.1.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f75cba1a8cc327839f493cfc3036c9de3d077d59ab76296bc710ee5f95be5391" +checksum = "7dd6e30e90baa6f72411720665d41d89b9a3d039dc45b8faea1ddd07f617f6af" [[package]] -name = "wasmtime-types" -version = "25.0.3" +name = "unicode-width" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c6d83a7816947a4974e2380c311eacb1db009b8bad86081dc726b705603c93c7" -dependencies = [ - "anyhow", - "cranelift-entity", - "serde", - "serde_derive", - "smallvec", - "wasmparser 0.217.1", -] +checksum = "1fc81956842c57dac11422a97c3b8195a1ff727f06e85c84ed2e8aa277c9a0fd" [[package]] -name = "wasmtime-versioned-export-macros" -version = "25.0.3" +name = "unicode-xid" +version = "0.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6879a8e168aef3fe07335343b7fbede12fa494215e83322e173d4018e124a846" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] +checksum = "ebc1c04c71510c7f702b52b7c350734c9ff1295c464a03335b00bb84fc54f853" + +[[package]] +name = "utf8parse" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821" [[package]] -name = "wasmtime-wasi" -version = "25.0.3" +name = "wac-graph" +version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d042ea66b2834fb03b8a6968ef1a99a4b537211b00f7502a4d6a37f4eb2049b2" +checksum = "d94268a683b67ae20210565b5f91e106fe05034c36b931e739fe90377ed80b98" dependencies = [ "anyhow", - "async-trait", - "bitflags", - "bytes", - "cap-fs-ext", - "cap-net-ext", - "cap-rand", - "cap-std", - "cap-time-ext", - "fs-set-times", - "futures", - "io-extras", - "io-lifetimes", - "once_cell", - "rustix 0.38.44", - "system-interface", + "id-arena", + "indexmap", + "log", + "petgraph", + "semver", "thiserror", - "tokio", - "tracing", - "url", - "wasmtime", - "wiggle", - "windows-sys 0.52.0", + "wac-types", + "wasm-encoder 0.202.0", + "wasm-metadata 0.202.0", + "wasmparser 0.202.0", ] [[package]] -name = "wasmtime-winch" -version = "25.0.3" +name = "wac-parser" +version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6baca2a919a288df653246069868b4de80f07e9679a8ef9b78ad79fc658ffd12" +checksum = "616ec0c4f63641fa095b4a551263fe35a15c72c9680b650b8f08f70db0fdbd19" dependencies = [ "anyhow", - "cranelift-codegen", - "gimli 0.29.0", - "object", - "target-lexicon", - "wasmparser 0.217.1", - "wasmtime-cranelift", - "wasmtime-environ", - "winch-codegen", + "id-arena", + "indexmap", + "log", + "logos", + "miette", + "semver", + "serde", + "thiserror", + "wac-graph", + "wasm-encoder 0.202.0", + "wasm-metadata 0.202.0", + "wasmparser 0.202.0", ] [[package]] -name = "wasmtime-wit-bindgen" -version = "25.0.3" +name = "wac-types" +version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f571f63ac1d532e986eb3973bbef3a45e4ae83de521a8d573b0fe0594dc9608" +checksum = "f5028a15e266f4c8fed48beb95aebb76af5232dcd554fd849a305a4e5cce1563" dependencies = [ "anyhow", - "heck 0.4.1", + "id-arena", "indexmap", - "wit-parser 0.217.1", + "semver", + "wasm-encoder 0.202.0", + "wasmparser 0.202.0", ] [[package]] -name = "wast" -version = "35.0.2" +name = "wasi-preview1-component-adapter-provider" +version = "30.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2ef140f1b49946586078353a453a1d28ba90adfc54dde75710bc1931de204d68" -dependencies = [ - "leb128", -] +checksum = "ddbd7f2a9e3635abe5d4df93b12cadc8d6818079785ee4fab3719ae3c85a064e" [[package]] -name = "wast" -version = "228.0.0" +name = "wasm-encoder" +version = "0.202.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e5aae124478cb51439f6587f074a3a5e835afd22751c59a87b2e2a882727c97" +checksum = "bfd106365a7f5f7aa3c1916a98cbb3ad477f5ff96ddb130285a91c6e7429e67a" dependencies = [ - "bumpalo", - "leb128fmt", - "memchr", - "unicode-width 0.2.0", - "wasm-encoder 0.228.0", + "leb128", ] [[package]] -name = "wat" -version = "1.228.0" +name = "wasm-encoder" +version = "0.228.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ec29c89a8d055df988de7236483bf569988ac3d6905899f6af5ef920f9385ad" +checksum = "05d30290541f2d4242a162bbda76b8f2d8b1ac59eab3568ed6f2327d52c9b2c4" dependencies = [ - "wast 228.0.0", + "leb128fmt", + "wasmparser 0.228.0", ] [[package]] -name = "wiggle" -version = "25.0.3" +name = "wasm-metadata" +version = "0.202.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c8fdcd81702e0f46a8ab2ed28a5bf824aabf4a1af1673af496a020aacd0b6f9" +checksum = "094aea3cb90e09f16ee25a4c0e324b3e8c934e7fd838bfa039aef5352f44a917" dependencies = [ "anyhow", - "async-trait", - "bitflags", - "thiserror", - "tracing", - "wasmtime", - "wiggle-macro", + "indexmap", + "serde", + "serde_derive", + "serde_json", + "spdx", + "wasm-encoder 0.202.0", + "wasmparser 0.202.0", ] [[package]] -name = "wiggle-generate" -version = "25.0.3" +name = "wasm-metadata" +version = "0.228.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14f745361f0a9071aaabd05de1bb2b782d9f0597f30d9c0f20326224902e64d5" +checksum = "cc79a7e49646e1591d26649eac7ad2b09488aa02c086f3d076705830eae61031" dependencies = [ "anyhow", - "heck 0.4.1", - "proc-macro2", - "quote", - "shellexpand", - "syn", - "witx", -] - -[[package]] -name = "wiggle-macro" -version = "25.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfbdae3574621921ed3c13325edc910388487759d10fb330f656cfc69bee38db" -dependencies = [ - "proc-macro2", - "quote", - "syn", - "wiggle-generate", -] - -[[package]] -name = "winapi" -version = "0.3.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" -dependencies = [ - "winapi-i686-pc-windows-gnu", - "winapi-x86_64-pc-windows-gnu", + "indexmap", + "wasm-encoder 0.228.0", + "wasmparser 0.228.0", ] [[package]] -name = "winapi-i686-pc-windows-gnu" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" - -[[package]] -name = "winapi-util" -version = "0.1.9" +name = "wasmparser" +version = "0.202.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf221c93e13a30d793f7645a0e7762c55d169dbb0a49671918a2319d289b10bb" +checksum = "d6998515d3cf3f8b980ef7c11b29a9b1017d4cf86b99ae93b546992df9931413" dependencies = [ - "windows-sys 0.59.0", + "bitflags", + "indexmap", + "semver", ] [[package]] -name = "winapi-x86_64-pc-windows-gnu" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" - -[[package]] -name = "winch-codegen" -version = "0.23.3" +name = "wasmparser" +version = "0.228.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01cd1dc56c5a45d509ff06e7ca8817eaa9ec3240096f07e71915d5d528658e8a" +checksum = "4abf1132c1fdf747d56bbc1bb52152400c70f336870f968b85e89ea422198ae3" dependencies = [ - "anyhow", - "cranelift-codegen", - "gimli 0.29.0", - "regalloc2", - "smallvec", - "target-lexicon", - "wasmparser 0.217.1", - "wasmtime-cranelift", - "wasmtime-environ", + "bitflags", + "hashbrown", + "indexmap", + "semver", + "serde", ] [[package]] -name = "windows-core" -version = "0.52.0" +name = "wast" +version = "228.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9" +checksum = "9e5aae124478cb51439f6587f074a3a5e835afd22751c59a87b2e2a882727c97" dependencies = [ - "windows-targets", + "bumpalo", + "leb128fmt", + "memchr", + "unicode-width 0.2.0", + "wasm-encoder 0.228.0", ] [[package]] -name = "windows-sys" -version = "0.52.0" +name = "wat" +version = "1.228.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" +checksum = "7ec29c89a8d055df988de7236483bf569988ac3d6905899f6af5ef920f9385ad" dependencies = [ - "windows-targets", + "wast", ] [[package]] @@ -2820,16 +1091,6 @@ dependencies = [ "memchr", ] -[[package]] -name = "winx" -version = "0.36.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f3fd376f71958b862e7afb20cfe5a22830e1963462f3a17f49d82a6c1d1f42d" -dependencies = [ - "bitflags", - "windows-sys 0.59.0", -] - [[package]] name = "wit-bindgen" version = "0.41.0" @@ -2844,7 +1105,7 @@ version = "0.41.0" dependencies = [ "anyhow", "clap", - "heck 0.5.0", + "heck", "wasm-encoder 0.228.0", "wasm-metadata 0.228.0", "wit-bindgen-core", @@ -2858,12 +1119,7 @@ dependencies = [ "anyhow", "clap", "env_logger", - "heck 0.5.0", - "test-artifacts", "wasm-encoder 0.228.0", - "wasmparser 0.228.0", - "wasmtime", - "wasmtime-wasi", "wit-bindgen-c", "wit-bindgen-core", "wit-bindgen-csharp", @@ -2872,7 +1128,6 @@ dependencies = [ "wit-bindgen-rust", "wit-bindgen-test", "wit-component", - "wit-parser 0.228.0", ] [[package]] @@ -2880,8 +1135,8 @@ name = "wit-bindgen-core" version = "0.41.0" dependencies = [ "anyhow", - "heck 0.5.0", - "wit-parser 0.228.0", + "heck", + "wit-parser", ] [[package]] @@ -2890,12 +1145,12 @@ version = "0.41.0" dependencies = [ "anyhow", "clap", - "heck 0.5.0", + "heck", "indexmap", "wasm-metadata 0.228.0", "wit-bindgen-core", "wit-component", - "wit-parser 0.228.0", + "wit-parser", ] [[package]] @@ -2904,7 +1159,7 @@ version = "0.41.0" dependencies = [ "anyhow", "clap", - "heck 0.5.0", + "heck", "pulldown-cmark", "wit-bindgen-core", ] @@ -2915,7 +1170,7 @@ version = "0.41.0" dependencies = [ "anyhow", "clap", - "heck 0.5.0", + "heck", "wit-bindgen-core", ] @@ -2935,7 +1190,7 @@ dependencies = [ "anyhow", "clap", "futures", - "heck 0.5.0", + "heck", "indexmap", "prettyplease", "serde", @@ -2968,7 +1223,7 @@ version = "0.41.0" dependencies = [ "anyhow", "clap", - "heck 0.5.0", + "heck", "indexmap", "log", "rayon", @@ -2984,7 +1239,7 @@ dependencies = [ "wat", "wit-bindgen-csharp", "wit-component", - "wit-parser 0.228.0", + "wit-parser", ] [[package]] @@ -3004,25 +1259,7 @@ dependencies = [ "wasm-metadata 0.228.0", "wasmparser 0.228.0", "wat", - "wit-parser 0.228.0", -] - -[[package]] -name = "wit-parser" -version = "0.217.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5aaf02882453eaeec4fe30f1e4263cfd8b8ea36dd00e1fe7d902d9cb498bccd" -dependencies = [ - "anyhow", - "id-arena", - "indexmap", - "log", - "semver", - "serde", - "serde_derive", - "serde_json", - "unicode-xid", - "wasmparser 0.217.1", + "wit-parser", ] [[package]] @@ -3042,162 +1279,3 @@ dependencies = [ "unicode-xid", "wasmparser 0.228.0", ] - -[[package]] -name = "witx" -version = "0.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e366f27a5cabcddb2706a78296a40b8fcc451e1a6aba2fc1d94b4a01bdaaef4b" -dependencies = [ - "anyhow", - "log", - "thiserror", - "wast 35.0.2", -] - -[[package]] -name = "write16" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d1890f4022759daae28ed4fe62859b1236caebfc61ede2f63ed4e695f3f6d936" - -[[package]] -name = "writeable" -version = "0.5.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e9df38ee2d2c3c5948ea468a8406ff0db0b29ae1ffde1bcf20ef305bcc95c51" - -[[package]] -name = "yoke" -version = "0.7.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "120e6aef9aa629e3d4f52dc8cc43a015c7724194c97dfaf45180d2daf2b77f40" -dependencies = [ - "serde", - "stable_deref_trait", - "yoke-derive", - "zerofrom", -] - -[[package]] -name = "yoke-derive" -version = "0.7.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2380878cad4ac9aac1e2435f3eb4020e8374b5f13c296cb75b4620ff8e229154" -dependencies = [ - "proc-macro2", - "quote", - "syn", - "synstructure", -] - -[[package]] -name = "zerocopy" -version = "0.7.35" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b9b4fd18abc82b8136838da5d50bae7bdea537c574d8dc1a34ed098d6c166f0" -dependencies = [ - "zerocopy-derive 0.7.35", -] - -[[package]] -name = "zerocopy" -version = "0.8.24" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2586fea28e186957ef732a5f8b3be2da217d65c5969d4b1e17f973ebbe876879" -dependencies = [ - "zerocopy-derive 0.8.24", -] - -[[package]] -name = "zerocopy-derive" -version = "0.7.35" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "zerocopy-derive" -version = "0.8.24" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a996a8f63c5c4448cd959ac1bab0aaa3306ccfd060472f85943ee0750f0169be" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "zerofrom" -version = "0.1.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50cc42e0333e05660c3587f3bf9d0478688e15d870fab3346451ce7f8c9fbea5" -dependencies = [ - "zerofrom-derive", -] - -[[package]] -name = "zerofrom-derive" -version = "0.1.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d71e5d6e06ab090c67b5e44993ec16b72dcbaabc526db883a360057678b48502" -dependencies = [ - "proc-macro2", - "quote", - "syn", - "synstructure", -] - -[[package]] -name = "zerovec" -version = "0.10.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa2b893d79df23bfb12d5461018d408ea19dfafe76c2c7ef6d4eba614f8ff079" -dependencies = [ - "yoke", - "zerofrom", - "zerovec-derive", -] - -[[package]] -name = "zerovec-derive" -version = "0.10.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6eafa6dfb17584ea3e2bd6e76e0cc15ad7af12b09abdd1ca55961bed9b1063c6" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "zstd" -version = "0.13.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e91ee311a569c327171651566e07972200e76fcfe2242a4fa446149a3881c08a" -dependencies = [ - "zstd-safe", -] - -[[package]] -name = "zstd-safe" -version = "7.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f49c4d5f0abb602a93fb8736af2a4f4dd9512e36f7f570d66e65ff867ed3b9d" -dependencies = [ - "zstd-sys", -] - -[[package]] -name = "zstd-sys" -version = "2.0.15+zstd.1.5.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb81183ddd97d0c74cedf1d50d85c8d08c1b8b68ee863bdee9e706eedba1a237" -dependencies = [ - "cc", - "pkg-config", -] diff --git a/Cargo.toml b/Cargo.toml index 45e6a087a..5f13ca8ca 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -11,9 +11,6 @@ CLI tool to generate bindings for WIT documents and the component model. """ [workspace] -members = [ - "crates/test-rust-wasm", -] resolver = "2" [workspace.package] @@ -85,12 +82,3 @@ csharp = ['dep:wit-bindgen-csharp'] csharp-mono = ['csharp'] moonbit = ['dep:wit-bindgen-moonbit'] async = [] - -[dev-dependencies] -heck = { workspace = true } -wasmtime = { version = "25.0.0", features = ['component-model'] } -wasmtime-wasi = { version = "25.0.0" } -test-artifacts = { path = 'crates/test-rust-wasm/artifacts' } -wit-parser = { workspace = true } -wasmparser = { workspace = true } -wasm-encoder = { workspace = true } diff --git a/crates/test-rust-wasm/Cargo.toml b/crates/test-rust-wasm/Cargo.toml deleted file mode 100644 index 9535dc0be..000000000 --- a/crates/test-rust-wasm/Cargo.toml +++ /dev/null @@ -1,12 +0,0 @@ -[package] -name = "test-rust-wasm" -authors = ["Alex Crichton "] -edition.workspace = true -publish = false - -[dependencies] -wit-bindgen = { path = "../guest-rust" } - -[lib] -test = false -doctest = false diff --git a/crates/test-rust-wasm/artifacts/Cargo.toml b/crates/test-rust-wasm/artifacts/Cargo.toml deleted file mode 100644 index 11671ad1f..000000000 --- a/crates/test-rust-wasm/artifacts/Cargo.toml +++ /dev/null @@ -1,4 +0,0 @@ -[package] -name = "test-artifacts" -edition.workspace = true -publish = false diff --git a/crates/test-rust-wasm/artifacts/build.rs b/crates/test-rust-wasm/artifacts/build.rs deleted file mode 100644 index ee9cbe13e..000000000 --- a/crates/test-rust-wasm/artifacts/build.rs +++ /dev/null @@ -1,63 +0,0 @@ -use std::fs; -use std::path::PathBuf; -use std::process::Command; - -fn main() { - std::env::remove_var("CARGO_ENCODED_RUSTFLAGS"); - - let out_dir = PathBuf::from(std::env::var_os("OUT_DIR").unwrap()); - let manifest_dir = PathBuf::from(std::env::var_os("CARGO_MANIFEST_DIR").unwrap()); - - let wasi_adapter = manifest_dir.join("../../../tests/wasi_snapshot_preview1.reactor.wasm"); - - let target_to_test = match std::env::var("WIT_BINDGEN_WASI_TEST_TARGET") { - Ok(s) => s, - Err(_) => "wasm32-wasip1".to_string(), - }; - - let mut cmd = Command::new("cargo"); - cmd.arg("build") - .current_dir("../../test-rust-wasm") - .arg("--target") - .arg(&target_to_test) - .env("CARGO_TARGET_DIR", &out_dir) - .env("CARGO_PROFILE_DEV_DEBUG", "1"); - let status = cmd.status().unwrap(); - assert!(status.success()); - - let mut wasms = Vec::new(); - for file in out_dir - .join(&target_to_test) - .join("debug") - .read_dir() - .unwrap() - { - let file = file.unwrap().path(); - if file.extension().and_then(|s| s.to_str()) != Some("wasm") { - continue; - } - - let dep_file = file.with_extension("d"); - let deps = fs::read_to_string(&dep_file).expect("failed to read dep file"); - for dep in deps - .splitn(2, ":") - .skip(1) - .next() - .unwrap() - .split_whitespace() - { - println!("cargo:rerun-if-changed={}", dep); - } - - wasms.push(file); - } - println!("cargo:rerun-if-changed=../../test-rust-wasm/Cargo.toml"); - - let src = format!( - " - pub const ADAPTER: &str = {wasi_adapter:?}; - pub const WASMS: &[&str] = &{wasms:?}; - ", - ); - std::fs::write(out_dir.join("wasms.rs"), src).unwrap(); -} diff --git a/crates/test-rust-wasm/artifacts/src/lib.rs b/crates/test-rust-wasm/artifacts/src/lib.rs deleted file mode 100644 index 0cda4ae6f..000000000 --- a/crates/test-rust-wasm/artifacts/src/lib.rs +++ /dev/null @@ -1 +0,0 @@ -include!(concat!(env!("OUT_DIR"), "/wasms.rs")); diff --git a/crates/test-rust-wasm/src/lib.rs b/crates/test-rust-wasm/src/lib.rs deleted file mode 100644 index c8aab015c..000000000 --- a/crates/test-rust-wasm/src/lib.rs +++ /dev/null @@ -1,47 +0,0 @@ -//! A small global allocator implementation which is intended to keep track of -//! the number of allocated bytes to ensure that all our integration glue indeed -//! manages memory correctly and doesn't leak anything. - -use std::alloc::{GlobalAlloc, Layout, System}; -use std::sync::atomic::{AtomicUsize, Ordering::SeqCst}; - -#[global_allocator] -static ALLOC: A = A; - -static ALLOC_AMT: AtomicUsize = AtomicUsize::new(0); - -struct A; - -unsafe impl GlobalAlloc for A { - unsafe fn alloc(&self, layout: Layout) -> *mut u8 { - let ptr = System.alloc(layout); - if !ptr.is_null() { - ALLOC_AMT.fetch_add(layout.size(), SeqCst); - } - return ptr; - } - - unsafe fn dealloc(&self, ptr: *mut u8, layout: Layout) { - // Poison all deallocations to try to catch any use-after-free in the - // bindings as early as possible. - std::ptr::write_bytes(ptr, 0xde, layout.size()); - ALLOC_AMT.fetch_sub(layout.size(), SeqCst); - System.dealloc(ptr, layout) - } -} - -pub fn get() -> usize { - ALLOC_AMT.load(SeqCst) -} - -pub fn guard() -> impl Drop { - struct A(usize); - - impl Drop for A { - fn drop(&mut self) { - assert_eq!(get(), self.0); - } - } - - A(get()) -} diff --git a/tests/runtime/main.rs b/tests/runtime/main.rs deleted file mode 100644 index 56dbfb1db..000000000 --- a/tests/runtime/main.rs +++ /dev/null @@ -1,523 +0,0 @@ -#![allow(unused_imports)] // not all imports used by all generators - -use anyhow::{Context, Result}; -use heck::ToUpperCamelCase; -use std::borrow::Cow; -use std::path::{Path, PathBuf}; -use std::process::Command; -use std::{env, fs}; -use wasm_encoder::{Encode, Section}; -use wasmtime::component::{Component, Instance, Linker, ResourceTable}; -use wasmtime::{Config, Engine, Store, Table}; -use wasmtime_wasi::{WasiCtx, WasiCtxBuilder, WasiView}; -use wit_component::{ComponentEncoder, StringEncoding}; -use wit_parser::{Resolve, WorldId, WorldItem}; - -struct MyCtx {} - -struct Wasi(T, MyCtx, ResourceTable, WasiCtx); - -// wasi trait -impl WasiView for Wasi { - fn table(&mut self) -> &mut ResourceTable { - &mut self.2 - } - fn ctx(&mut self) -> &mut WasiCtx { - &mut self.3 - } -} - -fn run_test( - name: &str, - add_to_linker: fn(&mut Linker>) -> Result<()>, - instantiate: fn(&mut Store>, &Component, &Linker>) -> Result, - test: fn(U, &mut Store>) -> Result<()>, -) -> Result<()> -where - T: Default, - T: Send, -{ - run_test_from_dir(name, name, add_to_linker, instantiate, test) -} - -fn run_test_from_dir( - dir_name: &str, - name: &str, - add_to_linker: fn(&mut Linker>) -> Result<()>, - instantiate: fn(&mut Store>, &Component, &Linker>) -> Result, - test: fn(U, &mut Store>) -> Result<()>, -) -> Result<()> -where - T: Default, - T: Send, -{ - // Create an engine with caching enabled to assist with iteration in this - // project. - let mut config = Config::new(); - config.cache_config_load_default()?; - config.wasm_backtrace_details(wasmtime::WasmBacktraceDetails::Enable); - config.wasm_component_model(true); - let engine = Engine::new(&config)?; - - for wasm in tests(name, dir_name)? { - let component = Component::from_file(&engine, &wasm)?; - let mut linker = Linker::new(&engine); - - add_to_linker(&mut linker)?; - let state = MyCtx {}; - - let table = ResourceTable::new(); - let wasi: WasiCtx = WasiCtxBuilder::new().inherit_stdout().args(&[""]).build(); - - let data = Wasi(T::default(), state, table, wasi); - - let mut store = Store::new(&engine, data); - - wasmtime_wasi::add_to_linker_sync(&mut linker)?; - - let exports = instantiate(&mut store, &component, &linker)?; - - println!("testing {wasm:?}"); - test(exports, &mut store)?; - } - - Ok(()) -} - -fn tests(name: &str, dir_name: &str) -> Result> { - let mut result = Vec::new(); - - let mut dir = PathBuf::from("./tests/runtime"); - dir.push(dir_name); - - let mut rust = Vec::new(); - let mut c = Vec::new(); - let mut java = Vec::new(); - let mut c_sharp: Vec = Vec::new(); - for file in dir.read_dir()? { - let path = file?.path(); - match path.extension().and_then(|s| s.to_str()) { - Some("c") => c.push(path), - Some("java") => java.push(path), - Some("rs") => rust.push(path), - Some("go") => { - // Go implementation has been moved to a separate repository - println!( - "Skipping Go test as Go implementation has been moved to a separate repository" - ); - } - Some("cs") => c_sharp.push(path), - _ => {} - } - } - - let mut out_dir = std::env::current_exe()?; - out_dir.pop(); - out_dir.pop(); - out_dir.pop(); - out_dir.push("runtime-tests"); - out_dir.push(name); - - let wasi_adapter = - std::fs::read(&test_artifacts::ADAPTER).context("failed to read the wasi adapter")?; - - drop(std::fs::remove_dir_all(&out_dir)); - std::fs::create_dir_all(&out_dir)?; - - if cfg!(feature = "rust") && !rust.is_empty() { - let core = test_artifacts::WASMS - .iter() - .map(PathBuf::from) - .find(|p| match p.file_stem().and_then(|s| s.to_str()) { - Some(n) => n == name, - None => false, - }) - .unwrap_or_else(|| panic!("failed to find wasm with name '{name}' - make sure to include '{name}.rs' module in crates/test-rust-wasm/src/bin directory")); - let bytes = std::fs::read(&core)?; - let dst = if wasmparser::Parser::is_component(&bytes) { - PathBuf::from(core) - } else { - println!("rust core module = {core:?}"); - let wasm = ComponentEncoder::default() - .module(&bytes)? - .validate(true) - .adapter("wasi_snapshot_preview1", &wasi_adapter)? - .realloc_via_memory_grow(true) - .encode()?; - - let dst = out_dir.join("rust.wasm"); - std::fs::write(&dst, &wasm)?; - dst - }; - println!("rust component {dst:?}"); - result.push(dst); - } - - #[cfg(feature = "c")] - if !c.is_empty() { - let (resolve, world) = resolve_wit_dir(&dir); - for path in c.iter() { - let world_name = &resolve.worlds[world].name; - let out_dir = out_dir.join(format!("c-{}", world_name)); - drop(fs::remove_dir_all(&out_dir)); - fs::create_dir_all(&out_dir).unwrap(); - - let snake = world_name.replace("-", "_"); - let mut files = Default::default(); - let mut opts = wit_bindgen_c::Opts::default(); - if let Some(path) = path.file_name().and_then(|s| s.to_str()) { - if path.contains("utf16") { - opts.string_encoding = wit_component::StringEncoding::UTF16; - } - } - opts.build().generate(&resolve, world, &mut files).unwrap(); - - for (file, contents) in files.iter() { - let dst = out_dir.join(file); - fs::write(dst, contents).unwrap(); - } - - let sdk = PathBuf::from(std::env::var_os("WASI_SDK_PATH").expect( - "point the `WASI_SDK_PATH` environment variable to the path of your wasi-sdk", - )); - // Test both C mode and C++ mode. - for compiler in ["bin/clang", "bin/clang++"] { - let mut cmd = Command::new(sdk.join(compiler)); - let out_wasm = out_dir.join(format!( - "c-{}.wasm", - path.file_stem().and_then(|s| s.to_str()).unwrap() - )); - cmd.arg("--sysroot").arg(sdk.join("share/wasi-sysroot")); - cmd.arg(path) - .arg(out_dir.join(format!("{snake}.c"))) - .arg(out_dir.join(format!("{snake}_component_type.o"))) - .arg("-I") - .arg(&out_dir) - .arg("-Wall") - .arg("-Wextra") - .arg("-Werror") - .arg("-Wno-unused-parameter") - .arg("-mexec-model=reactor") - .arg("-g") - .arg("-o") - .arg(&out_wasm); - // Disable the warning about compiling a `.c` file in C++ mode. - if compiler.ends_with("++") { - cmd.arg("-Wno-deprecated"); - } - let command = format!("{cmd:?}"); - let output = match cmd.output() { - Ok(output) => output, - Err(e) => panic!("failed to spawn compiler: {e}; command was `{command}`"), - }; - - if !output.status.success() { - println!("status: {}", output.status); - println!("stdout: ------------------------------------------"); - println!("{}", String::from_utf8_lossy(&output.stdout)); - println!("stderr: ------------------------------------------"); - println!("{}", String::from_utf8_lossy(&output.stderr)); - panic!("failed to compile"); - } - - // Translate the canonical ABI module into a component. - let module = fs::read(&out_wasm).expect("failed to read wasm file"); - let component = ComponentEncoder::default() - .module(module.as_slice()) - .expect("pull custom sections from module") - .validate(true) - .adapter("wasi_snapshot_preview1", &wasi_adapter) - .expect("adapter failed to get loaded") - .encode() - .expect(&format!( - "module {:?} can be translated to a component", - out_wasm - )); - let component_path = out_wasm.with_extension("component.wasm"); - fs::write(&component_path, component).expect("write component to disk"); - - result.push(component_path); - } - } - } - - #[cfg(feature = "csharp-mono")] - if cfg!(windows) && !c_sharp.is_empty() { - let (resolve, world) = resolve_wit_dir(&dir); - for path in c_sharp.iter() { - let world_name = &resolve.worlds[world].name; - let out_dir = out_dir.join(format!("csharp-{}", world_name)); - drop(fs::remove_dir_all(&out_dir)); - fs::create_dir_all(&out_dir).unwrap(); - - for csharp_impl in &c_sharp { - fs::copy( - &csharp_impl, - &out_dir.join(csharp_impl.file_name().unwrap()), - ) - .unwrap(); - } - - let snake = world_name.replace("-", "_"); - let camel = format!("{}World", snake.to_upper_camel_case()); - - let assembly_name = format!( - "csharp-{}", - path.file_stem().and_then(|s| s.to_str()).unwrap() - ); - - let out_wasm = out_dir.join(&assembly_name); - - let mut files = Default::default(); - let mut opts = wit_bindgen_csharp::Opts::default(); - opts.runtime = wit_bindgen_csharp::CSharpRuntime::Mono; - - if let Some(path) = path.file_name().and_then(|s| s.to_str()) { - if path.contains("utf16") { - opts.string_encoding = wit_component::StringEncoding::UTF16; - } - } - opts.build().generate(&resolve, world, &mut files).unwrap(); - - for (file, contents) in files.iter() { - let dst = out_dir.join(file); - fs::write(dst, contents).unwrap(); - } - - let mut csproj = wit_bindgen_csharp::CSProject::new_mono( - out_dir.clone(), - &assembly_name, - world_name, - ); - - // Copy test file to target location to be included in compilation - let file_name = path.file_name().unwrap(); - fs::copy(path, out_dir.join(file_name.to_str().unwrap()))?; - - csproj.generate()?; - - let dotnet_root_env = "DOTNET_ROOT"; - let dotnet_cmd: PathBuf; - match env::var(dotnet_root_env) { - Ok(val) => dotnet_cmd = Path::new(&val).join("dotnet"), - Err(_e) => dotnet_cmd = "dotnet".into(), - } - - let mut cmd = Command::new(dotnet_cmd); - - cmd.current_dir(&out_dir); - - cmd.arg("build") - .arg(out_dir.join(format!("{camel}.csproj"))) - .arg("-c") - .arg("Debug") - .arg("/p:PlatformTarget=AnyCPU") - .arg("--self-contained") - .arg("-o") - .arg(&out_wasm); - let command = format!("{cmd:?}"); - let output = match cmd.output() { - Ok(output) => output, - Err(e) => panic!("failed to spawn compiler: {e}; command was `{command}`"), - }; - - if !output.status.success() { - println!("status: {}", output.status); - println!("stdout: ------------------------------------------"); - println!("{}", String::from_utf8_lossy(&output.stdout)); - println!("stderr: ------------------------------------------"); - println!("{}", String::from_utf8_lossy(&output.stderr)); - panic!("failed to compile"); - } - - let out_wasm = out_wasm.join("AppBundle").join(assembly_name); - let mut wasm_filename = out_wasm.clone(); - wasm_filename.set_extension("wasm"); - - let module = fs::read(&wasm_filename).with_context(|| { - format!("failed to read wasm file: {}", wasm_filename.display()) - })?; - - // Translate the canonical ABI module into a component. - let component_type_filename = out_dir.join(format!("{camel}_component_type.o")); - let component_type = fs::read(&component_type_filename).with_context(|| { - format!( - "failed to read component type file: {}", - component_type_filename.display() - ) - })?; - - let mut new_module = wasm_encoder::Module::new(); - - for payload in wasmparser::Parser::new(0).parse_all(&module) { - let payload = payload.unwrap(); - match payload { - _ => { - if let Some((id, range)) = payload.as_section() { - new_module.section(&wasm_encoder::RawSection { - id, - data: &module[range], - }); - } - } - } - } - - for payload in wasmparser::Parser::new(0).parse_all(&component_type) { - let payload = payload.unwrap(); - match payload { - wasmparser::Payload::CustomSection(_) => { - if let Some((id, range)) = payload.as_section() { - new_module.section(&wasm_encoder::RawSection { - id, - data: &component_type[range], - }); - } - } - _ => { - continue; - } - } - } - - let module = new_module.finish(); - - let component = ComponentEncoder::default() - .module(&module) - .expect("pull custom sections from module") - .validate(true) - .adapter("wasi_snapshot_preview1", &wasi_adapter) - .expect("adapter failed to get loaded") - .realloc_via_memory_grow(true) - .encode() - .expect(&format!( - "module {:?} can be translated to a component", - out_wasm - )); - let component_path = out_wasm.with_extension("component.wasm"); - println!("COMPONENT WASM File name: {}", component_path.display()); - fs::write(&component_path, component).expect("write component to disk"); - - result.push(component_path); - } - } - - #[cfg(feature = "csharp")] - if !c_sharp.is_empty() { - let (resolve, world) = resolve_wit_dir(&dir); - for path in c_sharp.iter() { - let world_name = &resolve.worlds[world].name; - - let gen_option: &str = &path - .file_stem() - .and_then(|s| s.to_str()) - .unwrap() - .split('_') - .skip(1) - .collect::>() - .join("-"); - - let test_dir = if gen_option.is_empty() { - out_dir.join(format!("csharp-{}", world_name)) - } else { - out_dir.join(format!("csharp-{}-{}", world_name, gen_option)) - }; - - drop(fs::remove_dir_all(&test_dir)); - fs::create_dir_all(&test_dir).unwrap(); - - fs::copy(&path, &test_dir.join(path.file_name().unwrap())).unwrap(); - - let snake = world_name.replace("-", "_"); - let camel = format!("{}World", snake.to_upper_camel_case()); - - let assembly_name = format!( - "csharp-{}", - path.file_stem().and_then(|s| s.to_str()).unwrap() - ); - - let out_wasm = test_dir.join(&assembly_name); - - let mut files = Default::default(); - let mut opts = wit_bindgen_csharp::Opts::default(); - match gen_option { - "with-wit-results" => opts.with_wit_results = true, - _ => {} - }; - if let Some(path) = path.file_name().and_then(|s| s.to_str()) { - if path.contains("utf16") { - opts.string_encoding = wit_component::StringEncoding::UTF16; - } - } - opts.build().generate(&resolve, world, &mut files).unwrap(); - - for (file, contents) in files.iter() { - let dst = test_dir.join(file); - fs::write(dst, contents).unwrap(); - } - - let mut csproj = - wit_bindgen_csharp::CSProject::new(test_dir.clone(), &assembly_name, world_name); - csproj.aot(); - - // Copy test file to target location to be included in compilation - let file_name = path.file_name().unwrap(); - fs::copy(path, test_dir.join(file_name.to_str().unwrap()))?; - - csproj.generate()?; - - let dotnet_root_env = "DOTNET_ROOT"; - let dotnet_cmd: PathBuf; - match env::var(dotnet_root_env) { - Ok(val) => dotnet_cmd = Path::new(&val).join("dotnet"), - Err(_e) => dotnet_cmd = "dotnet".into(), - } - - let mut cmd = Command::new(dotnet_cmd); - let mut wasm_filename = out_wasm.join(assembly_name); - wasm_filename.set_extension("wasm"); - - cmd.current_dir(&test_dir); - - // add .arg("/bl") to diagnose dotnet build problems - cmd.arg("publish") - .arg(test_dir.join(format!("{camel}.csproj"))) - .arg("-r") - .arg("wasi-wasm") - .arg("-c") - .arg("Debug") - .arg("/p:PlatformTarget=AnyCPU") - .arg("/p:MSBuildEnableWorkloadResolver=false") - .arg("--self-contained") - .arg("/p:UseAppHost=false") - .arg("-o") - .arg(&out_wasm); - let command = format!("{cmd:?}"); - let output = match cmd.output() { - Ok(output) => output, - Err(e) => panic!("failed to spawn compiler: {e}; command was `{command}`"), - }; - - if !output.status.success() { - println!("status: {}", output.status); - println!("stdout: ------------------------------------------"); - println!("{}", String::from_utf8_lossy(&output.stdout)); - println!("stderr: ------------------------------------------"); - println!("{}", String::from_utf8_lossy(&output.stderr)); - panic!("failed to compile"); - } - - result.push(wasm_filename); - } - } - - Ok(result) -} - -#[allow(dead_code)] // not used by all generators -fn resolve_wit_dir(dir: &PathBuf) -> (Resolve, WorldId) { - let mut resolve = Resolve::new(); - let (pkg, _files) = resolve.push_path(dir).unwrap(); - let world = resolve.select_world(pkg, None).unwrap(); - (resolve, world) -} From cae28fde5a111f0714f08d6995512435255c837b Mon Sep 17 00:00:00 2001 From: Alex Crichton Date: Thu, 10 Apr 2025 12:56:52 -0700 Subject: [PATCH 4/4] Rename `runtime-new` to `runtime` --- .github/workflows/main.yml | 2 +- tests/{runtime-new => runtime}/c/rename/runner.c | 0 tests/{runtime-new => runtime}/c/rename/test.c | 0 tests/{runtime-new => runtime}/c/rename/test.wit | 0 tests/{runtime-new => runtime}/demo/runner-component.wat | 0 tests/{runtime-new => runtime}/demo/runner-core.wat | 0 tests/{runtime-new => runtime}/demo/runner-opt.c | 0 tests/{runtime-new => runtime}/demo/runner-opt.rs | 0 tests/{runtime-new => runtime}/demo/runner.c | 0 tests/{runtime-new => runtime}/demo/runner.cpp | 0 tests/{runtime-new => runtime}/demo/runner.cs | 0 tests/{runtime-new => runtime}/demo/runner.rs | 0 tests/{runtime-new => runtime}/demo/runner2.rs | 0 tests/{runtime-new => runtime}/demo/test-component.wat | 0 tests/{runtime-new => runtime}/demo/test-core.wat | 0 tests/{runtime-new => runtime}/demo/test.c | 0 tests/{runtime-new => runtime}/demo/test.cpp | 0 tests/{runtime-new => runtime}/demo/test.cs | 0 tests/{runtime-new => runtime}/demo/test.mbt | 0 tests/{runtime-new => runtime}/demo/test.rs | 0 tests/{runtime-new => runtime}/demo/test.wit | 0 tests/{runtime-new => runtime}/demo/test2.rs | 0 tests/{runtime-new => runtime}/flavorful/runner.c | 0 tests/{runtime-new => runtime}/flavorful/runner.rs | 0 tests/{runtime-new => runtime}/flavorful/test.c | 0 tests/{runtime-new => runtime}/flavorful/test.rs | 0 tests/{runtime-new => runtime}/flavorful/test.wit | 0 tests/{runtime-new => runtime}/gated-features/runner.rs | 0 tests/{runtime-new => runtime}/gated-features/test.rs | 0 tests/{runtime-new => runtime}/gated-features/test.wit | 0 tests/{runtime-new => runtime}/lists-alias/runner.rs | 0 tests/{runtime-new => runtime}/lists-alias/test.rs | 0 tests/{runtime-new => runtime}/lists-alias/test.wit | 0 tests/{runtime-new => runtime}/lists/alloc.rs | 0 tests/{runtime-new => runtime}/lists/runner.c | 0 tests/{runtime-new => runtime}/lists/runner.cs | 0 tests/{runtime-new => runtime}/lists/runner.rs | 0 tests/{runtime-new => runtime}/lists/test.c | 0 tests/{runtime-new => runtime}/lists/test.cs | 0 tests/{runtime-new => runtime}/lists/test.mbt | 0 tests/{runtime-new => runtime}/lists/test.rs | 0 tests/{runtime-new => runtime}/lists/test.wit | 0 tests/{runtime-new => runtime}/many-arguments/runner.c | 0 tests/{runtime-new => runtime}/many-arguments/runner.cs | 0 tests/{runtime-new => runtime}/many-arguments/runner.rs | 0 tests/{runtime-new => runtime}/many-arguments/test.c | 0 tests/{runtime-new => runtime}/many-arguments/test.cs | 0 tests/{runtime-new => runtime}/many-arguments/test.rs | 0 tests/{runtime-new => runtime}/many-arguments/test.wit | 0 tests/{runtime-new => runtime}/numbers/runner.c | 0 tests/{runtime-new => runtime}/numbers/runner.cs | 0 tests/{runtime-new => runtime}/numbers/runner.rs | 0 tests/{runtime-new => runtime}/numbers/test.c | 0 tests/{runtime-new => runtime}/numbers/test.cs | 0 tests/{runtime-new => runtime}/numbers/test.mbt | 0 tests/{runtime-new => runtime}/numbers/test.rs | 0 tests/{runtime-new => runtime}/numbers/test.wit | 0 tests/{runtime-new => runtime}/options/runner.cs | 0 tests/{runtime-new => runtime}/options/runner.rs | 0 tests/{runtime-new => runtime}/options/test.cs | 0 tests/{runtime-new => runtime}/options/test.rs | 0 tests/{runtime-new => runtime}/options/test.wit | 0 tests/{runtime-new => runtime}/package-with-version/runner.rs | 0 tests/{runtime-new => runtime}/package-with-version/test.rs | 0 tests/{runtime-new => runtime}/package-with-version/test.wit | 0 tests/{runtime-new => runtime}/records/runner.c | 0 tests/{runtime-new => runtime}/records/runner.cs | 0 tests/{runtime-new => runtime}/records/runner.rs | 0 tests/{runtime-new => runtime}/records/test.c | 0 tests/{runtime-new => runtime}/records/test.cs | 0 tests/{runtime-new => runtime}/records/test.rs | 0 tests/{runtime-new => runtime}/records/test.wit | 0 tests/{runtime-new => runtime}/resource-borrow/runner.c | 0 tests/{runtime-new => runtime}/resource-borrow/runner.cs | 0 tests/{runtime-new => runtime}/resource-borrow/runner.rs | 0 tests/{runtime-new => runtime}/resource-borrow/test.c | 0 tests/{runtime-new => runtime}/resource-borrow/test.cs | 0 tests/{runtime-new => runtime}/resource-borrow/test.rs | 0 tests/{runtime-new => runtime}/resource-borrow/test.wit | 0 .../resource-import-and-export/compose.wac | 0 .../resource-import-and-export/intermediate.c | 0 .../resource-import-and-export/intermediate.cs | 0 .../resource-import-and-export/intermediate.rs | 0 .../resource-import-and-export/leaf-thing.rs | 0 .../resource-import-and-export/leaf-toplevel.rs | 0 .../resource-import-and-export/runner.rs | 0 .../resource-import-and-export/test.wit | 0 tests/{runtime-new => runtime}/resource_aggregates/runner.cs | 0 tests/{runtime-new => runtime}/resource_aggregates/runner.rs | 0 tests/{runtime-new => runtime}/resource_aggregates/test.cs | 0 tests/{runtime-new => runtime}/resource_aggregates/test.rs | 0 tests/{runtime-new => runtime}/resource_aggregates/test.wit | 0 tests/{runtime-new => runtime}/resource_alias/runner.rs | 0 tests/{runtime-new => runtime}/resource_alias/test.cs | 0 tests/{runtime-new => runtime}/resource_alias/test.rs | 0 tests/{runtime-new => runtime}/resource_alias/test.wit | 0 .../resource_alias_redux/_test_disabled.cs | 0 tests/{runtime-new => runtime}/resource_alias_redux/runner.cs | 0 tests/{runtime-new => runtime}/resource_alias_redux/runner.rs | 0 tests/{runtime-new => runtime}/resource_alias_redux/test.rs | 0 tests/{runtime-new => runtime}/resource_alias_redux/test.wit | 0 .../resource_borrow_in_record/runner.cs | 0 .../resource_borrow_in_record/runner.rs | 0 .../{runtime-new => runtime}/resource_borrow_in_record/test.cs | 0 .../{runtime-new => runtime}/resource_borrow_in_record/test.rs | 0 .../{runtime-new => runtime}/resource_borrow_in_record/test.wit | 0 .../{runtime-new => runtime}/resource_borrow_in_record/wasm.rs | 0 tests/{runtime-new => runtime}/resource_floats/compose.wac | 0 tests/{runtime-new => runtime}/resource_floats/intermediate.cs | 0 tests/{runtime-new => runtime}/resource_floats/intermediate.rs | 0 tests/{runtime-new => runtime}/resource_floats/leaf.rs | 0 tests/{runtime-new => runtime}/resource_floats/runner.rs | 0 tests/{runtime-new => runtime}/resource_floats/test.wit | 0 tests/{runtime-new => runtime}/resource_with_lists/compose.wac | 0 tests/{runtime-new => runtime}/resource_with_lists/leaf.rs | 0 .../resource_with_lists/resource-with-lists.cs | 0 .../resource_with_lists/resource-with-lists.rs | 0 tests/{runtime-new => runtime}/resource_with_lists/runner.rs | 0 tests/{runtime-new => runtime}/resource_with_lists/test.wit | 0 tests/{runtime-new => runtime}/resources/compose.wac | 0 tests/{runtime-new => runtime}/resources/leaf.rs | 0 tests/{runtime-new => runtime}/resources/resources.c | 0 tests/{runtime-new => runtime}/resources/resources.cs | 0 tests/{runtime-new => runtime}/resources/resources.rs | 0 tests/{runtime-new => runtime}/resources/runner.rs | 0 tests/{runtime-new => runtime}/resources/test.wit | 0 tests/{runtime-new => runtime}/results/compose.wac | 0 tests/{runtime-new => runtime}/results/intermediate.cs | 0 tests/{runtime-new => runtime}/results/intermediate.rs | 0 .../results/intermediate_with_wit_results.cs | 0 tests/{runtime-new => runtime}/results/leaf.rs | 0 tests/{runtime-new => runtime}/results/runner.rs | 0 tests/{runtime-new => runtime}/results/test.wit | 0 .../rust/alternative-bitflags/runner.rs | 0 .../{runtime-new => runtime}/rust/alternative-bitflags/test.rs | 0 .../{runtime-new => runtime}/rust/alternative-bitflags/test.wit | 0 tests/{runtime-new => runtime}/rust/custom-derives/runner.rs | 0 tests/{runtime-new => runtime}/rust/custom-derives/test.rs | 0 tests/{runtime-new => runtime}/rust/custom-derives/test.wit | 0 .../rust/disable-custom-section-link-helpers/runner.rs | 0 .../rust/disable-custom-section-link-helpers/test.rs | 0 .../rust/disable-custom-section-link-helpers/test.wit | 0 .../{runtime-new => runtime}/rust/other-dependencies/other.wit | 0 .../{runtime-new => runtime}/rust/other-dependencies/runner.rs | 0 tests/{runtime-new => runtime}/rust/other-dependencies/test.rs | 0 tests/{runtime-new => runtime}/rust/other-dependencies/test.wit | 0 .../rust/owned-resource-deref-mut/runner.rs | 0 .../rust/owned-resource-deref-mut/test.rs | 0 .../rust/owned-resource-deref-mut/test.wit | 0 .../rust/ownership/runner-borrowing-duplicate-if-necessary.rs | 0 .../{runtime-new => runtime}/rust/ownership/runner-borrowing.rs | 0 tests/{runtime-new => runtime}/rust/ownership/runner-owning.rs | 0 tests/{runtime-new => runtime}/rust/ownership/test.rs | 0 tests/{runtime-new => runtime}/rust/ownership/test.wit | 0 tests/{runtime-new => runtime}/rust/raw-strings/runner-nostd.rs | 0 tests/{runtime-new => runtime}/rust/raw-strings/runner-std.rs | 0 tests/{runtime-new => runtime}/rust/raw-strings/test.rs | 0 tests/{runtime-new => runtime}/rust/raw-strings/test.wit | 0 .../{runtime-new => runtime}/rust/resource_into_inner/runner.rs | 0 tests/{runtime-new => runtime}/rust/resource_into_inner/test.cs | 0 tests/{runtime-new => runtime}/rust/resource_into_inner/test.rs | 0 .../{runtime-new => runtime}/rust/resource_into_inner/test.wit | 0 .../rust/run-ctors-once-workaround/runner.rs | 0 .../rust/run-ctors-once-workaround/test.rs | 0 .../rust/run-ctors-once-workaround/test.wit | 0 tests/{runtime-new => runtime}/rust/skip/runner.rs | 0 tests/{runtime-new => runtime}/rust/skip/test-nostd.rs | 0 tests/{runtime-new => runtime}/rust/skip/test-std.rs | 0 tests/{runtime-new => runtime}/rust/skip/test.wit | 0 .../{runtime-new => runtime}/rust/type_section_suffix/runner.rs | 0 tests/{runtime-new => runtime}/rust/type_section_suffix/test.rs | 0 .../{runtime-new => runtime}/rust/type_section_suffix/test.wit | 0 .../{runtime-new => runtime}/rust/with-and-resources/runner.rs | 0 tests/{runtime-new => runtime}/rust/with-and-resources/test.rs | 0 tests/{runtime-new => runtime}/rust/with-and-resources/test.wit | 0 .../rust/with-option-generate/runner-generate-all.rs | 0 .../rust/with-option-generate/runner-generate-one.rs | 0 .../{runtime-new => runtime}/rust/with-option-generate/test.rs | 0 .../{runtime-new => runtime}/rust/with-option-generate/test.wit | 0 tests/{runtime-new => runtime}/rust/with-types/runner.rs | 0 tests/{runtime-new => runtime}/rust/with-types/test.rs | 0 tests/{runtime-new => runtime}/rust/with-types/test.wit | 0 tests/{runtime-new => runtime}/rust/with/runner.rs | 0 tests/{runtime-new => runtime}/rust/with/test.rs | 0 tests/{runtime-new => runtime}/rust/with/test.wit | 0 tests/{runtime-new => runtime}/rust/xcrate/compose.wac | 0 tests/{runtime-new => runtime}/rust/xcrate/intermediate.rs | 0 tests/{runtime-new => runtime}/rust/xcrate/leaf.rs | 0 tests/{runtime-new => runtime}/rust/xcrate/runner.rs | 0 tests/{runtime-new => runtime}/rust/xcrate/rust_xcrate_test.rs | 0 tests/{runtime-new => runtime}/rust/xcrate/test.wit | 0 tests/{runtime-new => runtime}/strings-alias/runner.rs | 0 tests/{runtime-new => runtime}/strings-alias/test.rs | 0 tests/{runtime-new => runtime}/strings-alias/test.wit | 0 tests/{runtime-new => runtime}/strings-simple/runner-nostd.rs | 0 tests/{runtime-new => runtime}/strings-simple/runner-std.rs | 0 tests/{runtime-new => runtime}/strings-simple/test.rs | 0 tests/{runtime-new => runtime}/strings-simple/test.wit | 0 tests/{runtime-new => runtime}/strings/runner.c | 0 tests/{runtime-new => runtime}/strings/runner.cs | 0 tests/{runtime-new => runtime}/strings/runner.rs | 0 tests/{runtime-new => runtime}/strings/test.c | 0 tests/{runtime-new => runtime}/strings/test.cs | 0 tests/{runtime-new => runtime}/strings/test.mbt | 0 tests/{runtime-new => runtime}/strings/test.rs | 0 tests/{runtime-new => runtime}/strings/test.wit | 0 tests/{runtime-new => runtime}/symbol-conflicts/runner.rs | 0 tests/{runtime-new => runtime}/symbol-conflicts/test.rs | 0 tests/{runtime-new => runtime}/symbol-conflicts/test.wit | 0 tests/{runtime-new => runtime}/unused-types/runner.rs | 0 tests/{runtime-new => runtime}/unused-types/test.rs | 0 tests/{runtime-new => runtime}/unused-types/test.wit | 0 tests/{runtime-new => runtime}/variants/runner.c | 0 tests/{runtime-new => runtime}/variants/runner.cs | 0 tests/{runtime-new => runtime}/variants/runner.rs | 0 tests/{runtime-new => runtime}/variants/test.c | 0 tests/{runtime-new => runtime}/variants/test.cs | 0 tests/{runtime-new => runtime}/variants/test.mbt | 0 tests/{runtime-new => runtime}/variants/test.rs | 0 tests/{runtime-new => runtime}/variants/test.wit | 0 tests/{runtime-new => runtime}/versions/deps/v1/v1.wit | 0 tests/{runtime-new => runtime}/versions/deps/v2/v2.wit | 0 tests/{runtime-new => runtime}/versions/runner.cs | 0 tests/{runtime-new => runtime}/versions/runner.rs | 0 tests/{runtime-new => runtime}/versions/test.cs | 0 tests/{runtime-new => runtime}/versions/test.rs | 0 tests/{runtime-new => runtime}/versions/test.wit | 0 227 files changed, 1 insertion(+), 1 deletion(-) rename tests/{runtime-new => runtime}/c/rename/runner.c (100%) rename tests/{runtime-new => runtime}/c/rename/test.c (100%) rename tests/{runtime-new => runtime}/c/rename/test.wit (100%) rename tests/{runtime-new => runtime}/demo/runner-component.wat (100%) rename tests/{runtime-new => runtime}/demo/runner-core.wat (100%) rename tests/{runtime-new => runtime}/demo/runner-opt.c (100%) rename tests/{runtime-new => runtime}/demo/runner-opt.rs (100%) rename tests/{runtime-new => runtime}/demo/runner.c (100%) rename tests/{runtime-new => runtime}/demo/runner.cpp (100%) rename tests/{runtime-new => runtime}/demo/runner.cs (100%) rename tests/{runtime-new => runtime}/demo/runner.rs (100%) rename tests/{runtime-new => runtime}/demo/runner2.rs (100%) rename tests/{runtime-new => runtime}/demo/test-component.wat (100%) rename tests/{runtime-new => runtime}/demo/test-core.wat (100%) rename tests/{runtime-new => runtime}/demo/test.c (100%) rename tests/{runtime-new => runtime}/demo/test.cpp (100%) rename tests/{runtime-new => runtime}/demo/test.cs (100%) rename tests/{runtime-new => runtime}/demo/test.mbt (100%) rename tests/{runtime-new => runtime}/demo/test.rs (100%) rename tests/{runtime-new => runtime}/demo/test.wit (100%) rename tests/{runtime-new => runtime}/demo/test2.rs (100%) rename tests/{runtime-new => runtime}/flavorful/runner.c (100%) rename tests/{runtime-new => runtime}/flavorful/runner.rs (100%) rename tests/{runtime-new => runtime}/flavorful/test.c (100%) rename tests/{runtime-new => runtime}/flavorful/test.rs (100%) rename tests/{runtime-new => runtime}/flavorful/test.wit (100%) rename tests/{runtime-new => runtime}/gated-features/runner.rs (100%) rename tests/{runtime-new => runtime}/gated-features/test.rs (100%) rename tests/{runtime-new => runtime}/gated-features/test.wit (100%) rename tests/{runtime-new => runtime}/lists-alias/runner.rs (100%) rename tests/{runtime-new => runtime}/lists-alias/test.rs (100%) rename tests/{runtime-new => runtime}/lists-alias/test.wit (100%) rename tests/{runtime-new => runtime}/lists/alloc.rs (100%) rename tests/{runtime-new => runtime}/lists/runner.c (100%) rename tests/{runtime-new => runtime}/lists/runner.cs (100%) rename tests/{runtime-new => runtime}/lists/runner.rs (100%) rename tests/{runtime-new => runtime}/lists/test.c (100%) rename tests/{runtime-new => runtime}/lists/test.cs (100%) rename tests/{runtime-new => runtime}/lists/test.mbt (100%) rename tests/{runtime-new => runtime}/lists/test.rs (100%) rename tests/{runtime-new => runtime}/lists/test.wit (100%) rename tests/{runtime-new => runtime}/many-arguments/runner.c (100%) rename tests/{runtime-new => runtime}/many-arguments/runner.cs (100%) rename tests/{runtime-new => runtime}/many-arguments/runner.rs (100%) rename tests/{runtime-new => runtime}/many-arguments/test.c (100%) rename tests/{runtime-new => runtime}/many-arguments/test.cs (100%) rename tests/{runtime-new => runtime}/many-arguments/test.rs (100%) rename tests/{runtime-new => runtime}/many-arguments/test.wit (100%) rename tests/{runtime-new => runtime}/numbers/runner.c (100%) rename tests/{runtime-new => runtime}/numbers/runner.cs (100%) rename tests/{runtime-new => runtime}/numbers/runner.rs (100%) rename tests/{runtime-new => runtime}/numbers/test.c (100%) rename tests/{runtime-new => runtime}/numbers/test.cs (100%) rename tests/{runtime-new => runtime}/numbers/test.mbt (100%) rename tests/{runtime-new => runtime}/numbers/test.rs (100%) rename tests/{runtime-new => runtime}/numbers/test.wit (100%) rename tests/{runtime-new => runtime}/options/runner.cs (100%) rename tests/{runtime-new => runtime}/options/runner.rs (100%) rename tests/{runtime-new => runtime}/options/test.cs (100%) rename tests/{runtime-new => runtime}/options/test.rs (100%) rename tests/{runtime-new => runtime}/options/test.wit (100%) rename tests/{runtime-new => runtime}/package-with-version/runner.rs (100%) rename tests/{runtime-new => runtime}/package-with-version/test.rs (100%) rename tests/{runtime-new => runtime}/package-with-version/test.wit (100%) rename tests/{runtime-new => runtime}/records/runner.c (100%) rename tests/{runtime-new => runtime}/records/runner.cs (100%) rename tests/{runtime-new => runtime}/records/runner.rs (100%) rename tests/{runtime-new => runtime}/records/test.c (100%) rename tests/{runtime-new => runtime}/records/test.cs (100%) rename tests/{runtime-new => runtime}/records/test.rs (100%) rename tests/{runtime-new => runtime}/records/test.wit (100%) rename tests/{runtime-new => runtime}/resource-borrow/runner.c (100%) rename tests/{runtime-new => runtime}/resource-borrow/runner.cs (100%) rename tests/{runtime-new => runtime}/resource-borrow/runner.rs (100%) rename tests/{runtime-new => runtime}/resource-borrow/test.c (100%) rename tests/{runtime-new => runtime}/resource-borrow/test.cs (100%) rename tests/{runtime-new => runtime}/resource-borrow/test.rs (100%) rename tests/{runtime-new => runtime}/resource-borrow/test.wit (100%) rename tests/{runtime-new => runtime}/resource-import-and-export/compose.wac (100%) rename tests/{runtime-new => runtime}/resource-import-and-export/intermediate.c (100%) rename tests/{runtime-new => runtime}/resource-import-and-export/intermediate.cs (100%) rename tests/{runtime-new => runtime}/resource-import-and-export/intermediate.rs (100%) rename tests/{runtime-new => runtime}/resource-import-and-export/leaf-thing.rs (100%) rename tests/{runtime-new => runtime}/resource-import-and-export/leaf-toplevel.rs (100%) rename tests/{runtime-new => runtime}/resource-import-and-export/runner.rs (100%) rename tests/{runtime-new => runtime}/resource-import-and-export/test.wit (100%) rename tests/{runtime-new => runtime}/resource_aggregates/runner.cs (100%) rename tests/{runtime-new => runtime}/resource_aggregates/runner.rs (100%) rename tests/{runtime-new => runtime}/resource_aggregates/test.cs (100%) rename tests/{runtime-new => runtime}/resource_aggregates/test.rs (100%) rename tests/{runtime-new => runtime}/resource_aggregates/test.wit (100%) rename tests/{runtime-new => runtime}/resource_alias/runner.rs (100%) rename tests/{runtime-new => runtime}/resource_alias/test.cs (100%) rename tests/{runtime-new => runtime}/resource_alias/test.rs (100%) rename tests/{runtime-new => runtime}/resource_alias/test.wit (100%) rename tests/{runtime-new => runtime}/resource_alias_redux/_test_disabled.cs (100%) rename tests/{runtime-new => runtime}/resource_alias_redux/runner.cs (100%) rename tests/{runtime-new => runtime}/resource_alias_redux/runner.rs (100%) rename tests/{runtime-new => runtime}/resource_alias_redux/test.rs (100%) rename tests/{runtime-new => runtime}/resource_alias_redux/test.wit (100%) rename tests/{runtime-new => runtime}/resource_borrow_in_record/runner.cs (100%) rename tests/{runtime-new => runtime}/resource_borrow_in_record/runner.rs (100%) rename tests/{runtime-new => runtime}/resource_borrow_in_record/test.cs (100%) rename tests/{runtime-new => runtime}/resource_borrow_in_record/test.rs (100%) rename tests/{runtime-new => runtime}/resource_borrow_in_record/test.wit (100%) rename tests/{runtime-new => runtime}/resource_borrow_in_record/wasm.rs (100%) rename tests/{runtime-new => runtime}/resource_floats/compose.wac (100%) rename tests/{runtime-new => runtime}/resource_floats/intermediate.cs (100%) rename tests/{runtime-new => runtime}/resource_floats/intermediate.rs (100%) rename tests/{runtime-new => runtime}/resource_floats/leaf.rs (100%) rename tests/{runtime-new => runtime}/resource_floats/runner.rs (100%) rename tests/{runtime-new => runtime}/resource_floats/test.wit (100%) rename tests/{runtime-new => runtime}/resource_with_lists/compose.wac (100%) rename tests/{runtime-new => runtime}/resource_with_lists/leaf.rs (100%) rename tests/{runtime-new => runtime}/resource_with_lists/resource-with-lists.cs (100%) rename tests/{runtime-new => runtime}/resource_with_lists/resource-with-lists.rs (100%) rename tests/{runtime-new => runtime}/resource_with_lists/runner.rs (100%) rename tests/{runtime-new => runtime}/resource_with_lists/test.wit (100%) rename tests/{runtime-new => runtime}/resources/compose.wac (100%) rename tests/{runtime-new => runtime}/resources/leaf.rs (100%) rename tests/{runtime-new => runtime}/resources/resources.c (100%) rename tests/{runtime-new => runtime}/resources/resources.cs (100%) rename tests/{runtime-new => runtime}/resources/resources.rs (100%) rename tests/{runtime-new => runtime}/resources/runner.rs (100%) rename tests/{runtime-new => runtime}/resources/test.wit (100%) rename tests/{runtime-new => runtime}/results/compose.wac (100%) rename tests/{runtime-new => runtime}/results/intermediate.cs (100%) rename tests/{runtime-new => runtime}/results/intermediate.rs (100%) rename tests/{runtime-new => runtime}/results/intermediate_with_wit_results.cs (100%) rename tests/{runtime-new => runtime}/results/leaf.rs (100%) rename tests/{runtime-new => runtime}/results/runner.rs (100%) rename tests/{runtime-new => runtime}/results/test.wit (100%) rename tests/{runtime-new => runtime}/rust/alternative-bitflags/runner.rs (100%) rename tests/{runtime-new => runtime}/rust/alternative-bitflags/test.rs (100%) rename tests/{runtime-new => runtime}/rust/alternative-bitflags/test.wit (100%) rename tests/{runtime-new => runtime}/rust/custom-derives/runner.rs (100%) rename tests/{runtime-new => runtime}/rust/custom-derives/test.rs (100%) rename tests/{runtime-new => runtime}/rust/custom-derives/test.wit (100%) rename tests/{runtime-new => runtime}/rust/disable-custom-section-link-helpers/runner.rs (100%) rename tests/{runtime-new => runtime}/rust/disable-custom-section-link-helpers/test.rs (100%) rename tests/{runtime-new => runtime}/rust/disable-custom-section-link-helpers/test.wit (100%) rename tests/{runtime-new => runtime}/rust/other-dependencies/other.wit (100%) rename tests/{runtime-new => runtime}/rust/other-dependencies/runner.rs (100%) rename tests/{runtime-new => runtime}/rust/other-dependencies/test.rs (100%) rename tests/{runtime-new => runtime}/rust/other-dependencies/test.wit (100%) rename tests/{runtime-new => runtime}/rust/owned-resource-deref-mut/runner.rs (100%) rename tests/{runtime-new => runtime}/rust/owned-resource-deref-mut/test.rs (100%) rename tests/{runtime-new => runtime}/rust/owned-resource-deref-mut/test.wit (100%) rename tests/{runtime-new => runtime}/rust/ownership/runner-borrowing-duplicate-if-necessary.rs (100%) rename tests/{runtime-new => runtime}/rust/ownership/runner-borrowing.rs (100%) rename tests/{runtime-new => runtime}/rust/ownership/runner-owning.rs (100%) rename tests/{runtime-new => runtime}/rust/ownership/test.rs (100%) rename tests/{runtime-new => runtime}/rust/ownership/test.wit (100%) rename tests/{runtime-new => runtime}/rust/raw-strings/runner-nostd.rs (100%) rename tests/{runtime-new => runtime}/rust/raw-strings/runner-std.rs (100%) rename tests/{runtime-new => runtime}/rust/raw-strings/test.rs (100%) rename tests/{runtime-new => runtime}/rust/raw-strings/test.wit (100%) rename tests/{runtime-new => runtime}/rust/resource_into_inner/runner.rs (100%) rename tests/{runtime-new => runtime}/rust/resource_into_inner/test.cs (100%) rename tests/{runtime-new => runtime}/rust/resource_into_inner/test.rs (100%) rename tests/{runtime-new => runtime}/rust/resource_into_inner/test.wit (100%) rename tests/{runtime-new => runtime}/rust/run-ctors-once-workaround/runner.rs (100%) rename tests/{runtime-new => runtime}/rust/run-ctors-once-workaround/test.rs (100%) rename tests/{runtime-new => runtime}/rust/run-ctors-once-workaround/test.wit (100%) rename tests/{runtime-new => runtime}/rust/skip/runner.rs (100%) rename tests/{runtime-new => runtime}/rust/skip/test-nostd.rs (100%) rename tests/{runtime-new => runtime}/rust/skip/test-std.rs (100%) rename tests/{runtime-new => runtime}/rust/skip/test.wit (100%) rename tests/{runtime-new => runtime}/rust/type_section_suffix/runner.rs (100%) rename tests/{runtime-new => runtime}/rust/type_section_suffix/test.rs (100%) rename tests/{runtime-new => runtime}/rust/type_section_suffix/test.wit (100%) rename tests/{runtime-new => runtime}/rust/with-and-resources/runner.rs (100%) rename tests/{runtime-new => runtime}/rust/with-and-resources/test.rs (100%) rename tests/{runtime-new => runtime}/rust/with-and-resources/test.wit (100%) rename tests/{runtime-new => runtime}/rust/with-option-generate/runner-generate-all.rs (100%) rename tests/{runtime-new => runtime}/rust/with-option-generate/runner-generate-one.rs (100%) rename tests/{runtime-new => runtime}/rust/with-option-generate/test.rs (100%) rename tests/{runtime-new => runtime}/rust/with-option-generate/test.wit (100%) rename tests/{runtime-new => runtime}/rust/with-types/runner.rs (100%) rename tests/{runtime-new => runtime}/rust/with-types/test.rs (100%) rename tests/{runtime-new => runtime}/rust/with-types/test.wit (100%) rename tests/{runtime-new => runtime}/rust/with/runner.rs (100%) rename tests/{runtime-new => runtime}/rust/with/test.rs (100%) rename tests/{runtime-new => runtime}/rust/with/test.wit (100%) rename tests/{runtime-new => runtime}/rust/xcrate/compose.wac (100%) rename tests/{runtime-new => runtime}/rust/xcrate/intermediate.rs (100%) rename tests/{runtime-new => runtime}/rust/xcrate/leaf.rs (100%) rename tests/{runtime-new => runtime}/rust/xcrate/runner.rs (100%) rename tests/{runtime-new => runtime}/rust/xcrate/rust_xcrate_test.rs (100%) rename tests/{runtime-new => runtime}/rust/xcrate/test.wit (100%) rename tests/{runtime-new => runtime}/strings-alias/runner.rs (100%) rename tests/{runtime-new => runtime}/strings-alias/test.rs (100%) rename tests/{runtime-new => runtime}/strings-alias/test.wit (100%) rename tests/{runtime-new => runtime}/strings-simple/runner-nostd.rs (100%) rename tests/{runtime-new => runtime}/strings-simple/runner-std.rs (100%) rename tests/{runtime-new => runtime}/strings-simple/test.rs (100%) rename tests/{runtime-new => runtime}/strings-simple/test.wit (100%) rename tests/{runtime-new => runtime}/strings/runner.c (100%) rename tests/{runtime-new => runtime}/strings/runner.cs (100%) rename tests/{runtime-new => runtime}/strings/runner.rs (100%) rename tests/{runtime-new => runtime}/strings/test.c (100%) rename tests/{runtime-new => runtime}/strings/test.cs (100%) rename tests/{runtime-new => runtime}/strings/test.mbt (100%) rename tests/{runtime-new => runtime}/strings/test.rs (100%) rename tests/{runtime-new => runtime}/strings/test.wit (100%) rename tests/{runtime-new => runtime}/symbol-conflicts/runner.rs (100%) rename tests/{runtime-new => runtime}/symbol-conflicts/test.rs (100%) rename tests/{runtime-new => runtime}/symbol-conflicts/test.wit (100%) rename tests/{runtime-new => runtime}/unused-types/runner.rs (100%) rename tests/{runtime-new => runtime}/unused-types/test.rs (100%) rename tests/{runtime-new => runtime}/unused-types/test.wit (100%) rename tests/{runtime-new => runtime}/variants/runner.c (100%) rename tests/{runtime-new => runtime}/variants/runner.cs (100%) rename tests/{runtime-new => runtime}/variants/runner.rs (100%) rename tests/{runtime-new => runtime}/variants/test.c (100%) rename tests/{runtime-new => runtime}/variants/test.cs (100%) rename tests/{runtime-new => runtime}/variants/test.mbt (100%) rename tests/{runtime-new => runtime}/variants/test.rs (100%) rename tests/{runtime-new => runtime}/variants/test.wit (100%) rename tests/{runtime-new => runtime}/versions/deps/v1/v1.wit (100%) rename tests/{runtime-new => runtime}/versions/deps/v2/v2.wit (100%) rename tests/{runtime-new => runtime}/versions/runner.cs (100%) rename tests/{runtime-new => runtime}/versions/runner.rs (100%) rename tests/{runtime-new => runtime}/versions/test.cs (100%) rename tests/{runtime-new => runtime}/versions/test.rs (100%) rename tests/{runtime-new => runtime}/versions/test.wit (100%) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 8c89e61cf..50d2fe730 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -107,7 +107,7 @@ jobs: # Run all runtime tests for this language, and also enable Rust in case this # language only implements either the runner or test component - run: | - cargo run test --languages rust,${{ matrix.lang }} tests/runtime-new \ + cargo run test --languages rust,${{ matrix.lang }} tests/runtime \ --artifacts target/artifacts \ --rust-wit-bindgen-path ./crates/guest-rust diff --git a/tests/runtime-new/c/rename/runner.c b/tests/runtime/c/rename/runner.c similarity index 100% rename from tests/runtime-new/c/rename/runner.c rename to tests/runtime/c/rename/runner.c diff --git a/tests/runtime-new/c/rename/test.c b/tests/runtime/c/rename/test.c similarity index 100% rename from tests/runtime-new/c/rename/test.c rename to tests/runtime/c/rename/test.c diff --git a/tests/runtime-new/c/rename/test.wit b/tests/runtime/c/rename/test.wit similarity index 100% rename from tests/runtime-new/c/rename/test.wit rename to tests/runtime/c/rename/test.wit diff --git a/tests/runtime-new/demo/runner-component.wat b/tests/runtime/demo/runner-component.wat similarity index 100% rename from tests/runtime-new/demo/runner-component.wat rename to tests/runtime/demo/runner-component.wat diff --git a/tests/runtime-new/demo/runner-core.wat b/tests/runtime/demo/runner-core.wat similarity index 100% rename from tests/runtime-new/demo/runner-core.wat rename to tests/runtime/demo/runner-core.wat diff --git a/tests/runtime-new/demo/runner-opt.c b/tests/runtime/demo/runner-opt.c similarity index 100% rename from tests/runtime-new/demo/runner-opt.c rename to tests/runtime/demo/runner-opt.c diff --git a/tests/runtime-new/demo/runner-opt.rs b/tests/runtime/demo/runner-opt.rs similarity index 100% rename from tests/runtime-new/demo/runner-opt.rs rename to tests/runtime/demo/runner-opt.rs diff --git a/tests/runtime-new/demo/runner.c b/tests/runtime/demo/runner.c similarity index 100% rename from tests/runtime-new/demo/runner.c rename to tests/runtime/demo/runner.c diff --git a/tests/runtime-new/demo/runner.cpp b/tests/runtime/demo/runner.cpp similarity index 100% rename from tests/runtime-new/demo/runner.cpp rename to tests/runtime/demo/runner.cpp diff --git a/tests/runtime-new/demo/runner.cs b/tests/runtime/demo/runner.cs similarity index 100% rename from tests/runtime-new/demo/runner.cs rename to tests/runtime/demo/runner.cs diff --git a/tests/runtime-new/demo/runner.rs b/tests/runtime/demo/runner.rs similarity index 100% rename from tests/runtime-new/demo/runner.rs rename to tests/runtime/demo/runner.rs diff --git a/tests/runtime-new/demo/runner2.rs b/tests/runtime/demo/runner2.rs similarity index 100% rename from tests/runtime-new/demo/runner2.rs rename to tests/runtime/demo/runner2.rs diff --git a/tests/runtime-new/demo/test-component.wat b/tests/runtime/demo/test-component.wat similarity index 100% rename from tests/runtime-new/demo/test-component.wat rename to tests/runtime/demo/test-component.wat diff --git a/tests/runtime-new/demo/test-core.wat b/tests/runtime/demo/test-core.wat similarity index 100% rename from tests/runtime-new/demo/test-core.wat rename to tests/runtime/demo/test-core.wat diff --git a/tests/runtime-new/demo/test.c b/tests/runtime/demo/test.c similarity index 100% rename from tests/runtime-new/demo/test.c rename to tests/runtime/demo/test.c diff --git a/tests/runtime-new/demo/test.cpp b/tests/runtime/demo/test.cpp similarity index 100% rename from tests/runtime-new/demo/test.cpp rename to tests/runtime/demo/test.cpp diff --git a/tests/runtime-new/demo/test.cs b/tests/runtime/demo/test.cs similarity index 100% rename from tests/runtime-new/demo/test.cs rename to tests/runtime/demo/test.cs diff --git a/tests/runtime-new/demo/test.mbt b/tests/runtime/demo/test.mbt similarity index 100% rename from tests/runtime-new/demo/test.mbt rename to tests/runtime/demo/test.mbt diff --git a/tests/runtime-new/demo/test.rs b/tests/runtime/demo/test.rs similarity index 100% rename from tests/runtime-new/demo/test.rs rename to tests/runtime/demo/test.rs diff --git a/tests/runtime-new/demo/test.wit b/tests/runtime/demo/test.wit similarity index 100% rename from tests/runtime-new/demo/test.wit rename to tests/runtime/demo/test.wit diff --git a/tests/runtime-new/demo/test2.rs b/tests/runtime/demo/test2.rs similarity index 100% rename from tests/runtime-new/demo/test2.rs rename to tests/runtime/demo/test2.rs diff --git a/tests/runtime-new/flavorful/runner.c b/tests/runtime/flavorful/runner.c similarity index 100% rename from tests/runtime-new/flavorful/runner.c rename to tests/runtime/flavorful/runner.c diff --git a/tests/runtime-new/flavorful/runner.rs b/tests/runtime/flavorful/runner.rs similarity index 100% rename from tests/runtime-new/flavorful/runner.rs rename to tests/runtime/flavorful/runner.rs diff --git a/tests/runtime-new/flavorful/test.c b/tests/runtime/flavorful/test.c similarity index 100% rename from tests/runtime-new/flavorful/test.c rename to tests/runtime/flavorful/test.c diff --git a/tests/runtime-new/flavorful/test.rs b/tests/runtime/flavorful/test.rs similarity index 100% rename from tests/runtime-new/flavorful/test.rs rename to tests/runtime/flavorful/test.rs diff --git a/tests/runtime-new/flavorful/test.wit b/tests/runtime/flavorful/test.wit similarity index 100% rename from tests/runtime-new/flavorful/test.wit rename to tests/runtime/flavorful/test.wit diff --git a/tests/runtime-new/gated-features/runner.rs b/tests/runtime/gated-features/runner.rs similarity index 100% rename from tests/runtime-new/gated-features/runner.rs rename to tests/runtime/gated-features/runner.rs diff --git a/tests/runtime-new/gated-features/test.rs b/tests/runtime/gated-features/test.rs similarity index 100% rename from tests/runtime-new/gated-features/test.rs rename to tests/runtime/gated-features/test.rs diff --git a/tests/runtime-new/gated-features/test.wit b/tests/runtime/gated-features/test.wit similarity index 100% rename from tests/runtime-new/gated-features/test.wit rename to tests/runtime/gated-features/test.wit diff --git a/tests/runtime-new/lists-alias/runner.rs b/tests/runtime/lists-alias/runner.rs similarity index 100% rename from tests/runtime-new/lists-alias/runner.rs rename to tests/runtime/lists-alias/runner.rs diff --git a/tests/runtime-new/lists-alias/test.rs b/tests/runtime/lists-alias/test.rs similarity index 100% rename from tests/runtime-new/lists-alias/test.rs rename to tests/runtime/lists-alias/test.rs diff --git a/tests/runtime-new/lists-alias/test.wit b/tests/runtime/lists-alias/test.wit similarity index 100% rename from tests/runtime-new/lists-alias/test.wit rename to tests/runtime/lists-alias/test.wit diff --git a/tests/runtime-new/lists/alloc.rs b/tests/runtime/lists/alloc.rs similarity index 100% rename from tests/runtime-new/lists/alloc.rs rename to tests/runtime/lists/alloc.rs diff --git a/tests/runtime-new/lists/runner.c b/tests/runtime/lists/runner.c similarity index 100% rename from tests/runtime-new/lists/runner.c rename to tests/runtime/lists/runner.c diff --git a/tests/runtime-new/lists/runner.cs b/tests/runtime/lists/runner.cs similarity index 100% rename from tests/runtime-new/lists/runner.cs rename to tests/runtime/lists/runner.cs diff --git a/tests/runtime-new/lists/runner.rs b/tests/runtime/lists/runner.rs similarity index 100% rename from tests/runtime-new/lists/runner.rs rename to tests/runtime/lists/runner.rs diff --git a/tests/runtime-new/lists/test.c b/tests/runtime/lists/test.c similarity index 100% rename from tests/runtime-new/lists/test.c rename to tests/runtime/lists/test.c diff --git a/tests/runtime-new/lists/test.cs b/tests/runtime/lists/test.cs similarity index 100% rename from tests/runtime-new/lists/test.cs rename to tests/runtime/lists/test.cs diff --git a/tests/runtime-new/lists/test.mbt b/tests/runtime/lists/test.mbt similarity index 100% rename from tests/runtime-new/lists/test.mbt rename to tests/runtime/lists/test.mbt diff --git a/tests/runtime-new/lists/test.rs b/tests/runtime/lists/test.rs similarity index 100% rename from tests/runtime-new/lists/test.rs rename to tests/runtime/lists/test.rs diff --git a/tests/runtime-new/lists/test.wit b/tests/runtime/lists/test.wit similarity index 100% rename from tests/runtime-new/lists/test.wit rename to tests/runtime/lists/test.wit diff --git a/tests/runtime-new/many-arguments/runner.c b/tests/runtime/many-arguments/runner.c similarity index 100% rename from tests/runtime-new/many-arguments/runner.c rename to tests/runtime/many-arguments/runner.c diff --git a/tests/runtime-new/many-arguments/runner.cs b/tests/runtime/many-arguments/runner.cs similarity index 100% rename from tests/runtime-new/many-arguments/runner.cs rename to tests/runtime/many-arguments/runner.cs diff --git a/tests/runtime-new/many-arguments/runner.rs b/tests/runtime/many-arguments/runner.rs similarity index 100% rename from tests/runtime-new/many-arguments/runner.rs rename to tests/runtime/many-arguments/runner.rs diff --git a/tests/runtime-new/many-arguments/test.c b/tests/runtime/many-arguments/test.c similarity index 100% rename from tests/runtime-new/many-arguments/test.c rename to tests/runtime/many-arguments/test.c diff --git a/tests/runtime-new/many-arguments/test.cs b/tests/runtime/many-arguments/test.cs similarity index 100% rename from tests/runtime-new/many-arguments/test.cs rename to tests/runtime/many-arguments/test.cs diff --git a/tests/runtime-new/many-arguments/test.rs b/tests/runtime/many-arguments/test.rs similarity index 100% rename from tests/runtime-new/many-arguments/test.rs rename to tests/runtime/many-arguments/test.rs diff --git a/tests/runtime-new/many-arguments/test.wit b/tests/runtime/many-arguments/test.wit similarity index 100% rename from tests/runtime-new/many-arguments/test.wit rename to tests/runtime/many-arguments/test.wit diff --git a/tests/runtime-new/numbers/runner.c b/tests/runtime/numbers/runner.c similarity index 100% rename from tests/runtime-new/numbers/runner.c rename to tests/runtime/numbers/runner.c diff --git a/tests/runtime-new/numbers/runner.cs b/tests/runtime/numbers/runner.cs similarity index 100% rename from tests/runtime-new/numbers/runner.cs rename to tests/runtime/numbers/runner.cs diff --git a/tests/runtime-new/numbers/runner.rs b/tests/runtime/numbers/runner.rs similarity index 100% rename from tests/runtime-new/numbers/runner.rs rename to tests/runtime/numbers/runner.rs diff --git a/tests/runtime-new/numbers/test.c b/tests/runtime/numbers/test.c similarity index 100% rename from tests/runtime-new/numbers/test.c rename to tests/runtime/numbers/test.c diff --git a/tests/runtime-new/numbers/test.cs b/tests/runtime/numbers/test.cs similarity index 100% rename from tests/runtime-new/numbers/test.cs rename to tests/runtime/numbers/test.cs diff --git a/tests/runtime-new/numbers/test.mbt b/tests/runtime/numbers/test.mbt similarity index 100% rename from tests/runtime-new/numbers/test.mbt rename to tests/runtime/numbers/test.mbt diff --git a/tests/runtime-new/numbers/test.rs b/tests/runtime/numbers/test.rs similarity index 100% rename from tests/runtime-new/numbers/test.rs rename to tests/runtime/numbers/test.rs diff --git a/tests/runtime-new/numbers/test.wit b/tests/runtime/numbers/test.wit similarity index 100% rename from tests/runtime-new/numbers/test.wit rename to tests/runtime/numbers/test.wit diff --git a/tests/runtime-new/options/runner.cs b/tests/runtime/options/runner.cs similarity index 100% rename from tests/runtime-new/options/runner.cs rename to tests/runtime/options/runner.cs diff --git a/tests/runtime-new/options/runner.rs b/tests/runtime/options/runner.rs similarity index 100% rename from tests/runtime-new/options/runner.rs rename to tests/runtime/options/runner.rs diff --git a/tests/runtime-new/options/test.cs b/tests/runtime/options/test.cs similarity index 100% rename from tests/runtime-new/options/test.cs rename to tests/runtime/options/test.cs diff --git a/tests/runtime-new/options/test.rs b/tests/runtime/options/test.rs similarity index 100% rename from tests/runtime-new/options/test.rs rename to tests/runtime/options/test.rs diff --git a/tests/runtime-new/options/test.wit b/tests/runtime/options/test.wit similarity index 100% rename from tests/runtime-new/options/test.wit rename to tests/runtime/options/test.wit diff --git a/tests/runtime-new/package-with-version/runner.rs b/tests/runtime/package-with-version/runner.rs similarity index 100% rename from tests/runtime-new/package-with-version/runner.rs rename to tests/runtime/package-with-version/runner.rs diff --git a/tests/runtime-new/package-with-version/test.rs b/tests/runtime/package-with-version/test.rs similarity index 100% rename from tests/runtime-new/package-with-version/test.rs rename to tests/runtime/package-with-version/test.rs diff --git a/tests/runtime-new/package-with-version/test.wit b/tests/runtime/package-with-version/test.wit similarity index 100% rename from tests/runtime-new/package-with-version/test.wit rename to tests/runtime/package-with-version/test.wit diff --git a/tests/runtime-new/records/runner.c b/tests/runtime/records/runner.c similarity index 100% rename from tests/runtime-new/records/runner.c rename to tests/runtime/records/runner.c diff --git a/tests/runtime-new/records/runner.cs b/tests/runtime/records/runner.cs similarity index 100% rename from tests/runtime-new/records/runner.cs rename to tests/runtime/records/runner.cs diff --git a/tests/runtime-new/records/runner.rs b/tests/runtime/records/runner.rs similarity index 100% rename from tests/runtime-new/records/runner.rs rename to tests/runtime/records/runner.rs diff --git a/tests/runtime-new/records/test.c b/tests/runtime/records/test.c similarity index 100% rename from tests/runtime-new/records/test.c rename to tests/runtime/records/test.c diff --git a/tests/runtime-new/records/test.cs b/tests/runtime/records/test.cs similarity index 100% rename from tests/runtime-new/records/test.cs rename to tests/runtime/records/test.cs diff --git a/tests/runtime-new/records/test.rs b/tests/runtime/records/test.rs similarity index 100% rename from tests/runtime-new/records/test.rs rename to tests/runtime/records/test.rs diff --git a/tests/runtime-new/records/test.wit b/tests/runtime/records/test.wit similarity index 100% rename from tests/runtime-new/records/test.wit rename to tests/runtime/records/test.wit diff --git a/tests/runtime-new/resource-borrow/runner.c b/tests/runtime/resource-borrow/runner.c similarity index 100% rename from tests/runtime-new/resource-borrow/runner.c rename to tests/runtime/resource-borrow/runner.c diff --git a/tests/runtime-new/resource-borrow/runner.cs b/tests/runtime/resource-borrow/runner.cs similarity index 100% rename from tests/runtime-new/resource-borrow/runner.cs rename to tests/runtime/resource-borrow/runner.cs diff --git a/tests/runtime-new/resource-borrow/runner.rs b/tests/runtime/resource-borrow/runner.rs similarity index 100% rename from tests/runtime-new/resource-borrow/runner.rs rename to tests/runtime/resource-borrow/runner.rs diff --git a/tests/runtime-new/resource-borrow/test.c b/tests/runtime/resource-borrow/test.c similarity index 100% rename from tests/runtime-new/resource-borrow/test.c rename to tests/runtime/resource-borrow/test.c diff --git a/tests/runtime-new/resource-borrow/test.cs b/tests/runtime/resource-borrow/test.cs similarity index 100% rename from tests/runtime-new/resource-borrow/test.cs rename to tests/runtime/resource-borrow/test.cs diff --git a/tests/runtime-new/resource-borrow/test.rs b/tests/runtime/resource-borrow/test.rs similarity index 100% rename from tests/runtime-new/resource-borrow/test.rs rename to tests/runtime/resource-borrow/test.rs diff --git a/tests/runtime-new/resource-borrow/test.wit b/tests/runtime/resource-borrow/test.wit similarity index 100% rename from tests/runtime-new/resource-borrow/test.wit rename to tests/runtime/resource-borrow/test.wit diff --git a/tests/runtime-new/resource-import-and-export/compose.wac b/tests/runtime/resource-import-and-export/compose.wac similarity index 100% rename from tests/runtime-new/resource-import-and-export/compose.wac rename to tests/runtime/resource-import-and-export/compose.wac diff --git a/tests/runtime-new/resource-import-and-export/intermediate.c b/tests/runtime/resource-import-and-export/intermediate.c similarity index 100% rename from tests/runtime-new/resource-import-and-export/intermediate.c rename to tests/runtime/resource-import-and-export/intermediate.c diff --git a/tests/runtime-new/resource-import-and-export/intermediate.cs b/tests/runtime/resource-import-and-export/intermediate.cs similarity index 100% rename from tests/runtime-new/resource-import-and-export/intermediate.cs rename to tests/runtime/resource-import-and-export/intermediate.cs diff --git a/tests/runtime-new/resource-import-and-export/intermediate.rs b/tests/runtime/resource-import-and-export/intermediate.rs similarity index 100% rename from tests/runtime-new/resource-import-and-export/intermediate.rs rename to tests/runtime/resource-import-and-export/intermediate.rs diff --git a/tests/runtime-new/resource-import-and-export/leaf-thing.rs b/tests/runtime/resource-import-and-export/leaf-thing.rs similarity index 100% rename from tests/runtime-new/resource-import-and-export/leaf-thing.rs rename to tests/runtime/resource-import-and-export/leaf-thing.rs diff --git a/tests/runtime-new/resource-import-and-export/leaf-toplevel.rs b/tests/runtime/resource-import-and-export/leaf-toplevel.rs similarity index 100% rename from tests/runtime-new/resource-import-and-export/leaf-toplevel.rs rename to tests/runtime/resource-import-and-export/leaf-toplevel.rs diff --git a/tests/runtime-new/resource-import-and-export/runner.rs b/tests/runtime/resource-import-and-export/runner.rs similarity index 100% rename from tests/runtime-new/resource-import-and-export/runner.rs rename to tests/runtime/resource-import-and-export/runner.rs diff --git a/tests/runtime-new/resource-import-and-export/test.wit b/tests/runtime/resource-import-and-export/test.wit similarity index 100% rename from tests/runtime-new/resource-import-and-export/test.wit rename to tests/runtime/resource-import-and-export/test.wit diff --git a/tests/runtime-new/resource_aggregates/runner.cs b/tests/runtime/resource_aggregates/runner.cs similarity index 100% rename from tests/runtime-new/resource_aggregates/runner.cs rename to tests/runtime/resource_aggregates/runner.cs diff --git a/tests/runtime-new/resource_aggregates/runner.rs b/tests/runtime/resource_aggregates/runner.rs similarity index 100% rename from tests/runtime-new/resource_aggregates/runner.rs rename to tests/runtime/resource_aggregates/runner.rs diff --git a/tests/runtime-new/resource_aggregates/test.cs b/tests/runtime/resource_aggregates/test.cs similarity index 100% rename from tests/runtime-new/resource_aggregates/test.cs rename to tests/runtime/resource_aggregates/test.cs diff --git a/tests/runtime-new/resource_aggregates/test.rs b/tests/runtime/resource_aggregates/test.rs similarity index 100% rename from tests/runtime-new/resource_aggregates/test.rs rename to tests/runtime/resource_aggregates/test.rs diff --git a/tests/runtime-new/resource_aggregates/test.wit b/tests/runtime/resource_aggregates/test.wit similarity index 100% rename from tests/runtime-new/resource_aggregates/test.wit rename to tests/runtime/resource_aggregates/test.wit diff --git a/tests/runtime-new/resource_alias/runner.rs b/tests/runtime/resource_alias/runner.rs similarity index 100% rename from tests/runtime-new/resource_alias/runner.rs rename to tests/runtime/resource_alias/runner.rs diff --git a/tests/runtime-new/resource_alias/test.cs b/tests/runtime/resource_alias/test.cs similarity index 100% rename from tests/runtime-new/resource_alias/test.cs rename to tests/runtime/resource_alias/test.cs diff --git a/tests/runtime-new/resource_alias/test.rs b/tests/runtime/resource_alias/test.rs similarity index 100% rename from tests/runtime-new/resource_alias/test.rs rename to tests/runtime/resource_alias/test.rs diff --git a/tests/runtime-new/resource_alias/test.wit b/tests/runtime/resource_alias/test.wit similarity index 100% rename from tests/runtime-new/resource_alias/test.wit rename to tests/runtime/resource_alias/test.wit diff --git a/tests/runtime-new/resource_alias_redux/_test_disabled.cs b/tests/runtime/resource_alias_redux/_test_disabled.cs similarity index 100% rename from tests/runtime-new/resource_alias_redux/_test_disabled.cs rename to tests/runtime/resource_alias_redux/_test_disabled.cs diff --git a/tests/runtime-new/resource_alias_redux/runner.cs b/tests/runtime/resource_alias_redux/runner.cs similarity index 100% rename from tests/runtime-new/resource_alias_redux/runner.cs rename to tests/runtime/resource_alias_redux/runner.cs diff --git a/tests/runtime-new/resource_alias_redux/runner.rs b/tests/runtime/resource_alias_redux/runner.rs similarity index 100% rename from tests/runtime-new/resource_alias_redux/runner.rs rename to tests/runtime/resource_alias_redux/runner.rs diff --git a/tests/runtime-new/resource_alias_redux/test.rs b/tests/runtime/resource_alias_redux/test.rs similarity index 100% rename from tests/runtime-new/resource_alias_redux/test.rs rename to tests/runtime/resource_alias_redux/test.rs diff --git a/tests/runtime-new/resource_alias_redux/test.wit b/tests/runtime/resource_alias_redux/test.wit similarity index 100% rename from tests/runtime-new/resource_alias_redux/test.wit rename to tests/runtime/resource_alias_redux/test.wit diff --git a/tests/runtime-new/resource_borrow_in_record/runner.cs b/tests/runtime/resource_borrow_in_record/runner.cs similarity index 100% rename from tests/runtime-new/resource_borrow_in_record/runner.cs rename to tests/runtime/resource_borrow_in_record/runner.cs diff --git a/tests/runtime-new/resource_borrow_in_record/runner.rs b/tests/runtime/resource_borrow_in_record/runner.rs similarity index 100% rename from tests/runtime-new/resource_borrow_in_record/runner.rs rename to tests/runtime/resource_borrow_in_record/runner.rs diff --git a/tests/runtime-new/resource_borrow_in_record/test.cs b/tests/runtime/resource_borrow_in_record/test.cs similarity index 100% rename from tests/runtime-new/resource_borrow_in_record/test.cs rename to tests/runtime/resource_borrow_in_record/test.cs diff --git a/tests/runtime-new/resource_borrow_in_record/test.rs b/tests/runtime/resource_borrow_in_record/test.rs similarity index 100% rename from tests/runtime-new/resource_borrow_in_record/test.rs rename to tests/runtime/resource_borrow_in_record/test.rs diff --git a/tests/runtime-new/resource_borrow_in_record/test.wit b/tests/runtime/resource_borrow_in_record/test.wit similarity index 100% rename from tests/runtime-new/resource_borrow_in_record/test.wit rename to tests/runtime/resource_borrow_in_record/test.wit diff --git a/tests/runtime-new/resource_borrow_in_record/wasm.rs b/tests/runtime/resource_borrow_in_record/wasm.rs similarity index 100% rename from tests/runtime-new/resource_borrow_in_record/wasm.rs rename to tests/runtime/resource_borrow_in_record/wasm.rs diff --git a/tests/runtime-new/resource_floats/compose.wac b/tests/runtime/resource_floats/compose.wac similarity index 100% rename from tests/runtime-new/resource_floats/compose.wac rename to tests/runtime/resource_floats/compose.wac diff --git a/tests/runtime-new/resource_floats/intermediate.cs b/tests/runtime/resource_floats/intermediate.cs similarity index 100% rename from tests/runtime-new/resource_floats/intermediate.cs rename to tests/runtime/resource_floats/intermediate.cs diff --git a/tests/runtime-new/resource_floats/intermediate.rs b/tests/runtime/resource_floats/intermediate.rs similarity index 100% rename from tests/runtime-new/resource_floats/intermediate.rs rename to tests/runtime/resource_floats/intermediate.rs diff --git a/tests/runtime-new/resource_floats/leaf.rs b/tests/runtime/resource_floats/leaf.rs similarity index 100% rename from tests/runtime-new/resource_floats/leaf.rs rename to tests/runtime/resource_floats/leaf.rs diff --git a/tests/runtime-new/resource_floats/runner.rs b/tests/runtime/resource_floats/runner.rs similarity index 100% rename from tests/runtime-new/resource_floats/runner.rs rename to tests/runtime/resource_floats/runner.rs diff --git a/tests/runtime-new/resource_floats/test.wit b/tests/runtime/resource_floats/test.wit similarity index 100% rename from tests/runtime-new/resource_floats/test.wit rename to tests/runtime/resource_floats/test.wit diff --git a/tests/runtime-new/resource_with_lists/compose.wac b/tests/runtime/resource_with_lists/compose.wac similarity index 100% rename from tests/runtime-new/resource_with_lists/compose.wac rename to tests/runtime/resource_with_lists/compose.wac diff --git a/tests/runtime-new/resource_with_lists/leaf.rs b/tests/runtime/resource_with_lists/leaf.rs similarity index 100% rename from tests/runtime-new/resource_with_lists/leaf.rs rename to tests/runtime/resource_with_lists/leaf.rs diff --git a/tests/runtime-new/resource_with_lists/resource-with-lists.cs b/tests/runtime/resource_with_lists/resource-with-lists.cs similarity index 100% rename from tests/runtime-new/resource_with_lists/resource-with-lists.cs rename to tests/runtime/resource_with_lists/resource-with-lists.cs diff --git a/tests/runtime-new/resource_with_lists/resource-with-lists.rs b/tests/runtime/resource_with_lists/resource-with-lists.rs similarity index 100% rename from tests/runtime-new/resource_with_lists/resource-with-lists.rs rename to tests/runtime/resource_with_lists/resource-with-lists.rs diff --git a/tests/runtime-new/resource_with_lists/runner.rs b/tests/runtime/resource_with_lists/runner.rs similarity index 100% rename from tests/runtime-new/resource_with_lists/runner.rs rename to tests/runtime/resource_with_lists/runner.rs diff --git a/tests/runtime-new/resource_with_lists/test.wit b/tests/runtime/resource_with_lists/test.wit similarity index 100% rename from tests/runtime-new/resource_with_lists/test.wit rename to tests/runtime/resource_with_lists/test.wit diff --git a/tests/runtime-new/resources/compose.wac b/tests/runtime/resources/compose.wac similarity index 100% rename from tests/runtime-new/resources/compose.wac rename to tests/runtime/resources/compose.wac diff --git a/tests/runtime-new/resources/leaf.rs b/tests/runtime/resources/leaf.rs similarity index 100% rename from tests/runtime-new/resources/leaf.rs rename to tests/runtime/resources/leaf.rs diff --git a/tests/runtime-new/resources/resources.c b/tests/runtime/resources/resources.c similarity index 100% rename from tests/runtime-new/resources/resources.c rename to tests/runtime/resources/resources.c diff --git a/tests/runtime-new/resources/resources.cs b/tests/runtime/resources/resources.cs similarity index 100% rename from tests/runtime-new/resources/resources.cs rename to tests/runtime/resources/resources.cs diff --git a/tests/runtime-new/resources/resources.rs b/tests/runtime/resources/resources.rs similarity index 100% rename from tests/runtime-new/resources/resources.rs rename to tests/runtime/resources/resources.rs diff --git a/tests/runtime-new/resources/runner.rs b/tests/runtime/resources/runner.rs similarity index 100% rename from tests/runtime-new/resources/runner.rs rename to tests/runtime/resources/runner.rs diff --git a/tests/runtime-new/resources/test.wit b/tests/runtime/resources/test.wit similarity index 100% rename from tests/runtime-new/resources/test.wit rename to tests/runtime/resources/test.wit diff --git a/tests/runtime-new/results/compose.wac b/tests/runtime/results/compose.wac similarity index 100% rename from tests/runtime-new/results/compose.wac rename to tests/runtime/results/compose.wac diff --git a/tests/runtime-new/results/intermediate.cs b/tests/runtime/results/intermediate.cs similarity index 100% rename from tests/runtime-new/results/intermediate.cs rename to tests/runtime/results/intermediate.cs diff --git a/tests/runtime-new/results/intermediate.rs b/tests/runtime/results/intermediate.rs similarity index 100% rename from tests/runtime-new/results/intermediate.rs rename to tests/runtime/results/intermediate.rs diff --git a/tests/runtime-new/results/intermediate_with_wit_results.cs b/tests/runtime/results/intermediate_with_wit_results.cs similarity index 100% rename from tests/runtime-new/results/intermediate_with_wit_results.cs rename to tests/runtime/results/intermediate_with_wit_results.cs diff --git a/tests/runtime-new/results/leaf.rs b/tests/runtime/results/leaf.rs similarity index 100% rename from tests/runtime-new/results/leaf.rs rename to tests/runtime/results/leaf.rs diff --git a/tests/runtime-new/results/runner.rs b/tests/runtime/results/runner.rs similarity index 100% rename from tests/runtime-new/results/runner.rs rename to tests/runtime/results/runner.rs diff --git a/tests/runtime-new/results/test.wit b/tests/runtime/results/test.wit similarity index 100% rename from tests/runtime-new/results/test.wit rename to tests/runtime/results/test.wit diff --git a/tests/runtime-new/rust/alternative-bitflags/runner.rs b/tests/runtime/rust/alternative-bitflags/runner.rs similarity index 100% rename from tests/runtime-new/rust/alternative-bitflags/runner.rs rename to tests/runtime/rust/alternative-bitflags/runner.rs diff --git a/tests/runtime-new/rust/alternative-bitflags/test.rs b/tests/runtime/rust/alternative-bitflags/test.rs similarity index 100% rename from tests/runtime-new/rust/alternative-bitflags/test.rs rename to tests/runtime/rust/alternative-bitflags/test.rs diff --git a/tests/runtime-new/rust/alternative-bitflags/test.wit b/tests/runtime/rust/alternative-bitflags/test.wit similarity index 100% rename from tests/runtime-new/rust/alternative-bitflags/test.wit rename to tests/runtime/rust/alternative-bitflags/test.wit diff --git a/tests/runtime-new/rust/custom-derives/runner.rs b/tests/runtime/rust/custom-derives/runner.rs similarity index 100% rename from tests/runtime-new/rust/custom-derives/runner.rs rename to tests/runtime/rust/custom-derives/runner.rs diff --git a/tests/runtime-new/rust/custom-derives/test.rs b/tests/runtime/rust/custom-derives/test.rs similarity index 100% rename from tests/runtime-new/rust/custom-derives/test.rs rename to tests/runtime/rust/custom-derives/test.rs diff --git a/tests/runtime-new/rust/custom-derives/test.wit b/tests/runtime/rust/custom-derives/test.wit similarity index 100% rename from tests/runtime-new/rust/custom-derives/test.wit rename to tests/runtime/rust/custom-derives/test.wit diff --git a/tests/runtime-new/rust/disable-custom-section-link-helpers/runner.rs b/tests/runtime/rust/disable-custom-section-link-helpers/runner.rs similarity index 100% rename from tests/runtime-new/rust/disable-custom-section-link-helpers/runner.rs rename to tests/runtime/rust/disable-custom-section-link-helpers/runner.rs diff --git a/tests/runtime-new/rust/disable-custom-section-link-helpers/test.rs b/tests/runtime/rust/disable-custom-section-link-helpers/test.rs similarity index 100% rename from tests/runtime-new/rust/disable-custom-section-link-helpers/test.rs rename to tests/runtime/rust/disable-custom-section-link-helpers/test.rs diff --git a/tests/runtime-new/rust/disable-custom-section-link-helpers/test.wit b/tests/runtime/rust/disable-custom-section-link-helpers/test.wit similarity index 100% rename from tests/runtime-new/rust/disable-custom-section-link-helpers/test.wit rename to tests/runtime/rust/disable-custom-section-link-helpers/test.wit diff --git a/tests/runtime-new/rust/other-dependencies/other.wit b/tests/runtime/rust/other-dependencies/other.wit similarity index 100% rename from tests/runtime-new/rust/other-dependencies/other.wit rename to tests/runtime/rust/other-dependencies/other.wit diff --git a/tests/runtime-new/rust/other-dependencies/runner.rs b/tests/runtime/rust/other-dependencies/runner.rs similarity index 100% rename from tests/runtime-new/rust/other-dependencies/runner.rs rename to tests/runtime/rust/other-dependencies/runner.rs diff --git a/tests/runtime-new/rust/other-dependencies/test.rs b/tests/runtime/rust/other-dependencies/test.rs similarity index 100% rename from tests/runtime-new/rust/other-dependencies/test.rs rename to tests/runtime/rust/other-dependencies/test.rs diff --git a/tests/runtime-new/rust/other-dependencies/test.wit b/tests/runtime/rust/other-dependencies/test.wit similarity index 100% rename from tests/runtime-new/rust/other-dependencies/test.wit rename to tests/runtime/rust/other-dependencies/test.wit diff --git a/tests/runtime-new/rust/owned-resource-deref-mut/runner.rs b/tests/runtime/rust/owned-resource-deref-mut/runner.rs similarity index 100% rename from tests/runtime-new/rust/owned-resource-deref-mut/runner.rs rename to tests/runtime/rust/owned-resource-deref-mut/runner.rs diff --git a/tests/runtime-new/rust/owned-resource-deref-mut/test.rs b/tests/runtime/rust/owned-resource-deref-mut/test.rs similarity index 100% rename from tests/runtime-new/rust/owned-resource-deref-mut/test.rs rename to tests/runtime/rust/owned-resource-deref-mut/test.rs diff --git a/tests/runtime-new/rust/owned-resource-deref-mut/test.wit b/tests/runtime/rust/owned-resource-deref-mut/test.wit similarity index 100% rename from tests/runtime-new/rust/owned-resource-deref-mut/test.wit rename to tests/runtime/rust/owned-resource-deref-mut/test.wit diff --git a/tests/runtime-new/rust/ownership/runner-borrowing-duplicate-if-necessary.rs b/tests/runtime/rust/ownership/runner-borrowing-duplicate-if-necessary.rs similarity index 100% rename from tests/runtime-new/rust/ownership/runner-borrowing-duplicate-if-necessary.rs rename to tests/runtime/rust/ownership/runner-borrowing-duplicate-if-necessary.rs diff --git a/tests/runtime-new/rust/ownership/runner-borrowing.rs b/tests/runtime/rust/ownership/runner-borrowing.rs similarity index 100% rename from tests/runtime-new/rust/ownership/runner-borrowing.rs rename to tests/runtime/rust/ownership/runner-borrowing.rs diff --git a/tests/runtime-new/rust/ownership/runner-owning.rs b/tests/runtime/rust/ownership/runner-owning.rs similarity index 100% rename from tests/runtime-new/rust/ownership/runner-owning.rs rename to tests/runtime/rust/ownership/runner-owning.rs diff --git a/tests/runtime-new/rust/ownership/test.rs b/tests/runtime/rust/ownership/test.rs similarity index 100% rename from tests/runtime-new/rust/ownership/test.rs rename to tests/runtime/rust/ownership/test.rs diff --git a/tests/runtime-new/rust/ownership/test.wit b/tests/runtime/rust/ownership/test.wit similarity index 100% rename from tests/runtime-new/rust/ownership/test.wit rename to tests/runtime/rust/ownership/test.wit diff --git a/tests/runtime-new/rust/raw-strings/runner-nostd.rs b/tests/runtime/rust/raw-strings/runner-nostd.rs similarity index 100% rename from tests/runtime-new/rust/raw-strings/runner-nostd.rs rename to tests/runtime/rust/raw-strings/runner-nostd.rs diff --git a/tests/runtime-new/rust/raw-strings/runner-std.rs b/tests/runtime/rust/raw-strings/runner-std.rs similarity index 100% rename from tests/runtime-new/rust/raw-strings/runner-std.rs rename to tests/runtime/rust/raw-strings/runner-std.rs diff --git a/tests/runtime-new/rust/raw-strings/test.rs b/tests/runtime/rust/raw-strings/test.rs similarity index 100% rename from tests/runtime-new/rust/raw-strings/test.rs rename to tests/runtime/rust/raw-strings/test.rs diff --git a/tests/runtime-new/rust/raw-strings/test.wit b/tests/runtime/rust/raw-strings/test.wit similarity index 100% rename from tests/runtime-new/rust/raw-strings/test.wit rename to tests/runtime/rust/raw-strings/test.wit diff --git a/tests/runtime-new/rust/resource_into_inner/runner.rs b/tests/runtime/rust/resource_into_inner/runner.rs similarity index 100% rename from tests/runtime-new/rust/resource_into_inner/runner.rs rename to tests/runtime/rust/resource_into_inner/runner.rs diff --git a/tests/runtime-new/rust/resource_into_inner/test.cs b/tests/runtime/rust/resource_into_inner/test.cs similarity index 100% rename from tests/runtime-new/rust/resource_into_inner/test.cs rename to tests/runtime/rust/resource_into_inner/test.cs diff --git a/tests/runtime-new/rust/resource_into_inner/test.rs b/tests/runtime/rust/resource_into_inner/test.rs similarity index 100% rename from tests/runtime-new/rust/resource_into_inner/test.rs rename to tests/runtime/rust/resource_into_inner/test.rs diff --git a/tests/runtime-new/rust/resource_into_inner/test.wit b/tests/runtime/rust/resource_into_inner/test.wit similarity index 100% rename from tests/runtime-new/rust/resource_into_inner/test.wit rename to tests/runtime/rust/resource_into_inner/test.wit diff --git a/tests/runtime-new/rust/run-ctors-once-workaround/runner.rs b/tests/runtime/rust/run-ctors-once-workaround/runner.rs similarity index 100% rename from tests/runtime-new/rust/run-ctors-once-workaround/runner.rs rename to tests/runtime/rust/run-ctors-once-workaround/runner.rs diff --git a/tests/runtime-new/rust/run-ctors-once-workaround/test.rs b/tests/runtime/rust/run-ctors-once-workaround/test.rs similarity index 100% rename from tests/runtime-new/rust/run-ctors-once-workaround/test.rs rename to tests/runtime/rust/run-ctors-once-workaround/test.rs diff --git a/tests/runtime-new/rust/run-ctors-once-workaround/test.wit b/tests/runtime/rust/run-ctors-once-workaround/test.wit similarity index 100% rename from tests/runtime-new/rust/run-ctors-once-workaround/test.wit rename to tests/runtime/rust/run-ctors-once-workaround/test.wit diff --git a/tests/runtime-new/rust/skip/runner.rs b/tests/runtime/rust/skip/runner.rs similarity index 100% rename from tests/runtime-new/rust/skip/runner.rs rename to tests/runtime/rust/skip/runner.rs diff --git a/tests/runtime-new/rust/skip/test-nostd.rs b/tests/runtime/rust/skip/test-nostd.rs similarity index 100% rename from tests/runtime-new/rust/skip/test-nostd.rs rename to tests/runtime/rust/skip/test-nostd.rs diff --git a/tests/runtime-new/rust/skip/test-std.rs b/tests/runtime/rust/skip/test-std.rs similarity index 100% rename from tests/runtime-new/rust/skip/test-std.rs rename to tests/runtime/rust/skip/test-std.rs diff --git a/tests/runtime-new/rust/skip/test.wit b/tests/runtime/rust/skip/test.wit similarity index 100% rename from tests/runtime-new/rust/skip/test.wit rename to tests/runtime/rust/skip/test.wit diff --git a/tests/runtime-new/rust/type_section_suffix/runner.rs b/tests/runtime/rust/type_section_suffix/runner.rs similarity index 100% rename from tests/runtime-new/rust/type_section_suffix/runner.rs rename to tests/runtime/rust/type_section_suffix/runner.rs diff --git a/tests/runtime-new/rust/type_section_suffix/test.rs b/tests/runtime/rust/type_section_suffix/test.rs similarity index 100% rename from tests/runtime-new/rust/type_section_suffix/test.rs rename to tests/runtime/rust/type_section_suffix/test.rs diff --git a/tests/runtime-new/rust/type_section_suffix/test.wit b/tests/runtime/rust/type_section_suffix/test.wit similarity index 100% rename from tests/runtime-new/rust/type_section_suffix/test.wit rename to tests/runtime/rust/type_section_suffix/test.wit diff --git a/tests/runtime-new/rust/with-and-resources/runner.rs b/tests/runtime/rust/with-and-resources/runner.rs similarity index 100% rename from tests/runtime-new/rust/with-and-resources/runner.rs rename to tests/runtime/rust/with-and-resources/runner.rs diff --git a/tests/runtime-new/rust/with-and-resources/test.rs b/tests/runtime/rust/with-and-resources/test.rs similarity index 100% rename from tests/runtime-new/rust/with-and-resources/test.rs rename to tests/runtime/rust/with-and-resources/test.rs diff --git a/tests/runtime-new/rust/with-and-resources/test.wit b/tests/runtime/rust/with-and-resources/test.wit similarity index 100% rename from tests/runtime-new/rust/with-and-resources/test.wit rename to tests/runtime/rust/with-and-resources/test.wit diff --git a/tests/runtime-new/rust/with-option-generate/runner-generate-all.rs b/tests/runtime/rust/with-option-generate/runner-generate-all.rs similarity index 100% rename from tests/runtime-new/rust/with-option-generate/runner-generate-all.rs rename to tests/runtime/rust/with-option-generate/runner-generate-all.rs diff --git a/tests/runtime-new/rust/with-option-generate/runner-generate-one.rs b/tests/runtime/rust/with-option-generate/runner-generate-one.rs similarity index 100% rename from tests/runtime-new/rust/with-option-generate/runner-generate-one.rs rename to tests/runtime/rust/with-option-generate/runner-generate-one.rs diff --git a/tests/runtime-new/rust/with-option-generate/test.rs b/tests/runtime/rust/with-option-generate/test.rs similarity index 100% rename from tests/runtime-new/rust/with-option-generate/test.rs rename to tests/runtime/rust/with-option-generate/test.rs diff --git a/tests/runtime-new/rust/with-option-generate/test.wit b/tests/runtime/rust/with-option-generate/test.wit similarity index 100% rename from tests/runtime-new/rust/with-option-generate/test.wit rename to tests/runtime/rust/with-option-generate/test.wit diff --git a/tests/runtime-new/rust/with-types/runner.rs b/tests/runtime/rust/with-types/runner.rs similarity index 100% rename from tests/runtime-new/rust/with-types/runner.rs rename to tests/runtime/rust/with-types/runner.rs diff --git a/tests/runtime-new/rust/with-types/test.rs b/tests/runtime/rust/with-types/test.rs similarity index 100% rename from tests/runtime-new/rust/with-types/test.rs rename to tests/runtime/rust/with-types/test.rs diff --git a/tests/runtime-new/rust/with-types/test.wit b/tests/runtime/rust/with-types/test.wit similarity index 100% rename from tests/runtime-new/rust/with-types/test.wit rename to tests/runtime/rust/with-types/test.wit diff --git a/tests/runtime-new/rust/with/runner.rs b/tests/runtime/rust/with/runner.rs similarity index 100% rename from tests/runtime-new/rust/with/runner.rs rename to tests/runtime/rust/with/runner.rs diff --git a/tests/runtime-new/rust/with/test.rs b/tests/runtime/rust/with/test.rs similarity index 100% rename from tests/runtime-new/rust/with/test.rs rename to tests/runtime/rust/with/test.rs diff --git a/tests/runtime-new/rust/with/test.wit b/tests/runtime/rust/with/test.wit similarity index 100% rename from tests/runtime-new/rust/with/test.wit rename to tests/runtime/rust/with/test.wit diff --git a/tests/runtime-new/rust/xcrate/compose.wac b/tests/runtime/rust/xcrate/compose.wac similarity index 100% rename from tests/runtime-new/rust/xcrate/compose.wac rename to tests/runtime/rust/xcrate/compose.wac diff --git a/tests/runtime-new/rust/xcrate/intermediate.rs b/tests/runtime/rust/xcrate/intermediate.rs similarity index 100% rename from tests/runtime-new/rust/xcrate/intermediate.rs rename to tests/runtime/rust/xcrate/intermediate.rs diff --git a/tests/runtime-new/rust/xcrate/leaf.rs b/tests/runtime/rust/xcrate/leaf.rs similarity index 100% rename from tests/runtime-new/rust/xcrate/leaf.rs rename to tests/runtime/rust/xcrate/leaf.rs diff --git a/tests/runtime-new/rust/xcrate/runner.rs b/tests/runtime/rust/xcrate/runner.rs similarity index 100% rename from tests/runtime-new/rust/xcrate/runner.rs rename to tests/runtime/rust/xcrate/runner.rs diff --git a/tests/runtime-new/rust/xcrate/rust_xcrate_test.rs b/tests/runtime/rust/xcrate/rust_xcrate_test.rs similarity index 100% rename from tests/runtime-new/rust/xcrate/rust_xcrate_test.rs rename to tests/runtime/rust/xcrate/rust_xcrate_test.rs diff --git a/tests/runtime-new/rust/xcrate/test.wit b/tests/runtime/rust/xcrate/test.wit similarity index 100% rename from tests/runtime-new/rust/xcrate/test.wit rename to tests/runtime/rust/xcrate/test.wit diff --git a/tests/runtime-new/strings-alias/runner.rs b/tests/runtime/strings-alias/runner.rs similarity index 100% rename from tests/runtime-new/strings-alias/runner.rs rename to tests/runtime/strings-alias/runner.rs diff --git a/tests/runtime-new/strings-alias/test.rs b/tests/runtime/strings-alias/test.rs similarity index 100% rename from tests/runtime-new/strings-alias/test.rs rename to tests/runtime/strings-alias/test.rs diff --git a/tests/runtime-new/strings-alias/test.wit b/tests/runtime/strings-alias/test.wit similarity index 100% rename from tests/runtime-new/strings-alias/test.wit rename to tests/runtime/strings-alias/test.wit diff --git a/tests/runtime-new/strings-simple/runner-nostd.rs b/tests/runtime/strings-simple/runner-nostd.rs similarity index 100% rename from tests/runtime-new/strings-simple/runner-nostd.rs rename to tests/runtime/strings-simple/runner-nostd.rs diff --git a/tests/runtime-new/strings-simple/runner-std.rs b/tests/runtime/strings-simple/runner-std.rs similarity index 100% rename from tests/runtime-new/strings-simple/runner-std.rs rename to tests/runtime/strings-simple/runner-std.rs diff --git a/tests/runtime-new/strings-simple/test.rs b/tests/runtime/strings-simple/test.rs similarity index 100% rename from tests/runtime-new/strings-simple/test.rs rename to tests/runtime/strings-simple/test.rs diff --git a/tests/runtime-new/strings-simple/test.wit b/tests/runtime/strings-simple/test.wit similarity index 100% rename from tests/runtime-new/strings-simple/test.wit rename to tests/runtime/strings-simple/test.wit diff --git a/tests/runtime-new/strings/runner.c b/tests/runtime/strings/runner.c similarity index 100% rename from tests/runtime-new/strings/runner.c rename to tests/runtime/strings/runner.c diff --git a/tests/runtime-new/strings/runner.cs b/tests/runtime/strings/runner.cs similarity index 100% rename from tests/runtime-new/strings/runner.cs rename to tests/runtime/strings/runner.cs diff --git a/tests/runtime-new/strings/runner.rs b/tests/runtime/strings/runner.rs similarity index 100% rename from tests/runtime-new/strings/runner.rs rename to tests/runtime/strings/runner.rs diff --git a/tests/runtime-new/strings/test.c b/tests/runtime/strings/test.c similarity index 100% rename from tests/runtime-new/strings/test.c rename to tests/runtime/strings/test.c diff --git a/tests/runtime-new/strings/test.cs b/tests/runtime/strings/test.cs similarity index 100% rename from tests/runtime-new/strings/test.cs rename to tests/runtime/strings/test.cs diff --git a/tests/runtime-new/strings/test.mbt b/tests/runtime/strings/test.mbt similarity index 100% rename from tests/runtime-new/strings/test.mbt rename to tests/runtime/strings/test.mbt diff --git a/tests/runtime-new/strings/test.rs b/tests/runtime/strings/test.rs similarity index 100% rename from tests/runtime-new/strings/test.rs rename to tests/runtime/strings/test.rs diff --git a/tests/runtime-new/strings/test.wit b/tests/runtime/strings/test.wit similarity index 100% rename from tests/runtime-new/strings/test.wit rename to tests/runtime/strings/test.wit diff --git a/tests/runtime-new/symbol-conflicts/runner.rs b/tests/runtime/symbol-conflicts/runner.rs similarity index 100% rename from tests/runtime-new/symbol-conflicts/runner.rs rename to tests/runtime/symbol-conflicts/runner.rs diff --git a/tests/runtime-new/symbol-conflicts/test.rs b/tests/runtime/symbol-conflicts/test.rs similarity index 100% rename from tests/runtime-new/symbol-conflicts/test.rs rename to tests/runtime/symbol-conflicts/test.rs diff --git a/tests/runtime-new/symbol-conflicts/test.wit b/tests/runtime/symbol-conflicts/test.wit similarity index 100% rename from tests/runtime-new/symbol-conflicts/test.wit rename to tests/runtime/symbol-conflicts/test.wit diff --git a/tests/runtime-new/unused-types/runner.rs b/tests/runtime/unused-types/runner.rs similarity index 100% rename from tests/runtime-new/unused-types/runner.rs rename to tests/runtime/unused-types/runner.rs diff --git a/tests/runtime-new/unused-types/test.rs b/tests/runtime/unused-types/test.rs similarity index 100% rename from tests/runtime-new/unused-types/test.rs rename to tests/runtime/unused-types/test.rs diff --git a/tests/runtime-new/unused-types/test.wit b/tests/runtime/unused-types/test.wit similarity index 100% rename from tests/runtime-new/unused-types/test.wit rename to tests/runtime/unused-types/test.wit diff --git a/tests/runtime-new/variants/runner.c b/tests/runtime/variants/runner.c similarity index 100% rename from tests/runtime-new/variants/runner.c rename to tests/runtime/variants/runner.c diff --git a/tests/runtime-new/variants/runner.cs b/tests/runtime/variants/runner.cs similarity index 100% rename from tests/runtime-new/variants/runner.cs rename to tests/runtime/variants/runner.cs diff --git a/tests/runtime-new/variants/runner.rs b/tests/runtime/variants/runner.rs similarity index 100% rename from tests/runtime-new/variants/runner.rs rename to tests/runtime/variants/runner.rs diff --git a/tests/runtime-new/variants/test.c b/tests/runtime/variants/test.c similarity index 100% rename from tests/runtime-new/variants/test.c rename to tests/runtime/variants/test.c diff --git a/tests/runtime-new/variants/test.cs b/tests/runtime/variants/test.cs similarity index 100% rename from tests/runtime-new/variants/test.cs rename to tests/runtime/variants/test.cs diff --git a/tests/runtime-new/variants/test.mbt b/tests/runtime/variants/test.mbt similarity index 100% rename from tests/runtime-new/variants/test.mbt rename to tests/runtime/variants/test.mbt diff --git a/tests/runtime-new/variants/test.rs b/tests/runtime/variants/test.rs similarity index 100% rename from tests/runtime-new/variants/test.rs rename to tests/runtime/variants/test.rs diff --git a/tests/runtime-new/variants/test.wit b/tests/runtime/variants/test.wit similarity index 100% rename from tests/runtime-new/variants/test.wit rename to tests/runtime/variants/test.wit diff --git a/tests/runtime-new/versions/deps/v1/v1.wit b/tests/runtime/versions/deps/v1/v1.wit similarity index 100% rename from tests/runtime-new/versions/deps/v1/v1.wit rename to tests/runtime/versions/deps/v1/v1.wit diff --git a/tests/runtime-new/versions/deps/v2/v2.wit b/tests/runtime/versions/deps/v2/v2.wit similarity index 100% rename from tests/runtime-new/versions/deps/v2/v2.wit rename to tests/runtime/versions/deps/v2/v2.wit diff --git a/tests/runtime-new/versions/runner.cs b/tests/runtime/versions/runner.cs similarity index 100% rename from tests/runtime-new/versions/runner.cs rename to tests/runtime/versions/runner.cs diff --git a/tests/runtime-new/versions/runner.rs b/tests/runtime/versions/runner.rs similarity index 100% rename from tests/runtime-new/versions/runner.rs rename to tests/runtime/versions/runner.rs diff --git a/tests/runtime-new/versions/test.cs b/tests/runtime/versions/test.cs similarity index 100% rename from tests/runtime-new/versions/test.cs rename to tests/runtime/versions/test.cs diff --git a/tests/runtime-new/versions/test.rs b/tests/runtime/versions/test.rs similarity index 100% rename from tests/runtime-new/versions/test.rs rename to tests/runtime/versions/test.rs diff --git a/tests/runtime-new/versions/test.wit b/tests/runtime/versions/test.wit similarity index 100% rename from tests/runtime-new/versions/test.wit rename to tests/runtime/versions/test.wit