Skip to content

Rollup of 6 pull requests #118294

New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Merged
merged 18 commits into from
Nov 25, 2023
Merged

Rollup of 6 pull requests #118294

merged 18 commits into from
Nov 25, 2023

Conversation

GuillaumeGomez
Copy link
Member

Successful merges:

Failed merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

tamird and others added 18 commits November 22, 2023 14:25
`Option::unwrap` is called on the next line.
And move declarative macro compilation to an earlier point in def collector, which is required for rust-lang#118188.
…_const, r=b-naber

Yeet `mir::Const::from_anon_const`

Only had one callsite which was easily simplified.

Uplifted a comment that I think is much more useful living in `ty::Const` world.
remove unused pub fns

This removes some unused `pub fn`; also fixes few obsoleted fn names or added fixmes with reminders to update them.
rustc_lint: address latent TODO

See individual commits.
Remove `HirId` from `QPath::LangItem`

Remove `HirId` from `QPath::LangItem`, since there was only *one* use-case (`ObligationCauseCode::AwaitableExpr`), which we can instead recover by walking the HIR tree.
resolve: Avoid clones of `MacroData`

And move declarative macro compilation to an earlier point in def collector, which is required for rust-lang#118188.
…GuillaumeGomez

rustdoc-search: clean up some DOM code
@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-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue. rollup A PR which is a rollup labels Nov 25, 2023
@GuillaumeGomez
Copy link
Member Author

@bors r+ p=6 rollup=never

@bors
Copy link
Collaborator

bors commented Nov 25, 2023

📌 Commit e698de9 has been approved by GuillaumeGomez

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 Nov 25, 2023
@bors
Copy link
Collaborator

bors commented Nov 25, 2023

⌛ Testing commit e698de9 with merge ec1393f...

@bors
Copy link
Collaborator

bors commented Nov 25, 2023

☀️ Test successful - checks-actions
Approved by: GuillaumeGomez
Pushing ec1393f to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Nov 25, 2023
@bors bors merged commit ec1393f into rust-lang:master Nov 25, 2023
@rustbot rustbot added this to the 1.76.0 milestone Nov 25, 2023
@rust-timer
Copy link
Collaborator

📌 Perf builds for each rolled up PR:

PR# Message Perf Build Sha
#116446 Yeet mir::Const::from_anon_const 3005fee7c5d8c388029df8e6c5954a0d1eda112b (link)
#117871 remove unused pub fns 58195d731ee7a084d30906be2b2d2e74364fff6b (link)
#118017 rustc_lint: address latent TODO 1ef5860169b79868b1b9d6bbacc294f05397735c (link)
#118199 Remove HirId from QPath::LangItem 408e3b904932136af6ea00847d9ba3a09e323602 (link)
#118272 resolve: Avoid clones of MacroData 92efb3b4526dec1231f5266e8ca50da4dbef35d3 (link)
#118291 rustdoc-search: clean up some DOM code 2f91396da6a88942c45e47e0472bfb24add01428 (link)

previous master: 16087eeea8

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

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

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)
3.4% [3.4%, 3.4%] 1
Regressions ❌
(secondary)
4.2% [2.8%, 5.0%] 4
Improvements ✅
(primary)
- - 0
Improvements ✅
(secondary)
-2.7% [-2.7%, -2.7%] 1
All ❌✅ (primary) 3.4% [3.4%, 3.4%] 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: 674.958s -> 675.077s (0.02%)
Artifact size: 313.33 MiB -> 313.29 MiB (-0.01%)

# for free to join this conversation on GitHub. Already have an account? # to comment
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-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.

9 participants