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.

Sign up for GitHub

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

Jump to bottom

Rollup of 5 pull requests #119421

Merged
merged 14 commits into from
Dec 30, 2023
Merged

Rollup of 5 pull requests #119421

merged 14 commits into from
Dec 30, 2023

Conversation

matthiaskrgr
Copy link
Member

Successful merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

Enselic and others added 14 commits December 28, 2023 19:46
@Enselic
rustc_error_codes: Update expected error in E0453.md
a4bcd47
@Enselic
rustc_lint: Rename warn_about_weird_lints to lint_added_lints
eef02c4 
So we can apply more kinds of lints to added lints without having to add
another parameter.
@Enselic
rustc_lint: Prevent multiple 'lint ignored' lints
e0c626f 
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.
@Enselic
rustc_lint: Prevent multiple 'incompatible with previous forbid' lints
741884d
@Enselic
rustc_lint: Prevent triplication of 'unknown lint' lint
7ca4e9f
@compiler-errors
Couple of random coroutine pass simplifications
d71f7be
@gurry
Italicise "bytes" in the docs of some Vec methods
e3aca01 
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.
@lqd
add non-regression test for issue 114325
21e8710
@est31
Rename test
740378c
@matthiaskrgr
Rollup merge of rust-lang#119322 - compiler-errors:async-gen-resume-t…
b75ba15 
…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.
@matthiaskrgr
Rollup merge of rust-lang#119374 - gurry:119149-improve-vec-docs, r=c…
ef55e75 
…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.

Fixes rust-lang#119149
@matthiaskrgr
Rollup merge of rust-lang#119388 - Enselic:prevent-lint-triplication,…
c8d4274 
… 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.

Closes rust-lang#73301

(I found this while exploring the code related to [this](rust-lang#119251 (comment)) comment.)
@matthiaskrgr
Rollup merge of rust-lang#119406 - lqd:issue-114325, r=compiler-errors
7c5c948 
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.

Closes rust-lang#114325.
@matthiaskrgr
Rollup merge of rust-lang#119410 - est31:fix_if_guard_unused, r=Nilst…
bfc1643 
…rieb

Rename test to be more descriptive

As suggested in rust-lang#119402 (comment)

r? ``@Nilstrieb``
@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. rollup A PR which is a rollup labels Dec 29, 2023
@matthiaskrgr
Copy link
Member Author

@bors r+ rollup=never p=5

@bors
Copy link
Contributor

bors commented Dec 29, 2023

📌 Commit bfc1643 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 29, 2023
@bors
Copy link
Contributor

bors commented Dec 30, 2023

⌛ Testing commit bfc1643 with merge 03b5019...

@bors
Copy link
Contributor

bors commented Dec 30, 2023

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

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

📌 Perf builds for each rolled up PR:

PR# Message Perf Build Sha
#119322 Couple of random coroutine pass simplifications 38e416886d042755becc8bea67abddc12cba9f19 (link)
#119374 Italicise "bytes" in the docs of some Vec methods f0b25d5cf3e73f4a66758f2b9cc8a3df3dfa9571 (link)
#119388 rustc_lint: Prevent triplication of various lints a243ef5274311b38fdd7a7add25b72d78dc18028 (link)
#119406 Add non-regression test for ATPIT ICE #114325 0f2a1b736b42c5cf317364308c9ec1b999572280 (link)
#119410 Rename test to be more descriptive 6b1dcea4e98ea421bc43645f15babfd4f7ba0a9f (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

This was referenced Dec 30, 2023
Merged
Merged
@rust-timer
Copy link
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.

mean range count
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.

mean range count
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 free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
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-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.
Projects
None yet
Milestone
1.77.0
Development

Successfully merging this pull request may close these issues.
9 participants
@matthiaskrgr @bors @rust-timer @rustbot @Enselic @compiler-errors @gurry @lqd @est31