Skip to content

Rollup of 5 pull requests - #119421

Merged
bors merged 14 commits into
rust-lang:masterfrom
matthiaskrgr:rollup-dbera1b
Dec 30, 2023
Merged

Rollup of 5 pull requests#119421
bors merged 14 commits into
rust-lang:masterfrom
matthiaskrgr:rollup-dbera1b

Conversation

@matthiaskrgr

Copy link
Copy Markdown
Member

Successful merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

Enselicand others added 14 commits December 28, 2023 19:46
So we can apply more kinds of lints to added lints without having to add
another parameter.
Prevent multiple 'ignored unless specified at crate level' lints. The
multiplication happens because we run the same lint three times:
* In BuiltinCombinedEarlyLintPass
* In BuiltinCombinedPreExpansionLintPass
* In shallow_lint_levels_on
Only run the lint one time by checking the `lint_added_lints` bool.
because on a cursory read it's easy to miss that the limit is
in terms of bytes not no. of elements. The italics should help
with that.
…y, r=cjgillot
Couple of random coroutine pass simplifications
Just aesthetic changes, except for a random `Ty::new_task_context(tcx)` call that was redundant.
…uviper
Italicise "bytes" in the docs of some `Vec` methods
On a cursory read it's easy to miss that the limit is in terms of bytes not no. of elements. The italics should help with that.
Fixesrust-lang#119149
… r=cjgillot
rustc_lint: Prevent triplication of various lints
Prevent triplication of various lints. The triplication happens because we run the same lint three times (or less in some cases):
* In `BuiltinCombinedPreExpansionLintPass`
* In `BuiltinCombinedEarlyLintPass`
* In `shallow_lint_levels_on()`
Only run the lints one time by checking the `lint_added_lints` bool.
Set your GitHub diff setting to ignore whitespaces changes when reviewing this PR, since I had to enclose a block inside an if.
Closesrust-lang#73301
(I found this while exploring the code related to [this](rust-lang#119251 (comment)) comment.)
Add non-regression test for ATPIT ICE rust-lang#114325
ATPIT issue rust-lang#114325 had been unknowingly fixed by rust-lang#107421, so this PR adds its [MCVE](rust-lang#114325 (comment)) as a non-regression test.
Closesrust-lang#114325.
…rieb
Rename test to be more descriptive
As suggested in rust-lang#119402 (comment)
r? ``@Nilstrieb``
@rustbotrustbot 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. rollup A PR which is a rollup labels Dec 29, 2023
@matthiaskrgr

Copy link
Copy Markdown
MemberAuthor

@bors r+ rollup=never p=5

@bors

bors commented Dec 29, 2023

Copy link
Copy Markdown
Collaborator

📌 Commit bfc1643 has been approved by matthiaskrgr

It is now in the queue for this repository.

@borsbors 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 29, 2023
@bors

bors commented Dec 30, 2023

Copy link
Copy Markdown
Collaborator

⌛ Testing commit bfc1643 with merge 03b5019...

@bors

bors commented Dec 30, 2023

Copy link
Copy Markdown
Collaborator

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

@borsbors added the merged-by-bors This PR was explicitly merged by bors. label Dec 30, 2023
@bors
bors merged commit 03b5019 into rust-lang:masterDec 30, 2023
@rustbotrustbot added this to the 1.77.0 milestone Dec 30, 2023
@rust-timer

Copy link
Copy Markdown
Collaborator

📌 Perf builds for each rolled up PR:

PR#MessagePerf Build Sha
#119322Couple of random coroutine pass simplifications38e416886d042755becc8bea67abddc12cba9f19 (link)
#119374Italicise "bytes" in the docs of some Vec methodsf0b25d5cf3e73f4a66758f2b9cc8a3df3dfa9571 (link)
#119388rustc_lint: Prevent triplication of various lintsa243ef5274311b38fdd7a7add25b72d78dc18028 (link)
#119406Add non-regression test for ATPIT ICE #1143250f2a1b736b42c5cf317364308c9ec1b999572280 (link)
#119410Rename test to be more descriptive6b1dcea4e98ea421bc43645f15babfd4f7ba0a9f (link)

previous master: 3cdd004e55

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
Copy Markdown
Collaborator

Finished benchmarking commit (03b5019): comparison URL.

Overall result: no relevant changes - no action needed

@rustbot label: -perf-regression

Instruction count

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

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.

meanrangecount
Regressions ❌
(primary)
--0
Regressions ❌
(secondary)
--0
Improvements ✅
(primary)
-2.7%[-3.4%, -2.1%]2
Improvements ✅
(secondary)
--0
All ❌✅ (primary)-2.7%[-3.4%, -2.1%]2

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.

meanrangecount
Regressions ❌
(primary)
0.4%[0.4%, 0.4%]1
Regressions ❌
(secondary)
--0
Improvements ✅
(primary)
--0
Improvements ✅
(secondary)
--0
All ❌✅ (primary)0.4%[0.4%, 0.4%]1

Binary size

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

Bootstrap: 671.886s -> 670.291s (-0.24%)
Artifact size: 312.01 MiB -> 312.00 MiB (-0.00%)

@matthiaskrgr
matthiaskrgr deleted the rollup-dbera1b branch March 16, 2024 18:19
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.

9 participants

@matthiaskrgr@bors@rust-timer@rustbot@Enselic@compiler-errors@gurry@lqd@est31