Skip to content

Move StringPool to wasmtime-environ #12562

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
fitzgen merged 3 commits into from
Feb 11, 2026
+8 −6
Merged

Move StringPool to wasmtime-environ #12562

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
91cc71a
Move `StringPool` to `wasmtime-environ`
fitzgen Feb 10, 2026
721704c
Remove old location's `mod` declaration
fitzgen Feb 10, 2026
3aabff4
always implement TryClone for hashbrown::DefaultHashBuilder
fitzgen Feb 11, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion crates/core/src/alloc/try_clone.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,6 @@ impl_try_clone_via_clone! {
std::hash::RandomState
}

#[cfg(not(feature = "std"))]
impl_try_clone_via_clone! {
hashbrown::DefaultHashBuilder
}
2 changes: 2 additions & 0 deletions crates/environ/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ mod ref_bits;
mod scopevec;
mod stack_map;
mod stack_switching;
mod string_pool;
mod trap_encoding;
mod tunables;
mod types;
Expand All @@ -57,6 +58,7 @@ pub use crate::ref_bits::*;
pub use crate::scopevec::ScopeVec;
pub use crate::stack_map::*;
pub use crate::stack_switching::*;
pub use crate::string_pool::{Atom, StringPool};
pub use crate::trap_encoding::*;
pub use crate::tunables::*;
pub use crate::types::*;
Expand Down
7 changes: 5 additions & 2 deletions crates/wasmtime/src/runtime/string_pool.rs → crates/environ/src/string_pool.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,12 @@
//! Simple string interning.

use crate::{error::OutOfMemory, prelude::*};
use crate::{
collections::{HashMap, String, Vec},
error::OutOfMemory,
prelude::*,
};
use core::{fmt, mem, num::NonZeroU32};
use wasmtime_core::alloc::TryClone;
use wasmtime_environ::collections::{HashMap, String, Vec};

/// A pool of interned strings.
///
Expand Down
1 change: 0 additions & 1 deletion crates/wasmtime/src/runtime.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,6 @@ pub(crate) mod module;
pub(crate) mod native_debug;
pub(crate) mod resources;
pub(crate) mod store;
pub(crate) mod string_pool;
pub(crate) mod trampoline;
pub(crate) mod trap;
pub(crate) mod type_registry;
Expand Down
3 changes: 1 addition & 2 deletions crates/wasmtime/src/runtime/linker.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
use crate::error::OutOfMemory;
use crate::func::HostFunc;
use crate::instance::InstancePre;
use crate::runtime::string_pool::{Atom, StringPool};
use crate::store::StoreOpaque;
use crate::{
AsContext, AsContextMut, Caller, Engine, Extern, ExternType, Func, FuncType, ImportType,
Expand All @@ -15,7 +14,7 @@ use core::marker;
use core::mem::MaybeUninit;
use log::warn;
use wasmtime_environ::{
PanicOnOom as _,
Atom, PanicOnOom as _, StringPool,
collections::{HashMap, TryClone},
};

Expand Down