Skip to content
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.

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

chore: update dependencies #161

Merged
merged 1 commit into from
Dec 8, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
95 changes: 57 additions & 38 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ derive_builder = "0.20.2"
derive_more = { version = "1.0", features = ["full"] }
match_cfg = "0.1"
strum = "0.26"
thiserror = "1.0"
thiserror = ">=1.0"

# parallel
parking_lot = "0.12"
Expand Down
13 changes: 5 additions & 8 deletions crates/data-structures/src/map.rs
Original file line number Diff line number Diff line change
@@ -1,10 +1,7 @@
//! Map types.

use indexmap::{IndexMap, IndexSet};
use std::{
collections::{HashMap, HashSet},
hash::BuildHasherDefault,
};
use std::collections::{HashMap, HashSet};

pub use rustc_hash::{self, FxBuildHasher, FxHasher};

Expand All @@ -14,10 +11,10 @@ pub type StdEntry<'a, K, V> = std::collections::hash_map::Entry<'a, K, V>;
pub type IndexEntry<'a, K, V> = indexmap::map::Entry<'a, K, V>;

/// A [`HashMap`] using [`FxHasher`] as its hasher.
pub type FxHashMap<K, V> = HashMap<K, V, BuildHasherDefault<FxHasher>>;
pub type FxHashMap<K, V> = HashMap<K, V, FxBuildHasher>;
/// A [`HashSet`] using [`FxHasher`] as its hasher.
pub type FxHashSet<V> = HashSet<V, BuildHasherDefault<FxHasher>>;
pub type FxHashSet<V> = HashSet<V, FxBuildHasher>;
/// An [`IndexMap`] using [`FxHasher`] as its hasher.
pub type FxIndexMap<K, V> = IndexMap<K, V, BuildHasherDefault<FxHasher>>;
pub type FxIndexMap<K, V> = IndexMap<K, V, FxBuildHasher>;
/// An [`IndexSet`] using [`FxHasher`] as its hasher.
pub type FxIndexSet<V> = IndexSet<V, BuildHasherDefault<FxHasher>>;
pub type FxIndexSet<V> = IndexSet<V, FxBuildHasher>;
2 changes: 1 addition & 1 deletion crates/interface/src/source_map/file_resolver.rs
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ pub enum ResolveError {
ReadFile(PathBuf, #[source] io::Error),
#[error("file {0} not found")]
NotFound(PathBuf),
#[error("multiple files match {0}: {}", _1.iter().map(|f| f.name.display()).format(", "))]
#[error("multiple files match {}: {}", .0.display(), .1.iter().map(|f| f.name.display()).format(", "))]
MultipleMatches(PathBuf, Vec<Arc<SourceFile>>),
}

Expand Down
6 changes: 3 additions & 3 deletions crates/interface/src/symbol.rs
Original file line number Diff line number Diff line change
Expand Up @@ -417,12 +417,12 @@ impl LassoInterner {
unsafe impl lasso::Key for Symbol {
#[inline]
fn into_usize(self) -> usize {
self.as_u32() as usize
self.0.index()
}

#[inline]
fn try_from_usize(int: usize) -> Option<Self> {
int.try_into().ok().map(Self::new)
fn try_from_usize(value: usize) -> Option<Self> {
BaseIndex32::try_from_usize(value).map(Self)
}
}

Expand Down
Loading