Rollup of 6 pull requests #117193

matthiaskrgr · 2023-10-25T21:37:12Z

Successful merges:

Return multiple object-safety violation errors and code improvements to the object-safety check #116401 (Return multiple object-safety violation errors and code improvements to the object-safety check)
Do not suggest 'Trait<Assoc=arg>' when in trait impl #116553 (Do not suggest 'Trait<Assoc=arg>' when in trait impl)
Improve the warning messages for the #[diagnostic::on_unimplemented] #116931 (Improve the warning messages for the #[diagnostic::on_unimplemented])
Uplift Canonical to rustc_type_ir #117008 (Uplift Canonical to rustc_type_ir)
On unresolved imports, suggest a disambiguated path if necessary to avoid collision with local items #117009 (On unresolved imports, suggest a disambiguated path if necessary to avoid collision with local items)
Rename AsyncCoroutineKind to CoroutineSource #117175 (Rename AsyncCoroutineKind to CoroutineSource)

r? @ghost
@rustbot modify labels: rollup

This commit improves warnings emitted for malformed on unimplemented attributes by: * Improving the span of the warnings * Adding a label message to them * Separating the messages for missing and unexpected options * Adding a help message that says which options are supported

because that would be illegal syntax

similar to how we have `MatchSource`, it explains where the desugaring came from.

…neSource`

Instead we use `Display` impls and their `alternate` render scheme to decide whether we want backticks or not.

Return multiple object-safety violation errors and code improvements to the object-safety check See individual commits for more information. Split off of rust-lang#114260, since it turned out that the main intent of that PR was wrong. r? oli-obk

…ggestion, r=compiler-errors Do not suggest 'Trait<Assoc=arg>' when in trait impl Fixes rust-lang#116464 We now skip the suggestion if we're in an impl of the trait.

…mplemented_warnings, r=compiler-errors Improve the warning messages for the `#[diagnostic::on_unimplemented]` This commit improves warnings emitted for malformed on unimplemented attributes by: * Improving the span of the warnings * Adding a label message to them * Separating the messages for missing and unexpected options * Adding a help message that says which options are supported r? `@compiler-errors` I'm happy to work on further improvements, so feel free to make suggestions.

Uplift `Canonical` to `rustc_type_ir` I plan on moving the new trait solver's canonicalizer into either `rustc_type_ir` or a child crate. One dependency on this is lifting `Canonical<V>` to `rustc_type_ir` so we can actually name the canonicalized values. I may also later lift `CanonicalVarInfo` into the new trait solver. I can't really tell what other changes need to be done, but I'm just putting this up sooner than later since I'm almost certain it'll need to be done regardless of other design choices. There are a couple of warts introduced by this PR, since we no longer can define inherent `Canonical` impls in `rustc_middle` -- see the changes to: * `compiler/rustc_trait_selection/src/traits/query/normalize.rs` * `compiler/rustc_hir_typeck/src/fn_ctxt/_impl.rs` r? lcnr

…=b-naber On unresolved imports, suggest a disambiguated path if necessary to avoid collision with local items Fixes rust-lang#116970.

…rrors Rename AsyncCoroutineKind to CoroutineSource pulled out of rust-lang#116447 Also refactors the printing infra of `CoroutineSource` to be ready for easily extending it with a `Gen` variant for `gen` blocks

matthiaskrgr · 2023-10-25T21:37:24Z

@bors r+ rollup=never p=6

bors · 2023-10-25T21:37:26Z

📌 Commit 4e4e561 has been approved by matthiaskrgr

It is now in the queue for this repository.

bors · 2023-10-25T22:17:14Z

⌛ Testing commit 4e4e561 with merge 7ac9a3a...

bors · 2023-10-26T00:11:11Z

☀️ Test successful - checks-actions
Approved by: matthiaskrgr
Pushing 7ac9a3a to master...

rust-timer · 2023-10-26T00:12:54Z

📌 Perf builds for each rolled up PR:

