Skip to content

Rollup of 6 pull requests - #97548

Merged
bors merged 14 commits into
rust-lang:masterfrom
Dylan-DPC:rollup-9x0va1d
May 30, 2022
Merged

Rollup of 6 pull requests#97548
bors merged 14 commits into
rust-lang:masterfrom
Dylan-DPC:rollup-9x0va1d

Conversation

@Dylan-DPC

Copy link
Copy Markdown
Member

Successful merges:

Failed merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

est31and others added 14 commits May 29, 2022 00:41
Co-authored-by: Ross MacArthur <ross@macarthur.io>
Remove dead code
Missing }
./x.py fmt
Remove duplicate check
Recursively remove all usage of help_on_error
The oldest occurence is from 9e224c2,
which is from the pre-1.0 days. In the years since then, std::sys still
hasn't been exported, and the last attempt was met with strong criticism:
rust-lang#97151
Thus, removing the "yet" part makes a lot of sense.
…an-DPC
Use Box::new() instead of box syntax in library tests
The tests inside `library/*` have no reason to use `box` syntax as they have 0 performance relevance. Therefore, we can safely remove them (instead of having to use alternatives like the one in rust-lang#97293).
Remove "sys isn't exported yet" phrase
The oldest occurence is from 9e224c2,
which is from the pre-1.0 days. In the years since then, std::sys still
hasn't been exported, and the last attempt was met with strong criticism:
rust-lang#97151
Thus, removing the "yet" part makes a lot of sense.
Ensure source file present when calculating max line number
Resubmission of rust-lang#89268, fixesrust-lang#71363
The behavior difference of `simulate-remapped-rust-src-base` is not something we should take into account here, so limiting targets to run the test makes sense, I think.
r? `@davidtwco,` and `@estebank,` you might be interested in this change
Re-add help_on_error for download-ci-llvm
Closesrust-lang#97503
- Re-added `help_on_error` for `download_component()` and the downstream functions
- Removed dead code in `bootstrap.py`
Thanks `@jyn514` for the helpful tips!
(first contribution here, please let me know if I missed anything out!)
…ch, r=davidtwco
Note pattern mismatch coming from `for` loop desugaring
Fixesrust-lang#97163
Reword safety comments in core/hash/sip.rs
In https://rust-lang.zulipchat.com/#narrow/stream/136281-t-lang.2Fwg-unsafe-code-guidelines/topic/Is.20there.20any.20way.20to.20soundly.20do.20a.20masked.20out-of-bounds.20read.3F/near/284329248 it came up that this is using an atypical (and somewhat vague) phrasing of the safety requirement, so this slightly rewords it.
@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 30, 2022
@Dylan-DPC

Copy link
Copy Markdown
MemberAuthor

@bors r+ rollup=never p=5

@bors

bors commented May 30, 2022

Copy link
Copy Markdown
Collaborator

📌 Commit a352ad5 has been approved by Dylan-DPC

@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 30, 2022
@bors

bors commented May 30, 2022

Copy link
Copy Markdown
Collaborator

⌛ Testing commit a352ad5 with merge e810f75...

@bors

bors commented May 30, 2022

Copy link
Copy Markdown
Collaborator

☀️ Test successful - checks-actions
Approved by: Dylan-DPC
Pushing e810f75 to master...

@borsbors added the merged-by-bors This PR was explicitly merged by bors. label May 30, 2022
@bors
bors merged commit e810f75 into rust-lang:masterMay 30, 2022
@rustbotrustbot added this to the 1.63.0 milestone May 30, 2022
@rust-timer

Copy link
Copy Markdown
Collaborator

Finished benchmarking commit (e810f75): comparison url.

Instruction count

  • Primary benchmarks: no relevant changes found
  • Secondary benchmarks: 🎉 relevant improvements found
mean1maxcount2
Regressions 😿
(primary)
N/AN/A0
Regressions 😿
(secondary)
N/AN/A0
Improvements 🎉
(primary)
N/AN/A0
Improvements 🎉
(secondary)
-3.1%-3.9%3
All 😿🎉 (primary)N/AN/A0

Max RSS (memory usage)

Results
  • Primary benchmarks: 🎉 relevant improvements found
  • Secondary benchmarks: mixed results
mean1maxcount2
Regressions 😿
(primary)
N/AN/A0
Regressions 😿
(secondary)
2.7%2.7%1
Improvements 🎉
(primary)
-1.9%-2.7%3
Improvements 🎉
(secondary)
-2.7%-2.7%2
All 😿🎉 (primary)-1.9%-2.7%3

Cycles

Results
  • Primary benchmarks: 😿 relevant regressions found
  • Secondary benchmarks: mixed results
mean1maxcount2
Regressions 😿
(primary)
1.8%2.1%3
Regressions 😿
(secondary)
3.7%3.7%1
Improvements 🎉
(primary)
N/AN/A0
Improvements 🎉
(secondary)
-5.6%-5.6%1
All 😿🎉 (primary)1.8%2.1%3

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.

8 participants

@Dylan-DPC@bors@rust-timer@rustbot@est31@JohnTitor@compiler-errors@thomcc