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

Update hashbrown to 0.15 and adjust some methods #131148

Merged
merged 3 commits into from
Oct 3, 2024

Conversation

Urgau
Copy link
Member

@Urgau Urgau commented Oct 2, 2024

This PR updates hashbrown to 0.15 in the standard library and adjust some methods as well as removing some as they no longer exists in Hashbrown it-self.

  • HashMap::get_many_mut change API to return array-of-Option
  • HashMap::{replace_entry, replace_key} are removed, FCP close already finished
  • HashSet::get_or_insert_owned is removed as it no longer exists in hashbrown

Closes #44286
r? @Amanieu

as well as removing some from std as they no longer
exists in Hashbrown it-self.
@rustbot rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. T-libs Relevant to the library team, which will review and decide on the PR/issue. labels Oct 2, 2024
@rustbot
Copy link
Collaborator

rustbot commented Oct 2, 2024

These commits modify the library/Cargo.lock file. Unintentional changes to library/Cargo.lock can be introduced when switching branches and rebasing PRs.

If this was unintentional then you should revert the changes before this PR is merged.
Otherwise, you can ignore this comment.

@Amanieu
Copy link
Member

Amanieu commented Oct 2, 2024

@bors try @rust-timer queue

@rust-timer

This comment has been minimized.

@rustbot rustbot added the S-waiting-on-perf Status: Waiting on a perf run to be completed. label Oct 2, 2024
bors added a commit to rust-lang-ci/rust that referenced this pull request Oct 2, 2024
Update hashbrown to 0.15 and adjust some methods

