Skip to content

Rollup of 10 pull requests - #98375

Merged
bors merged 21 commits into
rust-lang:masterfrom
JohnTitor:rollup-e5c6rgo
Jun 22, 2022
Merged

Rollup of 10 pull requests#98375
bors merged 21 commits into
rust-lang:masterfrom
JohnTitor:rollup-e5c6rgo

Conversation

@JohnTitor

Copy link
Copy Markdown
Member

Successful merges:

Failed merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

RalfJungand others added 21 commits May 29, 2022 13:29
fix tidy checks and correct cpu-usage-over-time-plot script
Co-authored-by: Josh Triplett <josh@joshtriplett.org>
Co-Authored-By: Joshua Nelson <github@jyn.dev>
Co-Authored-By: Eric Huss <eric@huss.org>
update CPU usage script
I've made slight changes to the CPU usage plot script with updated links from the [ci2 aws instance](https://rust-lang-ci2.s3.amazonaws.com/).
…mulacrum
Add release notes for 1.62
cc ``@rust-lang/release``
r? ``@pietroalbini``
clarify how Rust atomics correspond to C++ atomics
``@cbeuw`` noted in rust-lang/miri#1963 that the correspondence between C++ atomics and Rust atomics is not quite as obvious as one might think, since in Rust I can use `get_mut` to treat previously non-atomic data as atomic. However, I think using C++20 `atomic_ref`, we can establish a suitable relation between the two -- or do you see problems with that ``@cbeuw?`` (I recall you said there was some issue, but it was deep inside that PR and Github makes it impossible to find...)
Cc ``@thomcc;`` not sure whom else to ping for atomic memory model things.
… r=oli-obk
Point at return expression for RPIT-related error
Certainly this needs some diagnostic refining, but I wanted to show that it was possible first and foremost. Not sure if this is the right approach. Open to feedback.
Fixesrust-lang#80583
Simplify `likely!` and `unlikely!` macro
The corresponding intrinsics have long been safe-to-call, so the unsafe block is no longer needed.
…r=Mark-Simulacrum
Add some tests for impossible bounds
Adds test for rust-lang#93008
Adds test for rust-lang#94680Closesrust-lang#94999Closesrust-lang#95640
…huss
Document unstable `--extern` options
These are needed for Cargo's `build-std` feature and for anyone who wanted to do a similar thing outside of Cargo.
…omcc
remove use of &Alloc in btree tests
I missed these in rust-lang#98233.
r? ``@thomcc``
@rustbotrustbot added 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. rollup A PR which is a rollup labels Jun 22, 2022
@JohnTitor

Copy link
Copy Markdown
MemberAuthor

@bors r+ p=10 rollup=never

@bors

bors commented Jun 22, 2022

Copy link
Copy Markdown
Collaborator

📌 Commit db64923 has been approved by JohnTitor

@borsbors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Jun 22, 2022
@bors

bors commented Jun 22, 2022

Copy link
Copy Markdown
Collaborator

⌛ Testing commit db64923 with merge 89a0783...

@bors

bors commented Jun 22, 2022

Copy link
Copy Markdown
Collaborator

☀️ Test successful - checks-actions
Approved by: JohnTitor
Pushing 89a0783 to master...

@borsbors added the merged-by-bors This PR was explicitly merged by bors. label Jun 22, 2022
@bors
bors merged commit 89a0783 into rust-lang:masterJun 22, 2022
@rustbotrustbot added this to the 1.63.0 milestone Jun 22, 2022
@JohnTitor
JohnTitor deleted the rollup-e5c6rgo branch June 22, 2022 10:50
@rust-timer

Copy link
Copy Markdown
Collaborator

Finished benchmarking commit (89a0783): comparison url.

Instruction count

  • Primary benchmarks: 🎉 relevant improvement found
  • Secondary benchmarks: 😿 relevant regressions found
mean1maxcount2
Regressions 😿
(primary)
N/AN/A0
Regressions 😿
(secondary)
0.3%0.3%2
Improvements 🎉
(primary)
-0.2%-0.2%1
Improvements 🎉
(secondary)
N/AN/A0
All 😿🎉 (primary)-0.2%-0.2%1

Max RSS (memory usage)

Results
  • Primary benchmarks: no relevant changes found
  • Secondary benchmarks: mixed results
mean1maxcount2
Regressions 😿
(primary)
N/AN/A0
Regressions 😿
(secondary)
2.9%3.6%4
Improvements 🎉
(primary)
N/AN/A0
Improvements 🎉
(secondary)
-2.5%-3.0%2
All 😿🎉 (primary)N/AN/A0

Cycles

Results
  • Primary benchmarks: 🎉 relevant improvement found
  • Secondary benchmarks: 🎉 relevant improvement found
mean1maxcount2
Regressions 😿
(primary)
N/AN/A0
Regressions 😿
(secondary)
N/AN/A0
Improvements 🎉
(primary)
-2.2%-2.2%1
Improvements 🎉
(secondary)
-2.2%-2.2%1
All 😿🎉 (primary)-2.2%-2.2%1

If you disagree with this performance assessment, please file an issue in rust-lang/rustc-perf.

@rustbot label: -perf-regression

Footnotes

  1. the arithmetic mean of the percent change23

  2. number of relevant changes23

Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

merged-by-borsThis PR was explicitly merged by bors.rollupA PR which is a rollupS-waiting-on-borsStatus: Waiting on bors to run and complete tests. Bors will change the label on completion.T-compilerRelevant to the compiler team, which will review and decide on the PR/issue.T-libsRelevant 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.

12 participants

@JohnTitor@bors@rust-timer@rustbot@RalfJung@nbdd0121@Mark-Simulacrum@m-ou-se@seanpray@lucasthormann@compiler-errors@ChrisDenton