Skip to content

Rollup of 6 pull requests #121458

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
Closed
wants to merge 17 commits into from
Closed

Rollup of 6 pull requests #121458

wants to merge 17 commits into from

Conversation

matthiaskrgr
Copy link
Member

Successful merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

compiler-errors and others added 17 commits February 3, 2024 01:21
@compiler-errors
No need to validate_alias_bound_self_from_param_env in assemble_alias…
6dea155 
…_bound_candidates
@oli-obk
Add more tests
31478cd
@aliemjay @oli-obk
test that we do not support higher-ranked regions in opaque type infe…
66bd645 
…rence
Fix typo in serialized.rs
00234f0 
accomodate -> accommodate
@nnethercote
Fix panic when compiling Rocket.
326b44e 
`Rustc::emit_diagnostic` reconstructs a diagnostic passed in from the
macro machinery. Currently it uses the type `DiagnosticBuilder<'_,
ErrorGuaranteed>`, which is incorrect, because the diagnostic might be a
warning. And if it is a warning, because of the `ErrorGuaranteed` we end
up calling into `emit_producing_error_guaranteed` and the assertion
within that function (correctly) fails because the level is not an error
level.

The fix is simple: change the type to `DiagnosticBuilder<'_, ()>`. Using
`()` works no matter what the diagnostic level is, and we don't need an
`ErrorGuaranteed` here.

The panic was reported in rust-lang#120576.
@nnethercote
Make some IntoDiagnostic impls generic.
02423a5 
PR rust-lang#119097 made the decision to make all `IntoDiagnostic` impls generic,
because this allowed a bunch of nice cleanups. But four hand-written
impls were unintentionally overlooked. This commit makes them generic.
@jrudolph
Fix typo in metadata.rs doc comment
c276af2
@lcnr
DefId to LocalDefId
7921ce3
@oli-obk
Avoid emitting type mismatches against {type error}
9e016a8
@oli-obk
Preserve the Span from prove_predicate all the way to registering…
e3021eb 
… opaque types
@oli-obk
report_mismatch did not actually report anymore
e4622e0
@matthiaskrgr
Rollup merge of rust-lang#120598 - compiler-errors:no-rigid-check, r=…
490ee5a 
…lcnr

No need to `validate_alias_bound_self_from_param_env` in `assemble_alias_bound_candidates`

We already fully normalize the self type before we reach `assemble_alias_bound_candidates`, so there's no reason to double check that a projection is truly rigid by checking param-env bounds.

I think this is also blocked on us making sure to always normalize opaques: rust-lang#120549.

r? lcnr
@matthiaskrgr
Rollup merge of rust-lang#121386 - oli-obk:no_higher_ranked_opaques, …
24e8155 
…r=lcnr

test that we do not support higher-ranked regions in opaque type inference

We already do all the right checks in `check_opaque_type_parameter_valid`, and we have done so since at least 2 years.

I collected the tests from rust-lang#116935 and rust-lang#100503 and added some more

cc rust-lang#96146

r? `@lcnr`
@matthiaskrgr
Rollup merge of rust-lang#121401 - eltociear:patch-25, r=nnethercote
8bf05b1 
Fix typo in serialized.rs

accomodate -> accommodate
@matthiaskrgr
Rollup merge of rust-lang#121427 - nnethercote:fix-Rocket, r=oli-obk
f9aeaa6 
Fix panic when compiling `Rocket`.

This panic was reported [here](rust-lang#120576 (comment)).

r? `@oli-obk`
@matthiaskrgr
Rollup merge of rust-lang#121439 - jrudolph:patch-1, r=bjorn3
25aac34 
Fix typo in metadata.rs doc comment
@matthiaskrgr
Rollup merge of rust-lang#121441 - lcnr:typesystem-cleanup, r=compile…
20e862e 
…r-errors

`DefId`  to `LocalDefId`
@rustbot rustbot added A-query-system Area: The rustc query system (https://rustc-dev-guide.rust-lang.org/query.html) 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. WG-trait-system-refactor The Rustc Trait System Refactor Initiative (-Znext-solver) rollup A PR which is a rollup labels Feb 22, 2024
@matthiaskrgr
Copy link
Member Author

@bors r+ rollup=never p=6

@bors
Copy link
Collaborator

bors commented Feb 22, 2024

📌 Commit 20e862e 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 Feb 22, 2024
@jieyouxu
Copy link
Member

@matthiaskrgr I think this rollup might fail because some of the ui tests contain legacy-style // directives instead of //@? (That is // check-fail instead of //@ check-fail?)

@matthiaskrgr
Copy link
Member Author

may be, but only iff #121370 merges, which the chances of are not tooo high, given the last couple attempts failed as well 🙃

@jieyouxu
Copy link
Member

jieyouxu commented Feb 22, 2024 •
edited
Loading

may be, but only iff #121370 merges, which the chances of are not tooo high, given the last couple attempts failed as well 🙃

No, as in the ui test suite already uses //@ (specifically that test suite ATM), but in this rollup there's tests/ui/rfcs/impl-trait/higher-ranked-regions-diag.rs which is a ui test suite test that has // check-fail no?

#121370 just changes over every other compiletest suite apart from the ui test suite because the latter is already migrated over.

#120881 was the one that changed it for ui test suite specifically.

@oli-obk
Copy link
Contributor

oli-obk commented Feb 22, 2024

#121386 fixed the annotations (they were no-ops and so don't matter), but still good to get rid of them. This means that this rollup doesn't include that latest commit though

@matthiaskrgr matthiaskrgr deleted the rollup-gke5lvd 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
A-query-system Area: The rustc query system (https://rustc-dev-guide.rust-lang.org/query.html) 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. WG-trait-system-refactor The Rustc Trait System Refactor Initiative (-Znext-solver)
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
10 participants
@matthiaskrgr @bors @jieyouxu @oli-obk @rustbot @compiler-errors @aliemjay @nnethercote @jrudolph @lcnr