Skip to content

Conversation

matthiaskrgr
Copy link
Member

Successful merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

RalfJung and others added 22 commits September 1, 2023 17:05
fix overflow in array length computation

addressing rust-lang#114912
…ulacrum

bootstrap/format: remove unnecessary paths.push

Cc rust-lang#106415 (review)
I verified that this still formats all fileds when `get_modified_rs_files` is made to return an error.

r? ``@Nilstrieb``
… r=oli-obk

Implement fallback for effect param

r? `@oli-obk` or `@lcnr`

tracking issue for this ongoing work: rust-lang#110395
…e, r=oli-obk

Call `LateLintPass::check_attribute` from `with_lint_attrs`

Fixes rust-lang#115571

For regular `register_late_pass` lints also means that `last_node_with_lint_attrs` is correct when in `check_attribute`, I've added a test that previously failed for `clippy::allow_attributes`

As far as I can see the only late lint in rustc that uses `check_attribute` is `unstable_features` which is allow by default and deprecated so this is mostly for clippy (or future rustc lints)
Point out if a local trait has no implementations

Slightly helps with rust-lang#115741
Improve diagnostic for generic params from outer items (E0401)

Generalize the wording of E0401 to talk about *outer items* instead of *outer functions* since the current phrasing is outdated. The outer item can be a function, constant, trait, ADT or impl block (see the new UI test for the more exotic examples).

Further, don't suggest introducing generic parameters to constant items unless the feature `generic_const_items` is enabled.

Lastly, make E0401 translatable while we're at it.

Fixes rust-lang#115720.
… r=notriddle

rustdoc: Add missing "Aliased type" title in the sidebar

Follow-up of rust-lang#115682.

The sections title are supposed to be present in the sidebar, we forgot to put this one so I added it into it. I also added the missing newly created `aliased-type` ID into the `DEFAULT_ID_MAP`.

r? `@notriddle`
@rustbot rustbot added A-meta Area: Issues & PRs about the rust-lang/rust repository itself 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. WG-trait-system-refactor The Rustc Trait System Refactor Initiative (-Znext-solver) rollup A PR which is a rollup labels Sep 11, 2023
@matthiaskrgr
Copy link
Member Author

@bors r+ rollup=never p=8

@bors
Copy link
Collaborator

bors commented Sep 11, 2023

📌 Commit 9ed6eea 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 Sep 11, 2023
@bors
Copy link
Collaborator

bors commented Sep 11, 2023

⌛ Testing commit 9ed6eea with merge 0a199e4...

@bors
Copy link
Collaborator

bors commented Sep 11, 2023

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

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Sep 11, 2023
@bors bors merged commit 0a199e4 into rust-lang:master Sep 11, 2023
@rustbot rustbot added this to the 1.74.0 milestone Sep 11, 2023
@rust-timer
Copy link
Collaborator

📌 Perf builds for each rolled up PR:

PR# Message Perf Build Sha
#115335 fix overflow in array length computation 0c8b8772f8a94742aa5041412cb545686e708e3f (link)
#115440 bootstrap/format: remove unnecessary paths.push d7900424b593f31f0a5edb8403da967492efe30c (link)
#115702 Update mailmap 0190a8dc183edfae4d5d625b5ddf1536c82a66e7 (link)
#115727 Implement fallback for effect param b5760da591057105445d448cb3dab5a2252ea1df (link)
#115739 Call LateLintPass::check_attribute from with_lint_attrs 3dcb68113c7d88e85f8d810d2a65a89d7a1981a8 (link)
#115743 Point out if a local trait has no implementations 9a6ef7875447390c69df9174fafe9dcefd1f49f0 (link)
#115744 Improve diagnostic for generic params from outer items (E04… 00b5de4a9ef8f7ef01460cec21a7ff40b46ea637 (link)
#115752 rustdoc: Add missing "Aliased type" title in the sidebar c5f91220090470df7914e10e9be5402e92137f0c (link)

previous master: 3ebb5629d1

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

Overall result: ❌✅ regressions and 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.5% [0.5%, 0.5%] 1
Improvements ✅
(primary)
- - 0
Improvements ✅
(secondary)
-0.3% [-0.4%, -0.3%] 5
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)
- - 0
Improvements ✅
(primary)
- - 0
Improvements ✅
(secondary)
-3.5% [-3.5%, -3.5%] 1
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: 629.503s -> 630.454s (0.15%)
Artifact size: 317.74 MiB -> 317.84 MiB (0.03%)

@matthiaskrgr matthiaskrgr deleted the rollup-khwbjj7 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 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. WG-trait-system-refactor The Rustc Trait System Refactor Initiative (-Znext-solver)
Projects
None yet
Development

Successfully merging this pull request may close these issues.