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 #118546

Merged
merged 2 commits into from
Dec 3, 2023
Merged

update hashbrown #118546

merged 2 commits into from
Dec 3, 2023

Conversation

RalfJung
Copy link
Member

@RalfJung RalfJung commented Dec 2, 2023

I had to also pull in an updated syn to make that work, and then cargo pulled in some more package updates.

r? @Amanieu

@rustbot rustbot added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Dec 2, 2023
@rustbot
Copy link
Collaborator

rustbot commented Dec 2, 2023

These commits modify the Cargo.lock file. Unintentional changes to 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.

@rust-log-analyzer

This comment has been minimized.

@rustbot rustbot added A-testsuite Area: The testsuite used to check the correctness of rustc T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) labels Dec 2, 2023
@rustbot
Copy link
Collaborator

rustbot commented Dec 2, 2023

The list of allowed third-party dependencies may have been modified! You must ensure that any new dependencies have compatible licenses before merging.

cc @davidtwco, @wesleywiser

@RalfJung
Copy link
Member Author

RalfJung commented Dec 2, 2023

I have added "BSD-2-Clause OR Apache-2.0 OR MIT" as an allowed license, seeing as the usual "Apache-2.0 OR MIT" is a part of the list of possible licensing options here.

@Amanieu
Copy link
Member

Amanieu commented Dec 2, 2023

@bors r+ rollup=never

@bors
Copy link
Contributor

bors commented Dec 2, 2023

📌 Commit c0c0b5b 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 Dec 2, 2023
@bors
Copy link
Contributor

bors commented Dec 3, 2023

⌛ Testing commit c0c0b5b with merge c786f27...

bors added a commit to rust-lang-ci/rust that referenced this pull request Dec 3, 2023
update hashbrown

I had to also pull in an updated syn to make that work, and then cargo pulled in some more package updates.

r? `@Amanieu`
@rust-log-analyzer
Copy link
Collaborator

The job x86_64-msvc-ext failed! Check out the build log: (web) (plain)

Click to see the possible cause of the failure (guessed by this bot)

@bors
Copy link
Contributor

bors commented Dec 3, 2023

💔 Test failed - checks-actions

@bors bors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Dec 3, 2023
@RalfJung
Copy link
Member Author

RalfJung commented Dec 3, 2023

@bors retry failed to remove file C:\a\rust\rust\build\x86_64-pc-windows-msvc\stage2-tools\x86_64-pc-windows-msvc\tmp\cit\t2934\foo\target\debug\deps\foo-47973d69ee5324f5.exe

@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 Dec 3, 2023
@bors
Copy link
Contributor

bors commented Dec 3, 2023

⌛ Testing commit c0c0b5b with merge 7ceaf19...

@bors
Copy link
Contributor

bors commented Dec 3, 2023

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

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Dec 3, 2023
@bors bors merged commit 7ceaf19 into rust-lang:master Dec 3, 2023
12 checks passed
@rustbot rustbot added this to the 1.76.0 milestone Dec 3, 2023
@bors bors mentioned this pull request Dec 3, 2023
@rust-timer
Copy link
Collaborator

Finished benchmarking commit (7ceaf19): comparison URL.

Overall result: no relevant changes - no action needed

@rustbot label: -perf-regression

Instruction count

This benchmark run did not return any relevant results for this metric.

Max RSS (memory usage)

Results

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)
1.8% [1.8%, 1.8%] 1
Regressions ❌
(secondary)
- - 0
Improvements ✅
(primary)
- - 0
Improvements ✅
(secondary)
-4.5% [-4.5%, -4.5%] 1
All ❌✅ (primary) 1.8% [1.8%, 1.8%] 1

Cycles

This benchmark run did not return any relevant results for this metric.

Binary size

This benchmark run did not return any relevant results for this metric.

Bootstrap: 672.762s -> 672.558s (-0.03%)
Artifact size: 314.09 MiB -> 314.08 MiB (-0.00%)

@RalfJung RalfJung deleted the hashbrown branch December 4, 2023 06:37
tshepang added a commit to ferrocene/ferrocene that referenced this pull request Dec 4, 2023
Puzzling why this fails, seeing that zerocopy and zerocopy-derive
are deps (see rust-lang/rust#118546)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
A-testsuite Area: The testsuite used to check the correctness of rustc 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-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap)
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants