Skip to content

Rollup of 7 pull requests #128413

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

Merged
merged 16 commits into from
Jul 31, 2024
Merged

Rollup of 7 pull requests #128413

merged 16 commits into from
Jul 31, 2024

Conversation

matthiaskrgr
Copy link
Member

Successful merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

compiler-errors and others added 16 commits July 29, 2024 14:26
We were already generating the doctests, which should already catch most
issues with our hack around `--test-builder` and `--no-run`.

However, we were not building the result of that transformation, thus
build it for completeness and to ensure the hack may not have produced
something completely broken.

In the worst case, we can revert it.

Signed-off-by: Miguel Ojeda <ojeda@kernel.org>
Since the `rfl` CI job has not had almost any issue for some weeks,
it is a good time to try to increase a bit the scope of what it tests.

The kernel does not use any particular `rustdoc` unstable issue (apart
from the doctests ones) so far, so in principle it should not introduce
extra issues here, and may be a good extra test case for Rust.

In addition, it may help to test new unstable features in the future.

In the worst case, we can revert it.

Signed-off-by: Miguel Ojeda <ojeda@kernel.org>
…ime-binder, r=petrochenkov

Detect non-lifetime binder params shadowing item params

We should check that `for<T>` shadows `T` from an item in the same way that `for<'a>` shadows `'a` from an item.

r? ``@petrochenkov`` since you're familiar w the nuances of rib kinds
…cs, r=Kobzol

CI: rfl: build the generated doctests and documentation

Cc ``@tgross35``
r? ``@Kobzol``
try-job: x86_64-rust-for-linux
…es, r=jieyouxu

Mark `Parser::eat`/`check` methods as `#[must_use]`

These methods return a `bool`, but we probably should either use these values or explicitly throw them away (e.g. when we just want to unconditionally eat a token if it exists).

I changed a few places from `eat` to `expect`, but otherwise I tried to leave a comment explaining why the `eat` was okay.

This also adds a test for the `pattern_type!` macro, which used to silently accept a missing `is` token.
…pietroalbini

the output in stderr expects panic-unwind

r​? ``@pietroalbini``
…mment, r=bjorn3

make `///` doc comments compatible with naked functions

tracking issue: rust-lang#90957

reported in rust-lang#127853 (comment)

it turns out `/// doc comment` and `#[doc = "doc comment"]` are represented differently, at least at the point where we perform the check for what should be allowed. The `///` style doc comment is now also allowed.

r? ``@bjorn3``

cc ``@hsanzg``
cargo-miri: better error when we seem to run inside bootstrap but something is wrong

Cc rust-lang/miri#3775
…jieyouxu

tidy: Fix quote in error message

I noticed that the backticks around the error code wasn't done properly in this string when I was building Rust 1.80.0 and found it is still this way in nightly.  Example:

```
warning: Error code `E0595` needs to have at least one UI test in the `tests/error-codes/` directory`!
warning: Error code E0602`` has a UI test file, but doesn't contain its own error code!
warning: Error code `E0619` needs to have at least one UI test in the `tests/error-codes/` directory`!
```

This commit fixes it to match the other warning strings.
@rustbot rustbot added 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-infra Relevant to the infrastructure team, which will review and decide on the PR/issue. rollup A PR which is a rollup labels Jul 30, 2024
@matthiaskrgr
Copy link
Member Author

@bors r+ rollup=never p=7

@bors
Copy link
Collaborator

bors commented Jul 30, 2024

📌 Commit 42a0cc8 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 Jul 30, 2024
@bors
Copy link
Collaborator

bors commented Jul 30, 2024

⌛ Testing commit 42a0cc8 with merge 249cf71...

@bors
Copy link
Collaborator

bors commented Jul 31, 2024

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

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Jul 31, 2024
@bors bors merged commit 249cf71 into rust-lang:master Jul 31, 2024
7 checks passed
@rustbot rustbot added this to the 1.82.0 milestone Jul 31, 2024
@rust-timer
Copy link
Collaborator

📌 Perf builds for each rolled up PR:

PR# Message Perf Build Sha
#128357 Detect non-lifetime binder params shadowing item params 4822434b0f0ca0288ef808da6084d6400f349326 (link)
#128367 CI: rfl: build the generated doctests and documentation 191347277e31deda8fc64d2b5b48bf205cdbdf95 (link)
#128376 Mark Parser::eat/check methods as #[must_use] 61c9d375755ed3fe33f71520ecc99cd4ef9c8fc6 (link)
#128379 the output in stderr expects panic-unwind f8844e28958693804695ebece0e5bfd8f780751d (link)
#128380 make /// doc comments compatible with naked functions ec3d1ddb887fe1821f406cbb3fa369f4726d1ec8 (link)
#128382 cargo-miri: better error when we seem to run inside bootstr… e6ae6e891ead33f362c656595cc74f5c7dbb4b63 (link)
#128398 tidy: Fix quote in error message 89c2396ec95b7092cd0a292c2bf41dc15fef596f (link)

previous master: f8060d282d

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

Overall result: ❌ regressions - 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.6% [0.2%, 1.9%] 28
Regressions ❌
(secondary)
0.3% [0.2%, 0.4%] 7
Improvements ✅
(primary)
- - 0
Improvements ✅
(secondary)
- - 0
All ❌✅ (primary) 0.6% [0.2%, 1.9%] 28

Max RSS (memory usage)

Results (primary 0.7%)

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

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: 769.587s -> 769.659s (0.01%)
Artifact size: 331.78 MiB -> 331.90 MiB (0.04%)

@rustbot rustbot added the perf-regression Performance regression. label Jul 31, 2024
@Kobzol
Copy link
Contributor

Kobzol commented Aug 6, 2024

Caused by #128357. Perf. should be regained by #128550.

@rustbot label: +perf-regression-triaged

@rustbot rustbot added the perf-regression-triaged The performance regression has been triaged. label Aug 6, 2024
@matthiaskrgr matthiaskrgr deleted the rollup-nrfcvdq branch September 1, 2024 17:35
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
A-testsuite Area: The testsuite used to check the correctness of rustc 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-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-infra Relevant to the infrastructure team, which will review and decide on the PR/issue.
Projects
None yet
Development

Successfully merging this pull request may close these issues.