Skip to content

Rollup of 7 pull requests - #101577

Merged
bors merged 23 commits into
rust-lang:masterfrom
Dylan-DPC:rollup-l9xw7i7
Sep 8, 2022
Merged

Rollup of 7 pull requests#101577
bors merged 23 commits into
rust-lang:masterfrom
Dylan-DPC:rollup-l9xw7i7

Conversation

@Dylan-DPC

Copy link
Copy Markdown
Member

Successful merges:

Failed merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

Jarchoand others added 23 commits September 6, 2022 14:23
…rked with rustc_lint_diagnostic
This commit removes the allows rules for the SessionDiagnostic lint
that were being used in the session.rs file.
Thanks to the PR rust-lang#101230 we do not need to annotate the methods with
the allow rule as they are part of the diagnostic machinery.
…times, r=lcnr
Opaque types' generic params do not imply anything about their hidden type's lifetimes
fixesrust-lang#97104
cc ```@aliemjay```
…name-attr-warning-pt2, r=davidtwco
translations(rustc_session): migrates rustc_session to use SessionDiagnostic - Pt. 2
# Description
This is the second part of the `rustc_session` [migration](rust-lang#100717 (comment)).
**Please only review this [commit](rust-lang@5018581) that belongs to the part 2. The other ones are from the PR [rust-lang#100753](rust-lang#100753) that is not yet merged.**
In this PR, we migrate the files `session.rs` and `config.rs`.
Please not that we have to `allow` the lints rules in some functions from `session.rs` because they are (at least I believe) part of the diagnostic machinery.
… r=TaKO8Ki
Adjust and slightly generalize operator error suggestion
(in no particular order)
* Stop passing around a whole extra `ProjectionPredicate`
* Add spaces around `=` in `Trait<..., Output = Ty>` suggestion
* Some code clean-ups, including
* add `lang_item_for_op` to turn a `Op` into a `DefId`
* avoid `SourceMap` because we don't really need to render an expr
* Remove `TypeParamVisitor` in favor of just checking `ty.has_param_types_or_consts` -- this acts a bit differently, but shouldn't cause erroneous suggestions (actually might generalize them a bit)
* We now suggest `Output = Ty` in the `where` clause suggestion when we fail to add `Struct<T>` and `T`.
I can split this out into more PRs if needed, but they're all just miscellaneous generalizations, changes, and nitpicks I saw when messing with this operator code.
…pi_changes, r=oli-obk
Allow lower_lifetime_binder receive a closure
``@oli-obk`` requested this and other changes as a way of simplifying rust-lang#101345. This is just going to make the diff of rust-lang#101345 smaller.
r? ``@oli-obk`` ``@cjgillot``
Allow lint passes to be bound by `TyCtxt`
This will allow storing things like `Ty<'tcx>` inside late lint passes. It's already possible to store various id types so they're already implicitly bound to a specific `TyCtxt`.
r? rust-lang/compiler
…ord-ord, r=oli-obk
Remove unnecessary `PartialOrd` and `Ord`
@rustbotrustbot added A-translation Area: Translation infrastructure, and migrating existing diagnostics to SessionDiagnostic T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. rollup A PR which is a rollup labels Sep 8, 2022
@Dylan-DPC

Copy link
Copy Markdown
MemberAuthor

@bors r+ rollup=never p=5

@bors

bors commented Sep 8, 2022

Copy link
Copy Markdown
Collaborator

📌 Commit 720a82d has been approved by Dylan-DPC

It is now in the queue for this repository.

@borsbors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Sep 8, 2022
@bors

bors commented Sep 8, 2022

Copy link
Copy Markdown
Collaborator

⌛ Testing commit 720a82d with merge 8778809...

@bors

bors commented Sep 8, 2022

Copy link
Copy Markdown
Collaborator

☀️ Test successful - checks-actions
Approved by: Dylan-DPC
Pushing 8778809 to master...

@borsbors added the merged-by-bors This PR was explicitly merged by bors. label Sep 8, 2022
@bors
bors merged commit 8778809 into rust-lang:masterSep 8, 2022
@rustbotrustbot added this to the 1.65.0 milestone Sep 8, 2022
@rust-timer

Copy link
Copy Markdown
Collaborator

@rust-timer

Copy link
Copy Markdown
Collaborator

Finished benchmarking commit (8778809): comparison URL.

Overall result: ✅ 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.

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

mean1rangecount2
Regressions ❌
(primary)
--0
Regressions ❌
(secondary)
2.8%[2.8%, 2.8%]1
Improvements ✅
(primary)
--0
Improvements ✅
(secondary)
-2.0%[-2.8%, -0.9%]5
All ❌✅ (primary)--0

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.

mean1rangecount2
Regressions ❌
(primary)
--0
Regressions ❌
(secondary)
--0
Improvements ✅
(primary)
-2.3%[-2.3%, -2.3%]1
Improvements ✅
(secondary)
-3.6%[-3.6%, -3.6%]1
All ❌✅ (primary)-2.3%[-2.3%, -2.3%]1

Footnotes

  1. the arithmetic mean of the percent change23

  2. number of relevant changes23

@davidtwcodavidtwco removed the A-translation Area: Translation infrastructure, and migrating existing diagnostics to SessionDiagnostic label Oct 4, 2022
flip1995 pushed a commit to flip1995/rust that referenced this pull request Oct 6, 2022
Rollup of 7 pull requests
Successful merges:
- rust-lang#98933 (Opaque types' generic params do not imply anything about their hidden type's lifetimes)
- rust-lang#101041 (translations(rustc_session): migrates rustc_session to use SessionDiagnostic - Pt. 2)
- rust-lang#101424 (Adjust and slightly generalize operator error suggestion)
- rust-lang#101496 (Allow lower_lifetime_binder receive a closure)
- rust-lang#101501 (Allow lint passes to be bound by `TyCtxt`)
- rust-lang#101515 (Recover from typo where == is used in place of =)
- rust-lang#101545 (Remove unnecessary `PartialOrd` and `Ord`)
Failed merges:
r? `@ghost`
`@rustbot` modify labels: rollup
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.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

12 participants

@Dylan-DPC@bors@rust-timer@davidtwco@rustbot@Jarcho@spastorino@TaKO8Ki@compiler-errors@beowolx@chenyukang@oli-obk