Skip to content

Rename our OOM-handling IndexMap to TryIndexMap #12725

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 1 commit into from
Mar 9, 2026
+57 −57
Merged

Rename our OOM-handling IndexMap to TryIndexMap #12725

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion crates/environ/src/collections.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ pub use btree_map::BTreeMap;
pub use entity_set::TryEntitySet;
pub use hash_map::TryHashMap;
pub use hash_set::TryHashSet;
pub use index_map::IndexMap;
pub use index_map::TryIndexMap;
pub use primary_map::PrimaryMap;
pub use secondary_map::SecondaryMap;
pub use wasmtime_core::{
Expand Down
58 changes: 29 additions & 29 deletions crates/environ/src/collections/index_map.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,11 @@ use hashbrown::DefaultHashBuilder;

/// A wrapper around [`indexmap::IndexMap`] that only provides fallible
/// allocation.
pub struct IndexMap<K, V, S = DefaultHashBuilder> {
pub struct TryIndexMap<K, V, S = DefaultHashBuilder> {
inner: indexmap::IndexMap<K, V, S>,
}

impl<K, V, S> TryClone for IndexMap<K, V, S>
impl<K, V, S> TryClone for TryIndexMap<K, V, S>
where
K: Eq + Hash + TryClone,
V: TryClone,
Expand All @@ -37,7 +37,7 @@ where
}
}

impl<K, V, S> fmt::Debug for IndexMap<K, V, S>
impl<K, V, S> fmt::Debug for TryIndexMap<K, V, S>
where
K: fmt::Debug,
V: fmt::Debug,
Expand All @@ -48,19 +48,19 @@ where
}
}

