Rollup of 8 pull requests #119623

matthiaskrgr · 2024-01-05T16:32:30Z

Successful merges:

Hide foreign #[doc(hidden)] paths in import suggestions #119151 (Hide foreign #[doc(hidden)] paths in import suggestions)
Imply outlives-bounds on lazy type aliases #119350 (Imply outlives-bounds on lazy type aliases)
Make negative_bounds internal & fix some of its issues #119354 (Make negative_bounds internal & fix some of its issues)
Use resolutions(()).effective_visiblities to avoid cycle errors in report_object_error #119506 (Use resolutions(()).effective_visiblities to avoid cycle errors in report_object_error)
Fix scoping for let chains in match guards #119554 (Fix scoping for let chains in match guards)
Check yield terminator's resume type in borrowck #119563 (Check yield terminator's resume type in borrowck)
cstore: Remove unnecessary locking from CrateMetadata #119589 (cstore: Remove unnecessary locking from CrateMetadata)
rustc_mir_transform: Make DestinationPropagation stable for queries #119591 (rustc_mir_transform: Make DestinationPropagation stable for queries)

r? @ghost
@rustbot modify labels: rollup

By using FxIndexMap instead of FxHashMap, so that the order of visiting of locals is deterministic. We also need to bless copy_propagation_arg.foo.DestinationPropagation.panic*.diff. Do not review the diff of the diff. Instead look at the diff file before and after this commit. Both before and after this commit, 3 statements are replaced with nop. It's just that due to change in ordering, different statements are replaced. But the net result is the same.

Use Expr instead. Use `ExprKind::Let` to represent if let guards.

Match guards with an if let guard or an if let chain guard should have a temporary scope of the whole arm. This is to allow ref bindings to temporaries to borrow check.

…den-suggest, r=davidtwco Hide foreign `#[doc(hidden)]` paths in import suggestions Stops the compiler from suggesting to import foreign `#[doc(hidden)]` paths. `@rustbot` label A-suggestion-diagnostics

…nds, r=compiler-errors Imply outlives-bounds on lazy type aliases Fixes rust-lang#118479. r? types

…mpiler-errors Make `negative_bounds` internal & fix some of its issues r? compiler-errors

…bject-safety-error, r=Nilstrieb Use `resolutions(()).effective_visiblities` to avoid cycle errors in `report_object_error` Inside of `report_object_error`, using the `effective_visibilities` query causes cycles since it calls `type_of`, which itself may call `typeck`, which may end up reporting its own object-safety errors. Fixes rust-lang#119346 Fixes rust-lang#119502

…tion, r=compiler-errors Fix scoping for let chains in match guards If let guards were previously represented as a different type of guard in HIR and THIR. This meant that let chains in match guards were not handled correctly because they were treated exactly like normal guards. - Remove `hir::Guard` and `thir::Guard`. - Make the scoping different between normal guards and if let guards also check for let chains. closes rust-lang#118593

…r=oli-obk Check yield terminator's resume type in borrowck In borrowck, we didn't check that the lifetimes of the `TerminatorKind::Yield`'s `resume_place` were actually compatible with the coroutine's signature. That means that the lifetimes were totally going unchecked. Whoops! This PR implements this checking. Fixes rust-lang#119564 r? types

…ulacrum cstore: Remove unnecessary locking from `CrateMetadata` Locks and atomics in `CrateMetadata` fields were necessary before rust-lang#107765 when `CStore` was cloneable, but now they are not necessary and can be removed after restructuring the code a bit to please borrow checker. All remaining locked fields in `CrateMetadata` are lazily populated caches.

…ble, r=cjgillot rustc_mir_transform: Make DestinationPropagation stable for queries By using `FxIndexMap` instead of `FxHashMap`, so that the order of visiting of locals is deterministic. We also need to bless `copy_propagation_arg.foo.DestinationPropagation.panic*.diff`. Do not review the diff of the diff. Instead look at the diff files before and after this commit. Both before and after this commit, 3 statements are replaced with nop. It's just that due to change in ordering, different statements are replaced. But the net result is the same. In other words, compare this diff (before fix): * https://github.com/rust-lang/rust/blob/090d5eac722000906cc00d991f2bf052b0e388c3/tests/mir-opt/dest-prop/copy_propagation_arg.foo.DestinationPropagation.panic-unwind.diff With this diff (after fix): * https://github.com/rust-lang/rust/blob/f603babd63a607e155609dc0277806e559626ea0/tests/mir-opt/dest-prop/copy_propagation_arg.foo.DestinationPropagation.panic-unwind.diff and you can see that both before and after the fix, we replace 3 statements with `nop`s. I find it _slightly_ surprising that the test this PR affects did not previously fail spuriously due to the indeterminism of `FxHashMap`, but I guess in can be explained with the predictability of small `FxHashMap`s with `usize` (`Local`) keys, or something along those lines. This should fix [this](rust-lang#119252 (comment)) comment, but I wanted to make a separate PR for this fix for a simpler development and review process. Part of rust-lang#84447 which is E-help-wanted. r? ```@cjgillot``` who is reviewer for the highly related PR rust-lang#119252.