This PR updates `hashbrown` to 0.15 in the standard library and adjust some methods as well as removing some as they no longer exists in Hashbrown it-self.

 - `HashMap::get_many_mut` change API to return array-of-Option
 - `HashMap::{replace_entry, replace_key}` are removed, FCP close [already finished](rust-lang#44286 (comment))
 - `HashSet::get_or_insert_owned` is removed as it no longer exists in hashbrown

Closes rust-lang#44286
r? `@Amanieu`
@bors
Copy link
Contributor

bors commented Oct 2, 2024

⌛ Trying commit 37e1c95 with merge 7bc39e0...

@rust-log-analyzer

This comment has been minimized.

@bors
Copy link
Contributor

bors commented Oct 2, 2024

☀️ Try build successful - checks-actions
Build commit: 7bc39e0 (7bc39e05a5b0e41e60760602eb0b3bb4ef119dbd)

@rust-timer

This comment has been minimized.

@rust-timer
Copy link
Collaborator

Finished benchmarking commit (7bc39e0): comparison URL.

Overall result: ✅ improvements - no action needed

Benchmarking this pull request likely means that it is perf-sensitive, so we're automatically marking it as not fit for rolling up. While you can manually mark this PR as fit for rollup, we strongly recommend not doing so since this PR may lead to changes in compiler perf.

@bors rollup=never
@rustbot label: -S-waiting-on-perf -perf-regression

Instruction count

This is a highly reliable metric that was used to determine the overall result at the top of this comment.

mean range count
Regressions ❌
(primary)
- - 0
Regressions ❌
(secondary)
- - 0
Improvements ✅
(primary)
-0.1% [-0.2%, -0.1%] 2
Improvements ✅
(secondary)
-0.2% [-0.3%, -0.1%] 12
All ❌✅ (primary) -0.1% [-0.2%, -0.1%] 2

Max RSS (memory usage)

Results (primary 2.3%, secondary 0.3%)

This is a less reliable metric that may be of interest but was not used to determine the overall result at the top of this comment.

mean range count
Regressions ❌
(primary)
4.1% [2.1%, 6.4%] 3
Regressions ❌
(secondary)
2.3% [2.1%, 2.4%] 2
Improvements ✅
(primary)
-3.4% [-3.4%, -3.4%] 1
Improvements ✅
(secondary)
-3.7% [-3.7%, -3.7%] 1
All ❌✅ (primary) 2.3% [-3.4%, 6.4%] 4

Cycles

Results (secondary -3.0%)

This is a less reliable metric that may be of interest but was not used to determine the overall result at the top of this comment.

mean range count
Regressions ❌
(primary)
- - 0
Regressions ❌
(secondary)
- - 0
Improvements ✅
(primary)
- - 0
Improvements ✅
(secondary)
-3.0% [-3.0%, -3.0%] 1
All ❌✅ (primary) - - 0

Binary size

Results (primary 0.0%)

This is a less reliable metric that may be of interest but was not used to determine the overall result at the top of this comment.

mean range count
Regressions ❌
(primary)
0.1% [0.0%, 0.2%] 32
Regressions ❌
(secondary)
- - 0
Improvements ✅
(primary)
-0.2% [-0.5%, -0.1%] 8
Improvements ✅
(secondary)
- - 0
All ❌✅ (primary) 0.0% [-0.5%, 0.2%] 40

Bootstrap: 772.38s -> 769.018s (-0.44%)
Artifact size: 341.55 MiB -> 341.59 MiB (0.01%)

@rustbot rustbot removed the S-waiting-on-perf Status: Waiting on a perf run to be completed. label Oct 2, 2024
@Amanieu
Copy link
Member

Amanieu commented Oct 2, 2024

@bors r+

@bors
Copy link
Contributor

bors commented Oct 2, 2024

📌 Commit a923fc0 has been approved by Amanieu

It is now in the queue for this repository.

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Oct 2, 2024
@bors
Copy link
Contributor

bors commented Oct 3, 2024

⌛ Testing commit a923fc0 with merge ad9c494...

@bors
Copy link
Contributor

bors commented Oct 3, 2024

☀️ Test successful - checks-actions
Approved by: Amanieu
Pushing ad9c494 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Oct 3, 2024
@bors bors merged commit ad9c494 into rust-lang:master Oct 3, 2024
7 checks passed
@rustbot rustbot added this to the 1.83.0 milestone Oct 3, 2024
@rust-timer
Copy link
Collaborator

Finished benchmarking commit (ad9c494): comparison URL.

Overall result: ✅ improvements - no action needed

@rustbot label: -perf-regression

Instruction count

This is a highly reliable metric that was used to determine the overall result at the top of this comment.

mean range count
Regressions ❌
(primary)
- - 0
Regressions ❌
(secondary)
- - 0
Improvements ✅
(primary)
-0.2% [-0.2%, -0.1%] 2
Improvements ✅
(secondary)
-0.3% [-2.3%, -0.1%] 14
All ❌✅ (primary) -0.2% [-0.2%, -0.1%] 2

Max RSS (memory usage)

Results (primary 0.5%, secondary -4.2%)

This is a less reliable metric that may be of interest but was not used to determine the overall result at the top of this comment.

mean range count
Regressions ❌
(primary)
3.0% [1.2%, 5.0%] 4
Regressions ❌
(secondary)
- - 0
Improvements ✅
(primary)
-3.0% [-4.8%, -1.0%] 3
Improvements ✅
(secondary)
-4.2% [-4.2%, -4.2%] 1
All ❌✅ (primary) 0.5% [-4.8%, 5.0%] 7

Cycles

Results (secondary -0.8%)

This is a less reliable metric that may be of interest but was not used to determine the overall result at the top of this comment.

mean range count
Regressions ❌
(primary)
- - 0
Regressions ❌
(secondary)
2.1% [2.1%, 2.1%] 1
Improvements ✅
(primary)
- - 0
Improvements ✅
(secondary)
-2.2% [-2.4%, -2.1%] 2
All ❌✅ (primary) - - 0

Binary size

Results (primary 0.0%)

This is a less reliable metric that may be of interest but was not used to determine the overall result at the top of this comment.

mean range count
Regressions ❌
(primary)
0.1% [0.0%, 0.2%] 35
Regressions ❌
(secondary)
- - 0
Improvements ✅
(primary)
-0.2% [-0.5%, -0.1%] 8
Improvements ✅
(secondary)
- - 0
All ❌✅ (primary) 0.0% [-0.5%, 0.2%] 43

Bootstrap: 772.337s -> 772.767s (0.06%)
Artifact size: 341.90 MiB -> 341.94 MiB (0.01%)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
merged-by-bors This PR was explicitly merged by bors. S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. T-libs Relevant to the library team, which will review and decide on the PR/issue.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Tracking issue for HashMap OccupiedEntry::{replace_key, replace_entry}
6 participants