Skip to content

Conversation

bjorn3
Copy link
Member

@bjorn3 bjorn3 commented Dec 12, 2022

This fixes builds for Gentoo

This should fix #104866 (cc @stefson)

This fixes builds for Gentoo
@rustbot
Copy link
Collaborator

rustbot commented Dec 12, 2022

r? @Mark-Simulacrum

(rustbot has picked a reviewer for you, use r? to override)

@rustbot rustbot added T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Dec 12, 2022
Comment on lines -5404 to +5403
"cfg-if 1.0.0",
"cfg-if 0.1.10",
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hm, why this changed?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The version specified by twox-hash is ">=0.1, <2". This means both 0.1.10 and 1.0.0 work. Which one is actually used seems to be a matter of luck.

@Mark-Simulacrum
Copy link
Member

@bors r+ rollup=iffy

@bors
Copy link
Collaborator

bors commented Dec 17, 2022

📌 Commit aa1ab51 has been approved by Mark-Simulacrum

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 17, 2022
@bors
Copy link
Collaborator

bors commented Dec 18, 2022

⌛ Testing commit aa1ab51 with merge ff016a5...

@bors
Copy link
Collaborator

bors commented Dec 18, 2022

☀️ Test successful - checks-actions
Approved by: Mark-Simulacrum
Pushing ff016a5 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Dec 18, 2022
@bors bors merged commit ff016a5 into rust-lang:master Dec 18, 2022
@rustbot rustbot added this to the 1.68.0 milestone Dec 18, 2022
@rust-timer
Copy link
Collaborator

Finished benchmarking commit (ff016a5): comparison URL.

Overall result: ❌✅ regressions and 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)
1.5% [1.0%, 1.9%] 2
Improvements ✅
(primary)
- - 0
Improvements ✅
(secondary)
-1.1% [-1.1%, -1.1%] 1
All ❌✅ (primary) - - 0

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)
- - 0
Regressions ❌
(secondary)
2.1% [1.4%, 3.0%] 4
Improvements ✅
(primary)
- - 0
Improvements ✅
(secondary)
-1.5% [-3.3%, -1.0%] 5
All ❌✅ (primary) - - 0

Cycles

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

@bjorn3 bjorn3 deleted the update_crossbeam branch December 18, 2022 08:15
Aaron1011 pushed a commit to Aaron1011/rust that referenced this pull request Jan 6, 2023
…lacrum

Update crossbeam

This fixes builds for Gentoo

This should fix rust-lang#104866 (cc `@stefson)`
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-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.

please update crossbeam crates to fix compile for custom -vendor- rust targets
6 participants