matthiaskrgr · 2024-01-05T16:32:43Z

@bors r+ rollup=never p=8

bors · 2024-01-05T16:32:46Z

📌 Commit 6548f08 has been approved by matthiaskrgr

It is now in the queue for this repository.

bors · 2024-01-05T18:33:09Z

🔒 Merge conflict

This pull request and the master branch diverged in a way that cannot be automatically merged. Please rebase on top of the latest master branch, and let the reviewer approve again.

How do I rebase?

Assuming self is your fork and upstream is this repository, you can resolve the conflict following these steps:

git checkout rollup-5gmpd83 (switch to your branch)
git fetch upstream master (retrieve the latest master)
git rebase upstream/master -p (rebase on top of it)
Follow the on-screen instruction to resolve conflicts (check git status if you got lost).
git push self rollup-5gmpd83 --force-with-lease (update this PR)

You may also read Git Rebasing to Resolve Conflicts by Drew Blessing for a short tutorial.

Please avoid the "Resolve conflicts" button on GitHub. It uses git merge instead of git rebase which makes the PR commit history more difficult to read.

Sometimes step 4 will complete without asking for resolution. This is usually due to difference between how Cargo.lock conflict is handled during merge and rebase. This is normal, and you should still perform step 5 to update this PR.

Error message

Removing tests/ui/traits/negative-bounds/supertrait.stderr
Auto-merging compiler/rustc_resolve/src/late/diagnostics.rs
Auto-merging compiler/rustc_mir_transform/src/dest_prop.rs
CONFLICT (content): Merge conflict in compiler/rustc_mir_transform/src/dest_prop.rs
Auto-merging compiler/rustc_middle/src/mir/mod.rs
Auto-merging compiler/rustc_infer/src/traits/error_reporting/mod.rs
Auto-merging compiler/rustc_ast_passes/src/errors.rs
Automatic merge failed; fix conflicts and then commit the result.

bors · 2024-01-05T19:36:51Z

☔ The latest upstream changes (presumably #119621) made this pull request unmergeable. Please resolve the merge conflicts.

Jules-Bertholet and others added 22 commits December 20, 2023 00:19

Hide foreign #[doc(hidden)] paths in import suggestions

5c0e62c

Make feature negative_bounds internal

5f56465

Deny parenthetical notation for negative bounds

a251974

Don't elaborate !Sized to !Sized + Sized

32cea61

rustc_middle: Pretty-print negative bounds correctly

977546d

Imply outlives-bounds on lazy type aliases

90d6fe2

Check yield terminator's resume type in borrowck

1d48f69

cstore: Remove unnecessary locking from CrateMetadata

4bc3552

Remove hir::Guard

407cb24

Use Expr instead. Use `ExprKind::Let` to represent if let guards.

Remove thir::Guard

a549711

Use Expr instead. Use `ExprKind::Let` to represent if let guards.

Restore if let guard temporary scoping difference

1a267e3

Match guards with an if let guard or an if let chain guard should have a temporary scope of the whole arm. This is to allow ref bindings to temporaries to borrow check.

Update clippy for hir::Guard removal

44bba54

Use resolutions(()).effective_visiblities to avoid cycle errors

6a2bd5a

Rollup merge of rust-lang#119151 - Jules-Bertholet:no-foreign-doc-hid…

cf4d1c3

…den-suggest, r=davidtwco Hide foreign `#[doc(hidden)]` paths in import suggestions Stops the compiler from suggesting to import foreign `#[doc(hidden)]` paths. `@rustbot` label A-suggestion-diagnostics

Rollup merge of rust-lang#119350 - fmease:lazy-ty-aliases-implied-bou…

3a58b83

…nds, r=compiler-errors Imply outlives-bounds on lazy type aliases Fixes rust-lang#118479. r? types

Rollup merge of rust-lang#119354 - fmease:negative_bounds-fixes, r=co…

81baab6

…mpiler-errors Make `negative_bounds` internal & fix some of its issues r? compiler-errors

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 Jan 5, 2024

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 Jan 5, 2024

bors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Jan 5, 2024

matthiaskrgr closed this Jan 5, 2024

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

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Rollup of 8 pull requests #119623

Rollup of 8 pull requests #119623

matthiaskrgr commented Jan 5, 2024

matthiaskrgr commented Jan 5, 2024

bors commented Jan 5, 2024

bors commented Jan 5, 2024

bors commented Jan 5, 2024

Rollup of 8 pull requests #119623

Rollup of 8 pull requests #119623

Conversation

matthiaskrgr commented Jan 5, 2024

matthiaskrgr commented Jan 5, 2024

bors commented Jan 5, 2024

bors commented Jan 5, 2024

bors commented Jan 5, 2024