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 5 pull requests #119256

Merged
merged 11 commits into from
Dec 23, 2023
Merged

Rollup of 5 pull requests #119256

merged 11 commits into from
Dec 23, 2023

Conversation

matthiaskrgr
Copy link
Member

Successful merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

Takashiidobe and others added 11 commits December 22, 2023 18:28
…docs, r=compiler-errors

Clairify `ast::PatKind::Struct` presese of `..` by using an enum instead of a bool

The bool is mainly used for when a `..` is present, but it is also set on recovery to avoid errors. The doc comment not describes both of these cases.

See https://github.com/rust-lang/rust/blob/cee794ee98d49b45a55ba225680d98e0c4672736/compiler/rustc_parse/src/parser/pat.rs#L890-L897 for the only place this is constructed.

r? ``@compiler-errors``
…Titor

Fix doc typos

This PR fixes some typos I found while trawling through the rust source.
Improve documentation for using warning blocks in documentation

From [this comment](rust-lang#79710 (comment)), I think markdown can be surprising sometimes so better explain a bit better how to use it correctly.

r? `@notriddle`
…est, r=cjgillot

remove dead inferred outlives testing code

The `test_inferred_outlives` function was never run, because the code that's actually used for the tests was part of the `inferred_outlives_of` query, which ran before `test_inferred_outlives` during type collecting. This PR separates the test code from the query and moves it inside the dedicated function.
…ion, r=Nilstrieb

Add spastorino to users_on_vacation
@rustbot rustbot added A-meta Area: Issues & PRs about the rust-lang/rust repository itself A-testsuite Area: The testsuite used to check the correctness of rustc S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. 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-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue. rollup A PR which is a rollup labels Dec 23, 2023
@matthiaskrgr
Copy link
Member Author

@bors r+ rollup=never p=5

@bors
Copy link
Contributor

bors commented Dec 23, 2023

📌 Commit 2e09941 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 23, 2023
@bors
Copy link
Contributor

bors commented Dec 23, 2023

⌛ Testing commit 2e09941 with merge 5eccfc3...

@bors
Copy link
Contributor

bors commented Dec 23, 2023

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

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Dec 23, 2023
@bors bors merged commit 5eccfc3 into rust-lang:master Dec 23, 2023
12 checks passed
@rustbot rustbot added this to the 1.77.0 milestone Dec 23, 2023
@rust-timer
Copy link
Collaborator

📌 Perf builds for each rolled up PR:

PR# Message Perf Build Sha
#119231 Clairify ast::PatKind::Struct presese of .. by using an… 4ca8e14facc4bd976ec44fb5a161b76e85e703b3 (link)
#119232 Fix doc typos 7d2becd238fb2721b97c1ee34c041afe816c8ba7 (link)
#119245 Improve documentation for using warning blocks in documenta… d9a5dcb387766b24dd74a8cc34caf73d76ac2e3f (link)
#119248 remove dead inferred outlives testing code 93bfd547a8145eb283f3d9ea98624bcf659238b4 (link)
#119249 Add spastorino to users_on_vacation d612e9c7531b070c7b9e95d5b03a29e5bc2897a6 (link)

previous master: edcbcc768a

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

Overall result: ✅ improvements - no action needed

@rustbot label: -perf-regression

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
Regressions ❌
(secondary)
- - 0
Improvements ✅
(primary)
- - 0
Improvements ✅
(secondary)
-0.3% [-0.3%, -0.3%] 1
All ❌✅ (primary) - - 0

Max RSS (memory usage)

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)
3.2% [2.1%, 4.3%] 2
Improvements ✅
(primary)
- - 0
Improvements ✅
(secondary)
- - 0
All ❌✅ (primary) - - 0

Cycles

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

Binary size

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

Bootstrap: 669.674s -> 669.829s (0.02%)
Artifact size: 312.80 MiB -> 312.74 MiB (-0.02%)

@matthiaskrgr matthiaskrgr deleted the rollup-q0q5c1d branch March 16, 2024 18:19
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
A-meta Area: Issues & PRs about the rust-lang/rust repository itself A-testsuite Area: The testsuite used to check the correctness of rustc 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-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.

8 participants