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

Rollup of 6 pull requests #100540

Merged
merged 14 commits into from
Aug 15, 2022
Merged

Rollup of 6 pull requests #100540

merged 14 commits into from
Aug 15, 2022

Conversation

matthiaskrgr
Copy link
Member

Successful merges:

Failed merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

Meziu and others added 14 commits August 7, 2022 19:30
Recover from mutable variable declaration where `mut` is placed before `let`
In rust-lang#100513 it was shown that the drop behavior of let_chains is not correct
currently. Since drop behavior is something pretty subtle, this adds
explicit tests for the drop behavior of `if`, `if let` and `match` to
make sure that it does not regress in the future.

The `println!`s were left in to make debugging easier in case something
goes wrong, but they are not required for the test.
Fix HorizonOS regression in FileTimes

The changes in rust-lang#98246 caused a regression for multiple Newlib-based systems. This is just a fix including HorizonOS to the list of  targets which require a workaround.

``@AzureMarker`` ``@ian-h-chamberlain``
r? ``@nagisa``
Recover from mutable variable declaration where `mut` is placed before `let`

Closes rust-lang#100197
Add Duration rounding change to release note

one of possible fix of rust-lang#100480

fixes rust-lang#100480
… r=Dylan-DPC

[rustdoc] remove Clean trait

Follow-up of rust-lang#99638.

This is (finally!) the last part.

r? `@Dylan-DPC`
…ild-structs, r=Mark-Simulacrum

Impl `Debug` for some structs of rustbuild

A small patch to impl `Debug` for some structs of rustbuild to make debugging easier.

(I was trying to impl `Debug` for the `Config` struct, but found to have a bit more things to do. So gave up for now.)
Add tests for the drop behavior of some control flow constructs

In rust-lang#100513 it was shown that the drop behaviour of let_chains is not correct currently. Since drop behaviour is something pretty subtle, this adds explicit tests for the drop behavior of `if`, `if let` and `match` to make sure that it does not regress in the future.

The `println!`s were left in to make debugging easier in case something goes wrong, but they are not required for the test.
@rustbot rustbot added T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) 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. T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue. rollup A PR which is a rollup labels Aug 14, 2022
@matthiaskrgr
Copy link
Member Author

@bors r+ rollup=never p=6

@bors
Copy link
Contributor

bors commented Aug 14, 2022

📌 Commit 59795d0 has been approved by matthiaskrgr

It is now in the queue for this repository.

@bors bors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Aug 14, 2022
@bors
Copy link
Contributor

bors commented Aug 14, 2022

⌛ Testing commit 59795d0 with merge b8c0a01...

@bors
Copy link
Contributor

bors commented Aug 15, 2022

☀️ Test successful - checks-actions
Approved by: matthiaskrgr
Pushing b8c0a01 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Aug 15, 2022
@bors bors merged commit b8c0a01 into rust-lang:master Aug 15, 2022
@rustbot rustbot added this to the 1.65.0 milestone Aug 15, 2022
@rust-timer
Copy link
Collaborator

📌 Perf builds for each rolled up PR:

PR# Perf Build Sha
#100526 0a14278721faff60f6c3d7073eeb2ebbca632511
#100524 1679c6913a9fd6cab87ab44a8247e646877f74fb
#100523 4a5dce8b4b7ffa53e271e7100e6cb8a072d9c49b
#100482 19b5814adeee90938646dad967b37ff9baf4f4c9
#100253 4d9d46ab124904bf0b55c5bf0d18ee0446541322
#100249 3de805fa32b36b07325a6fade3f65529d70cfc51

In the case of a perf regression, run the following command for each PR you suspect might be the cause: @rust-timer build $SHA

@rust-timer
Copy link
Collaborator

Finished benchmarking commit (b8c0a01): comparison url.

Instruction count

  • Primary benchmarks: ✅ relevant improvement found
  • Secondary benchmarks: no relevant changes found
mean1 max count2
Regressions ❌
(primary)
- - 0
Regressions ❌
(secondary)
- - 0
Improvements ✅
(primary)
-1.0% -1.0% 1
Improvements ✅
(secondary)
- - 0
All ❌✅ (primary) -1.0% -1.0% 1

Max RSS (memory usage)

Results
  • Primary benchmarks: ❌ relevant regression found
  • Secondary benchmarks: mixed results
mean1 max count2
Regressions ❌
(primary)
2.7% 2.7% 1
Regressions ❌
(secondary)
2.8% 3.3% 2
Improvements ✅
(primary)
- - 0
Improvements ✅
(secondary)
-3.3% -3.3% 1
All ❌✅ (primary) 2.7% 2.7% 1

Cycles

Results
  • Primary benchmarks: mixed results
  • Secondary benchmarks: ✅ relevant improvement found
mean1 max count2
Regressions ❌
(primary)
2.9% 3.7% 2
Regressions ❌
(secondary)
- - 0
Improvements ✅
(primary)
-4.1% -4.1% 1
Improvements ✅
(secondary)
-2.6% -2.6% 1
All ❌✅ (primary) 0.6% -4.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 change 2 3

  2. number of relevant changes 2 3

@matthiaskrgr matthiaskrgr deleted the rollup-734hkpt branch October 9, 2022 00:31
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. rollup A PR which is a rollup 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) 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. T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

10 participants