Include wasmer-types in workspace with indexmap 2

Cargo.toml

@@ -57,7 +57,7 @@ members = [
     # "lib/package",
     # "lib/registry",
     # "lib/sys-utils",
-    # "lib/types",
+    "lib/types",
     # "lib/virtual-io",
     # "lib/virtual-fs",
     # "lib/virtual-net",
@@ -102,7 +102,7 @@ wasmer-wasix = { path = "./lib/wasix" }
 macro-wasmer-universal-test = "=4.4.0"
 wasmer-derive = "=4.4.0"
 wasmer-object = "=4.4.0"
-wasmer-types = "=4.4.0"
+wasmer-types = { version = "=4.4.0-linera.7", path = "lib/types" }
 webc = { version = "6.1.0", default-features = false, features = ["package"] }
 shared-buffer = "0.1.4"
 
@@ -114,7 +114,7 @@ reqwest = { version = "0.12.0", default-features = false }
 enumset = "1.1.0"
 memoffset = "0.9.0"
 wasmparser = { version = "0.121.0", default-features = false }
-rkyv = { version = "0.7.40", features = ["indexmap", "validation", "strict"] }
+rkyv = { version = "0.7.40", features = ["validation"] }
 memmap2 = { version = "0.6.2" }
 toml = {version = "0.5.9", features = ["preserve_order"]}
 indexmap = "2"

lib/api/Cargo.toml

@@ -27,7 +27,7 @@ crate-type = ["cdylib", "lib"]
 # Shared dependencies.
 [dependencies]
 # - Mandatory shared dependencies.
-indexmap = { version = "1.6" }
+indexmap = { workspace = true }
 cfg-if = "1.0"
 thiserror = "1.0"
 more-asserts = "0.2"

lib/types/Cargo.toml

@@ -20,7 +20,7 @@ serde = { version = "1.0", features = [
 serde_bytes = { version = "0.11", optional = true }
 thiserror = "1.0"
 more-asserts = "0.2"
-indexmap = { version = "1.6" }
+indexmap = { workspace = true }
 rkyv = { workspace = true }
 enum-iterator = "0.7.0"
 target-lexicon = { version = "0.12.2", default-features = false }
@@ -45,7 +45,7 @@ memoffset.workspace = true
 default = ["std"]
 std = []
 core = []
-enable-serde = ["serde", "serde/std", "serde_bytes", "indexmap/serde-1"]
+enable-serde = ["serde", "serde/std", "serde_bytes", "indexmap/serde"]
 artifact-size = ["dep:loupe"]
 
 [package.metadata.docs.rs]

lib/types/src/module.rs

@@ -193,8 +193,8 @@ pub struct ModuleInfo {
 pub struct ArchivableModuleInfo {
     name: Option<String>,
     hash: Option<ModuleHash>,
-    imports: IndexMap<ImportKey, ImportIndex>,
-    exports: IndexMap<String, ExportIndex>,
+    imports: Vec<(ImportKey, ImportIndex)>,
+    exports: Vec<(String, ExportIndex)>,
     start_function: Option<FunctionIndex>,
     table_initializers: Vec<TableInitializer>,
     passive_elements: BTreeMap<ElemIndex, Box<[FunctionIndex]>>,
@@ -206,7 +206,7 @@ pub struct ArchivableModuleInfo {
     tables: PrimaryMap<TableIndex, TableType>,
     memories: PrimaryMap<MemoryIndex, MemoryType>,
     globals: PrimaryMap<GlobalIndex, GlobalType>,
-    custom_sections: IndexMap<String, CustomSectionIndex>,
+    custom_sections: Vec<(String, CustomSectionIndex)>,
     custom_sections_data: PrimaryMap<CustomSectionIndex, Box<[u8]>>,
     num_imported_functions: usize,
     num_imported_tables: usize,
@@ -219,8 +219,8 @@ impl From<ModuleInfo> for ArchivableModuleInfo {
         Self {
             name: it.name,
             hash: it.hash,
-            imports: it.imports,
-            exports: it.exports,
+            imports: it.imports.into_iter().collect(),
+            exports: it.exports.into_iter().collect(),
             start_function: it.start_function,
             table_initializers: it.table_initializers,
             passive_elements: it.passive_elements.into_iter().collect(),
@@ -232,7 +232,7 @@ impl From<ModuleInfo> for ArchivableModuleInfo {
             tables: it.tables,
             memories: it.memories,
             globals: it.globals,
-            custom_sections: it.custom_sections,
+            custom_sections: it.custom_sections.into_iter().collect(),
             custom_sections_data: it.custom_sections_data,
             num_imported_functions: it.num_imported_functions,
             num_imported_tables: it.num_imported_tables,
@@ -248,8 +248,8 @@ impl From<ArchivableModuleInfo> for ModuleInfo {
             id: Default::default(),
             name: it.name,
             hash: it.hash,
-            imports: it.imports,
-            exports: it.exports,
+            imports: it.imports.into_iter().collect(),
+            exports: it.exports.into_iter().collect(),
             start_function: it.start_function,
             table_initializers: it.table_initializers,
             passive_elements: it.passive_elements.into_iter().collect(),
@@ -261,7 +261,7 @@ impl From<ArchivableModuleInfo> for ModuleInfo {
             tables: it.tables,
             memories: it.memories,
             globals: it.globals,
-            custom_sections: it.custom_sections,
+            custom_sections: it.custom_sections.into_iter().collect(),
             custom_sections_data: it.custom_sections_data,
             num_imported_functions: it.num_imported_functions,
             num_imported_tables: it.num_imported_tables,

lib/vm/Cargo.toml

@@ -17,7 +17,7 @@ memoffset.workspace = true
 dashmap.workspace = true
 wasmer-types.workspace = true
 libc.workspace = true
-indexmap = { version = "1.6" }
+indexmap = { workspace = true }
 thiserror = "1.0"
 more-asserts = "0.2"
 cfg-if = "1.0"
@@ -58,7 +58,7 @@ unexpected_cfgs = { level = "warn", check-cfg = ['cfg(missing_rust_probestack)']
 
 [features]
 default = []
-enable-serde = ["serde", "indexmap/serde-1", "wasmer-types/enable-serde"]
+enable-serde = ["serde", "indexmap/serde", "wasmer-types/enable-serde"]
 artifact-size = ["dep:loupe", "wasmer-types/artifact-size"]
 
 [package.metadata.docs.rs]

rust-toolchain

@@ -1 +1 @@
-1.76
+1.93.1