Skip to content

Commit

Permalink
[21.0.x] Remove unused import (#9405)
Browse files Browse the repository at this point in the history
* 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
  • Loading branch information
alexcrichton authored Oct 9, 2024
1 parent c1ec3f7 commit cc4917a
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 6 deletions.
7 changes: 3 additions & 4 deletions crates/wasmtime/src/runtime/type_registry.rs
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,9 @@ use core::{
};
use hashbrown::{HashMap, HashSet};
use wasmtime_environ::{
iter_entity_range,
packed_option::{PackedOption, ReservedValue},
EngineOrModuleTypeIndex, ModuleInternedTypeIndex, ModuleTypes, PrimaryMap, SecondaryMap,
TypeTrace, VMSharedTypeIndex, WasmRecGroup, WasmSubType,
iter_entity_range, packed_option::ReservedValue, EngineOrModuleTypeIndex,
ModuleInternedTypeIndex, ModuleTypes, PrimaryMap, SecondaryMap, TypeTrace, VMSharedTypeIndex,
WasmRecGroup, WasmSubType,
};
use wasmtime_slab::{Id as SlabId, Slab};

Expand Down
9 changes: 7 additions & 2 deletions tests/all/module.rs
Original file line number Diff line number Diff line change
Expand Up @@ -304,6 +304,7 @@ fn call_indirect_caching_out_of_bounds_table_index() -> Result<()> {
/// Smoke test for registering and unregistering modules (and their rec group
/// entries) concurrently.
#[test]
#[cfg_attr(miri, ignore)]
fn concurrent_type_registry_modifications() -> Result<()> {
let _ = env_logger::try_init();

Expand Down Expand Up @@ -449,12 +450,16 @@ fn concurrent_type_registry_modifications() -> Result<()> {
Ok(())
}

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

let _ = env_logger::try_init();

let mut config = Config::new();
config.wasm_function_references(true);

let engine = Engine::new(&config)?;

let mut threads = Vec::new();
Expand Down

0 comments on commit cc4917a

Please sign in to comment.