Skip to content

Commit cc4917a

Browse files
authored
[21.0.x] Remove unused import (#9405)
* Remove unused import Fix CI after recent merge * Fix test annotations from recent merge Fixing CI for an upcoming security release * Ignore new tests on miri
1 parent c1ec3f7 commit cc4917a

File tree

2 files changed

+10
-6
lines changed

2 files changed

+10
-6
lines changed

crates/wasmtime/src/runtime/type_registry.rs

+3-4
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,9 @@ use core::{
2020
};
2121
use hashbrown::{HashMap, HashSet};
2222
use wasmtime_environ::{
23-
iter_entity_range,
24-
packed_option::{PackedOption, ReservedValue},
25-
EngineOrModuleTypeIndex, ModuleInternedTypeIndex, ModuleTypes, PrimaryMap, SecondaryMap,
26-
TypeTrace, VMSharedTypeIndex, WasmRecGroup, WasmSubType,
23+
iter_entity_range, packed_option::ReservedValue, EngineOrModuleTypeIndex,
24+
ModuleInternedTypeIndex, ModuleTypes, PrimaryMap, SecondaryMap, TypeTrace, VMSharedTypeIndex,
25+
WasmRecGroup, WasmSubType,
2726
};
2827
use wasmtime_slab::{Id as SlabId, Slab};
2928

tests/all/module.rs

+7-2
Original file line numberDiff line numberDiff line change
@@ -304,6 +304,7 @@ fn call_indirect_caching_out_of_bounds_table_index() -> Result<()> {
304304
/// Smoke test for registering and unregistering modules (and their rec group
305305
/// entries) concurrently.
306306
#[test]
307+
#[cfg_attr(miri, ignore)]
307308
fn concurrent_type_registry_modifications() -> Result<()> {
308309
let _ = env_logger::try_init();
309310

@@ -449,12 +450,16 @@ fn concurrent_type_registry_modifications() -> Result<()> {
449450
Ok(())
450451
}
451452

452-
#[wasmtime_test(wasm_features(function_references))]
453-
fn concurrent_type_modifications_and_checks(config: &mut Config) -> Result<()> {
453+
#[test]
454+
#[cfg_attr(miri, ignore)]
455+
fn concurrent_type_modifications_and_checks() -> Result<()> {
454456
const THREADS_CHECKING: usize = 4;
455457

456458
let _ = env_logger::try_init();
457459

460+
let mut config = Config::new();
461+
config.wasm_function_references(true);
462+
458463
let engine = Engine::new(&config)?;
459464

460465
let mut threads = Vec::new();

0 commit comments

Comments
 (0)