Skip to content

[EXPERIMENT] Test 8-bit tags for hashbrown #146909

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

Draft
wants to merge 1 commit into
base: master
Choose a base branch
from
+15 −6
Draft

[EXPERIMENT] Test 8-bit tags for hashbrown #146909

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
12 changes: 9 additions & 3 deletions library/Cargo.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,12 @@ dependencies = [
"windows-sys",
]

[[package]]
name = "foldhash"
version = "0.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "77ce24cb58228fbb8aa041425bb1050850ac19177686ea6e0f41a70416f56fdb"

[[package]]
name = "fortanix-sgx-abi"
version = "0.6.1"
Expand Down Expand Up @@ -119,10 +125,10 @@ dependencies = [

[[package]]
name = "hashbrown"
version = "0.15.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9229cfe53dfd69f0609a49f65461bd93001ea1ef889cd5529dd176593f5338a1"
version = "0.16.0"
source = "git+https://github.com/gaujay/hashbrown.git?branch=8-bits-tag#fcce069967e957305ec8098c5f1e8280e9ce7c5b"
dependencies = [
"foldhash",
"rustc-std-workspace-alloc",
"rustc-std-workspace-core",
]
Expand Down
2 changes: 1 addition & 1 deletion library/std/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ panic_unwind = { path = "../panic_unwind", optional = true }
panic_abort = { path = "../panic_abort" }
core = { path = "../core", public = true }
unwind = { path = "../unwind" }
hashbrown = { version = "0.15", default-features = false, features = [
hashbrown = { git = "https://github.com/gaujay/hashbrown.git", branch = "8-bits-tag", default-features = false, features = [
'rustc-dep-of-std',
] }
std_detect = { path = "../std_detect", public = true }
Expand Down
4 changes: 2 additions & 2 deletions library/std/src/collections/hash/map.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1051,7 +1051,7 @@ where
K: Borrow<Q>,
Q: Hash + Eq,
{
self.base.get_many_mut(ks)
self.base.get_disjoint_mut(ks)
}

/// Attempts to get mutable references to `N` values in the map at once, without validating that
Expand Down Expand Up @@ -1118,7 +1118,7 @@ where
K: Borrow<Q>,
Q: Hash + Eq,
{
unsafe { self.base.get_many_unchecked_mut(ks) }
unsafe { self.base.get_disjoint_unchecked_mut(ks) }
}

/// Returns `true` if the map contains a value for the specified key.
Expand Down
2 changes: 2 additions & 0 deletions src/tools/tidy/src/deps.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@ const LICENSES: &[&str] = &[
"Unlicense OR MIT",
"Unlicense/MIT",
"Zlib OR Apache-2.0 OR MIT", // tinyvec
"Zlib",
// tidy-alphabetical-end
];

Expand Down Expand Up @@ -559,6 +560,7 @@ const PERMITTED_STDLIB_DEPENDENCIES: &[&str] = &[
"cfg-if",
"compiler_builtins",
"dlmalloc",
"foldhash",
"fortanix-sgx-abi",
"getopts",
"gimli",
Expand Down
1 change: 1 addition & 0 deletions src/tools/tidy/src/extdeps.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ const ALLOWED_SOURCES: &[&str] = &[
r#""registry+https://github.com/rust-lang/crates.io-index""#,
// This is `rust_team_data` used by `site` in src/tools/rustc-perf,
r#""git+https://github.com/rust-lang/team#a5260e76d3aa894c64c56e6ddc8545b9a98043ec""#,
r#""git+https://github.com/gaujay/hashbrown.git?branch=8-bits-tag#fcce069967e957305ec8098c5f1e8280e9ce7c5b""#,
];

/// Checks for external package sources. `root` is the path to the directory that contains the
Expand Down
Loading