PR#	Message	Perf Build Sha
#116401	Return multiple object-safety violation errors and code imp…	`e946fb2992a3c5fe9260fa36b4c681cbd58adbc3` (link)
#116553	Do not suggest 'Trait<Assoc=arg>' when in trait impl	`7a551c28f9e86ba5115d90137900584763ef9a5c` (link)
#116931	Improve the warning messages for the `#[diagnostic::on_unim…	`6360211da14b207257eff8bf68179a765ab80d44` (link)
#117008	Uplift `Canonical` to `rustc_type_ir`	`dda0ddd372f36ce9ca8708c61e5cde5f96ddf4df` (link)
#117009	On unresolved imports, suggest a disambiguated path if nece…	`5543b2a5f765c3078100961fadca182c8d4fe299` (link)
#117175	Rename AsyncCoroutineKind to CoroutineSource	`f60f8e04367a5e0cf1df85d0dc6131ccf5b60d02` (link)

previous master: ab5c841a1f

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 · 2023-10-26T02:20:11Z

Finished benchmarking commit (7ac9a3a): 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)	1.1%	[0.8%, 1.6%]	3
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-2.4%	[-5.6%, -0.8%]	6
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: missing data
Artifact size: 304.44 MiB -> 304.48 MiB (0.01%)

WaffleLapkin and others added 19 commits October 3, 2023 21:21

Make non-zero check more obvious

94c9d0c

Fix a span for one of the test cases

3d03a8a

on unresolved import disambiguate suggested path if it would collide

4aaf8e0

Do not suggest 'Trait<Assoc=arg>' when in trait impl

079b290

because that would be illegal syntax

Rename AsyncCoroutineKind to CoroutineSource

af8a998

similar to how we have `MatchSource`, it explains where the desugaring came from.

Uplift Canonical to rustc_type_ir

024ca99

Add a IsIdentity extension trait for CanonicalUserType

8f3b4f9

Rename in preparation for moving the async printing out of `Corouti…

92b41ee

…neSource`

Refactor away the need for some descr methods.

c601ade

Instead we use `Display` impls and their `alternate` render scheme to decide whether we want backticks or not.

Add a comment explaining some weird is_vtable_safe_method behavior

6cb3376

Don't allow dead code

8958235

Return multiple object-safety violation errors

ecdbefa

Rollup merge of rust-lang#116553 - gurry:116464-assoc-type-invalid-su…

824dbb5

…ggestion, r=compiler-errors Do not suggest 'Trait<Assoc=arg>' when in trait impl Fixes rust-lang#116464 We now skip the suggestion if we're in an impl of the trait.

Rollup merge of rust-lang#117009 - fmease:diag-disambig-sugg-crate, r…

2a027fa

…=b-naber On unresolved imports, suggest a disambiguated path if necessary to avoid collision with local items Fixes rust-lang#116970.

Rollup merge of rust-lang#117175 - oli-obk:gen_fn_split, r=compiler-e…

4e4e561

…rrors Rename AsyncCoroutineKind to CoroutineSource pulled out of rust-lang#116447 Also refactors the printing infra of `CoroutineSource` to be ready for easily extending it with a `Gen` variant for `gen` blocks

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. rollup A PR which is a rollup labels Oct 25, 2023

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 Oct 25, 2023

bors added the merged-by-bors This PR was explicitly merged by bors. label Oct 26, 2023

bors merged commit 7ac9a3a into rust-lang:master Oct 26, 2023
11 checks passed

rustbot added this to the 1.75.0 milestone Oct 26, 2023

This was referenced Oct 26, 2023

use ObligationCtxt not QueryNormalizer in rustdoc's normalization #108503

Closed

Detect object safety errors when assoc type is missing #116405

Merged

github-actions bot mentioned this pull request Oct 31, 2023

Automated pull from upstream master ferrocene/ferrocene#74

Merged

matthiaskrgr deleted the rollup-bygfdcd branch March 16, 2024 18:18

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Rollup of 6 pull requests #117193

Rollup of 6 pull requests #117193

matthiaskrgr commented Oct 25, 2023

matthiaskrgr commented Oct 25, 2023

bors commented Oct 25, 2023

bors commented Oct 25, 2023

bors commented Oct 26, 2023

rust-timer commented Oct 26, 2023

rust-timer commented Oct 26, 2023

Rollup of 6 pull requests #117193

Rollup of 6 pull requests #117193

Conversation

matthiaskrgr commented Oct 25, 2023

matthiaskrgr commented Oct 25, 2023

bors commented Oct 25, 2023

bors commented Oct 25, 2023

bors commented Oct 26, 2023

rust-timer commented Oct 26, 2023

rust-timer commented Oct 26, 2023

Overall result: no relevant changes - no action needed

Instruction count

Max RSS (memory usage)

Cycles

Binary size