impl<K, V, S> From<IndexMap<K, V, S>> for indexmap::IndexMap<K, V, S> {
fn from(map: IndexMap<K, V, S>) -> Self {
impl<K, V, S> From<TryIndexMap<K, V, S>> for indexmap::IndexMap<K, V, S> {
fn from(map: TryIndexMap<K, V, S>) -> Self {
map.inner
}
}

impl<K, V, S> From<indexmap::IndexMap<K, V, S>> for IndexMap<K, V, S> {
impl<K, V, S> From<indexmap::IndexMap<K, V, S>> for TryIndexMap<K, V, S> {
fn from(inner: indexmap::IndexMap<K, V, S>) -> Self {
Self { inner }
}
}

impl<K, V, H> serde::ser::Serialize for IndexMap<K, V, H>
impl<K, V, H> serde::ser::Serialize for TryIndexMap<K, V, H>
where
K: serde::ser::Serialize,
V: serde::ser::Serialize,
Expand All @@ -78,7 +78,7 @@ where
}
}

impl<'de, K, V> serde::de::Deserialize<'de> for IndexMap<K, V>
impl<'de, K, V> serde::de::Deserialize<'de> for TryIndexMap<K, V>
where
K: serde::de::Deserialize<'de> + Hash + Eq,
V: serde::de::Deserialize<'de>,
Expand All @@ -87,14 +87,14 @@ where
where
D: serde::Deserializer<'de>,
{
struct Visitor<K, V>(PhantomData<fn() -> IndexMap<K, V>>);
struct Visitor<K, V>(PhantomData<fn() -> TryIndexMap<K, V>>);

impl<'de, K, V> serde::de::Visitor<'de> for Visitor<K, V>
where
K: serde::de::Deserialize<'de> + Hash + Eq,
V: serde::de::Deserialize<'de>,
{
type Value = IndexMap<K, V>;
type Value = TryIndexMap<K, V>;

fn expecting(&self, f: &mut fmt::Formatter) -> fmt::Result {
f.write_str("an `IndexMap`")
Expand All @@ -106,7 +106,7 @@ where
{
use serde::de::Error as _;

let mut result = IndexMap::<K, V>::new();
let mut result = TryIndexMap::<K, V>::new();

if let Some(len) = map.size_hint() {
result.reserve(len).map_err(|oom| A::Error::custom(oom))?;
Expand All @@ -124,7 +124,7 @@ where
}
}

impl<K, V> IndexMap<K, V> {
impl<K, V> TryIndexMap<K, V> {
/// Same as [`indexmap::IndexMap::new`].
pub fn new() -> Self {
Self {
Expand All @@ -139,7 +139,7 @@ impl<K, V> IndexMap<K, V> {
}
}

impl<K, V, S> IndexMap<K, V, S> {
impl<K, V, S> TryIndexMap<K, V, S> {
/// Same as [`indexmap::IndexMap::with_capacity_and_hasher`] but returns an
/// error on allocation failure.
pub fn with_capacity_and_hasher(n: usize, hash_builder: S) -> Result<Self, OutOfMemory> {
Expand All @@ -150,7 +150,7 @@ impl<K, V, S> IndexMap<K, V, S> {

/// Same as [`indexmap::IndexMap::with_hasher`].
pub const fn with_hasher(hash_builder: S) -> Self {
IndexMap {
TryIndexMap {
inner: indexmap::IndexMap::with_hasher(hash_builder),
}
}
Expand Down Expand Up @@ -279,7 +279,7 @@ impl<K, V, S> IndexMap<K, V, S> {
}
}

impl<K, V, S> IndexMap<K, V, S>
impl<K, V, S> TryIndexMap<K, V, S>
where
K: Hash + Eq,
S: BuildHasher,
Expand Down Expand Up @@ -369,7 +369,7 @@ where
}
}

impl<K, V, S> IndexMap<K, V, S>
impl<K, V, S> TryIndexMap<K, V, S>
where
S: BuildHasher,
{
Expand Down Expand Up @@ -509,7 +509,7 @@ where
}
}

impl<K, V, S> IndexMap<K, V, S> {
impl<K, V, S> TryIndexMap<K, V, S> {
/// Same as [`indexmap::IndexMap::pop`].
pub fn pop(&mut self) -> Option<(K, V)> {
self.inner.pop()
Expand Down Expand Up @@ -712,7 +712,7 @@ impl<K, V, S> IndexMap<K, V, S> {
}
}

impl<K, V, Q, S> Index<&Q> for IndexMap<K, V, S>
impl<K, V, Q, S> Index<&Q> for TryIndexMap<K, V, S>
where
Q: ?Sized + Hash + Eq,
K: Borrow<Q>,
Expand All @@ -725,7 +725,7 @@ where
}
}

impl<K, V, Q, S> IndexMut<&Q> for IndexMap<K, V, S>
impl<K, V, Q, S> IndexMut<&Q> for TryIndexMap<K, V, S>
where
Q: ?Sized + Hash + Eq,
K: Borrow<Q>,
Expand All @@ -736,21 +736,21 @@ where
}
}

impl<K, V, S> Index<usize> for IndexMap<K, V, S> {
impl<K, V, S> Index<usize> for TryIndexMap<K, V, S> {
type Output = V;

fn index(&self, index: usize) -> &V {
&self.inner[index]
}
}

impl<K, V, S> IndexMut<usize> for IndexMap<K, V, S> {
impl<K, V, S> IndexMut<usize> for TryIndexMap<K, V, S> {
fn index_mut(&mut self, index: usize) -> &mut V {
&mut self.inner[index]
}
}

impl<K, V, S> Default for IndexMap<K, V, S>
impl<K, V, S> Default for TryIndexMap<K, V, S>
where
S: Default,
{
Expand All @@ -759,27 +759,27 @@ where
}
}

impl<K, V1, S1, V2, S2> PartialEq<IndexMap<K, V2, S2>> for IndexMap<K, V1, S1>
impl<K, V1, S1, V2, S2> PartialEq<TryIndexMap<K, V2, S2>> for TryIndexMap<K, V1, S1>
where
K: Hash + Eq,
V1: PartialEq<V2>,
S1: BuildHasher,
S2: BuildHasher,
{
fn eq(&self, other: &IndexMap<K, V2, S2>) -> bool {
fn eq(&self, other: &TryIndexMap<K, V2, S2>) -> bool {
&self.inner == &other.inner
}
}

impl<K, V, S> Eq for IndexMap<K, V, S>
impl<K, V, S> Eq for TryIndexMap<K, V, S>
where
K: Eq + Hash,
V: Eq,
S: BuildHasher,
{
}

impl<'a, K, V, S> IntoIterator for &'a IndexMap<K, V, S> {
impl<'a, K, V, S> IntoIterator for &'a TryIndexMap<K, V, S> {
type Item = (&'a K, &'a V);
type IntoIter = inner::Iter<'a, K, V>;

Expand All @@ -788,7 +788,7 @@ impl<'a, K, V, S> IntoIterator for &'a IndexMap<K, V, S> {
}
}

impl<'a, K, V, S> IntoIterator for &'a mut IndexMap<K, V, S> {
impl<'a, K, V, S> IntoIterator for &'a mut TryIndexMap<K, V, S> {
type Item = (&'a K, &'a mut V);
type IntoIter = inner::IterMut<'a, K, V>;

Expand All @@ -797,7 +797,7 @@ impl<'a, K, V, S> IntoIterator for &'a mut IndexMap<K, V, S> {
}
}

impl<K, V, S> IntoIterator for IndexMap<K, V, S> {
impl<K, V, S> IntoIterator for TryIndexMap<K, V, S> {
type Item = (K, V);
type IntoIter = inner::IntoIter<K, V>;

Expand All @@ -813,7 +813,7 @@ mod tests {

#[test]
fn smoke() -> Result<()> {
let mut map = IndexMap::new();
let mut map = TryIndexMap::new();

map.insert("a", 10)?;
map.insert("b", 20)?;
Expand Down
2 changes: 1 addition & 1 deletion crates/environ/src/module.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -304,7 +304,7 @@ pub struct Module {
pub initializers: TryVec<Initializer>,

/// Exported entities.
pub exports: collections::IndexMap<Atom, EntityIndex>,
pub exports: TryIndexMap<Atom, EntityIndex>,

/// The module "start" function, if present.
pub start_func: Option<FuncIndex>,
Expand Down
4 changes: 2 additions & 2 deletions crates/environ/src/prelude.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@
//! and then `use crate::*` works as usual.

pub use crate::collections::{
TryClone, TryCollect, TryEntitySet, TryExtend, TryFromIterator, TryHashMap, TryHashSet, TryNew,
TryString, TryToOwned, TryVec, try_new, try_vec,
TryClone, TryCollect, TryEntitySet, TryExtend, TryFromIterator, TryHashMap, TryHashSet,
TryIndexMap, TryNew, TryString, TryToOwned, TryVec, try_new, try_vec,
};
pub use crate::error::{Context, Error, Result, bail, ensure, format_err};
pub use alloc::borrow::ToOwned;
Expand Down
Loading