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 7 pull requests #105918

Merged
merged 16 commits into from
Dec 20, 2022
Merged

Rollup of 7 pull requests #105918

merged 16 commits into from
Dec 20, 2022

Conversation

matthiaskrgr
Copy link
Member

Successful merges:

Failed merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

zertosh and others added 16 commits December 16, 2022 16:52
Co-authored-by: Guillaume Gomez <guillaume1.gomez@gmail.com>
…r=dtolnay

Realistic `Path::as_mut_os_str` doctest

With "Implement DerefMut for PathBuf" (rust-lang#105018) now merged, it's
possible to exercise `Path::as_mut_os_str` (rust-lang#105002) without going
through `into_boxed_path`.
…, r=jruderman,GuillaumeGomez

Add long error docs for `E0460` and `E0457`

Final docs for errors in rust-lang#61137 that have UI tests, my next PRs will also add these tests.

r? ``@GuillaumeGomez``
Test that we don't add a new kind of breaking change with TAITs

r? ``@lcnr``
…=eholk

docs: improve pin docs

Override rust-lang#104195 with a full cleanup of the git history, now it should be ready to be merged.

r? ``@eholk``

``@rustbot`` label +A-async-await
Update books

## rust-lang/nomicon

1 commits in ae406aa5287a9e025abb72343aaceec98458c117..dd37e21ccee43918ed18a71581bb2af537ffe4fc
2022-12-09 22:04:38 UTC to 2022-12-09 22:04:38 UTC

- Update lifetime-mismatch.md (rust-lang/nomicon#387)

## rust-lang/rust-by-example

3 commits in a9869b4a3c4cac3bc6099b41f088679e268400b8..995df09b65c582eb6290ab7ea5d9485983eb4c37
2022-12-08 23:29:31 UTC to 2022-12-08 23:28:31 UTC

- Add documentation for let-else. (rust-lang/rust-by-example#1640)
- Added missing space in comment (rust-lang/rust-by-example#1644)
- Clean up Chapter 1 (Hello World) (rust-lang/rust-by-example#1650)

## rust-lang/rustc-dev-guide

8 commits in e269950..8b42eb5
2022-12-17 22:41:27 UTC to 2022-12-07 05:42:57 UTC

- Add -Ztrack-diagnostics information (rust-lang/rustc-dev-guide#1506)
- Add documentation for LLVM KCFI support (rust-lang/rustc-dev-guide#1529)
- Replace references to NoLandingPads in MIR pass documents (rust-lang/rustc-dev-guide#1531)
- share same link (rust-lang/rustc-dev-guide#1530)
- chore: Update `actions/github-script` to v6 (rust-lang/rustc-dev-guide#1521)
- fix: Fix broken links (rust-lang/rustc-dev-guide#1522)
- Remove TyS (rust-lang/rustc-dev-guide#1526)
- Fix small inaccuracy in monomorph page (rust-lang/rustc-dev-guide#1525)
… r=GuillaumeGomez

rustdoc: remove width-limiter from source pages, stop overriding CSS
…rm-resumety, r=tmandry

Revert "Replace usage of `ResumeTy` in async lowering with `Context`"

Reverts rust-lang#105250
Fixes: rust-lang#105501

Following instructions from [forge](https://forge.rust-lang.org/compiler/reviews.html#reverts).

This change introduced a breaking change that is not actionable nor relevant, and is blocking updates to our toolchain. Along with other comments on the CL marking issues that are fixed by reverts, reverting is best until these issues can be resolved

cc. `@Swatinem`
@rustbot rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. 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 Dec 19, 2022
@matthiaskrgr
Copy link
Member Author

@bors r+ rollup=never p=7

@bors
Copy link
Contributor

bors commented Dec 19, 2022

📌 Commit 575b2a2 has been approved by matthiaskrgr

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 19, 2022
@lqd
Copy link
Member

lqd commented Dec 19, 2022

Should we lower the priority on this rollup, there's a PR fixing a P-critical in the queue, #105905, or does this one also fix another such high priority issue ?

@Noratrieb
Copy link
Member

Noratrieb commented Dec 19, 2022

If we want to get the revert merged today we should raise its priority instead of lowering the priority of other PRs. The only PR in the rollup that could matter whether we land it now or later is #105501 which is also a regression but that seems to be hit significantly less than the P-critical revert. I think we should raise the priority of that PR to 10.

@lqd
Copy link
Member

lqd commented Dec 19, 2022

I also agree that the revert PR should be higher prio, it's not about lowering other PRs but this rollup in particular, which has p=7 and IIUC the forge documents such >5 prio to be for P-critical issues, hence my question.

@tmandry
Copy link
Member

tmandry commented Dec 20, 2022

Note that #105915 is a revert that fixes #105501, which also meets the criteria for P-critical. It was not marked as such and I think #105905 is probably more important based on the number of issues filed for it.

@bors
Copy link
Contributor

bors commented Dec 20, 2022

⌛ Testing commit 575b2a2 with merge c43bc13...

@bors
Copy link
Contributor

bors commented Dec 20, 2022

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

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

📌 Perf builds for each rolled up PR:

PR# Perf Build Sha
#105915 97eddb81a1acdf4e034ae7265d425e19dae419b8
#105913 6157d095be8503ec44f24557aa791839c31daeee
#105910 f4251155e541b8d384c3560cc9be75b4d23ccf3e
#105902 52aea5d207ebc0ff94ebbdf3163198e313400f70
#105895 2b0f325351164a7784c19172d1cfaefbf584499c
#105860 1f427700b501d04286f1a55dd5cefffcab658d74
#105801 7e62b3f85811cc721ccd0588fe7f8fefbcc1d32a

previous master: 696563efc5

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 (c43bc13): comparison URL.

Overall result: ❌✅ regressions and improvements - ACTION NEEDED

Next Steps: If you can justify the regressions found in this perf run, please indicate this with @rustbot label: +perf-regression-triaged along with sufficient written justification. If you cannot justify the regressions please open an issue or create a new PR that fixes the regressions, add a comment linking to the newly created issue or PR, and then add the perf-regression-triaged label to this PR.

@rustbot label: +perf-regression
cc @rust-lang/wg-compiler-performance

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.2% [0.2%, 0.2%] 1
Regressions ❌
(secondary)
- - 0
Improvements ✅
(primary)
- - 0
Improvements ✅
(secondary)
-2.1% [-4.4%, -0.8%] 12
All ❌✅ (primary) 0.2% [0.2%, 0.2%] 1

Max RSS (memory usage)

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

Cycles

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)
- - 0
Improvements ✅
(primary)
- - 0
Improvements ✅
(secondary)
-2.9% [-5.4%, -1.5%] 12
All ❌✅ (primary) - - 0

@rustbot rustbot added the perf-regression Performance regression. label Dec 20, 2022
@nnethercote
Copy link
Contributor

Just one miniscule regression in a doc result: not a problem.

@rustbot label: +perf-regression-triaged

@rustbot rustbot added the perf-regression-triaged The performance regression has been triaged. label Dec 20, 2022
@matthiaskrgr matthiaskrgr deleted the rollup-mmazd62 branch December 22, 2022 10:47
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. perf-regression Performance regression. perf-regression-triaged The performance regression has been triaged. 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-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.

None yet