Skip to content

Rollup of 5 pull requests - #97342

Merged
bors merged 11 commits into
rust-lang:masterfrom
JohnTitor:rollup-zqxctaw
May 24, 2022
Merged

Rollup of 5 pull requests#97342
bors merged 11 commits into
rust-lang:masterfrom
JohnTitor:rollup-zqxctaw

Conversation

@JohnTitor

Copy link
Copy Markdown
Member

Successful merges:

Failed merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

TaKO8Kiand others added 11 commits May 21, 2022 12:55
I don't know why anyone would turn this off; doing so makes builds much slower (nearly a 60x slowdown according to rust-lang#49057).
Remove the option to do so, which makes bootstrap a little easier to maintain.
Bootstrap continues to allow you to manage submodules manually by setting `submodules = false`.
…on-variables, r=compiler-errors
Typo suggestion for a variable with a name similar to struct fields
closesrust-lang#97133
…rk-Simulacrum
Lifetime variance fixes for clippy
rust-lang#97287 migrates rustc to a `Ty` type that is invariant over its lifetime `'tcx`, so I need to fix a bunch of places that assume that `Ty<'a>` and `Ty<'b>` can be shortened to some common lifetime.
This is doable, since everything is already `'tcx`, so all this PR does is be a bit more explicit that elided lifetimes are actually `'tcx`.
Split out from rust-lang#97287 so the clippy team can review independently.
…lacrum
Turn on `fast_submodules` unconditionally
I don't know why anyone would turn this off; doing so makes builds much slower (nearly a 60x slowdown according to rust-lang#49057).
Remove the option to do so, which makes bootstrap a little easier to maintain.
Bootstrap continues to allow you to manage submodules manually by setting `submodules = false`.
…ed, r=Mark-Simulacrum
Fix stabilization version of `Ipv6Addr::to_ipv4_mapped`
@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 May 24, 2022
@JohnTitor

Copy link
Copy Markdown
MemberAuthor

@bors r+ p=5 rollup=never

@bors

bors commented May 24, 2022

Copy link
Copy Markdown
Collaborator

📌 Commit a1cbf66 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 May 24, 2022
@bors

bors commented May 24, 2022

Copy link
Copy Markdown
Collaborator

⌛ Testing commit a1cbf66 with merge acb5c16...

@bors

bors commented May 24, 2022

Copy link
Copy Markdown
Collaborator

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

@borsbors added the merged-by-bors This PR was explicitly merged by bors. label May 24, 2022
@bors
bors merged commit acb5c16 into rust-lang:masterMay 24, 2022
@rustbotrustbot added this to the 1.63.0 milestone May 24, 2022
@borsbors mentioned this pull request May 24, 2022
@JohnTitor
JohnTitor deleted the rollup-zqxctaw branch May 24, 2022 08:04
@rust-timer

Copy link
Copy Markdown
Collaborator

Finished benchmarking commit (acb5c16): comparison url.

Instruction count

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

Max RSS (memory usage)

Results
  • Primary benchmarks: no relevant changes found
  • Secondary benchmarks: mixed results
Regressions 😿
(primary)
Regressions 😿
(secondary)
Improvements 🎉
(primary)
Improvements 🎉
(secondary)
All 😿 🎉
(primary)
count103010
mean2N/A2.3%N/A-3.2%N/A
maxN/A2.6%N/A-3.2%N/A

Cycles

Results
  • Primary benchmarks: no relevant changes found
  • Secondary benchmarks: 🎉 relevant improvement found
Regressions 😿
(primary)
Regressions 😿
(secondary)
Improvements 🎉
(primary)
Improvements 🎉
(secondary)
All 😿 🎉
(primary)
count100010
mean2N/AN/AN/A-8.0%N/A
maxN/AN/AN/A-8.0%N/A

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

@rustbot label: -perf-regression

Footnotes

  1. number of relevant changes2

  2. the arithmetic mean of the percent change2

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.

9 participants

@JohnTitor@bors@rust-timer@rustbot@TaKO8Ki@compiler-errors@tshepang@tbu-@jyn514