Rollup of 7 pull requests #104756

Manishearth · 2022-11-23T02:04:59Z

Successful merges:

Allow opaque types in trait impl headers and rely on coherence to reject unsound cases #103488 (Allow opaque types in trait impl headers and rely on coherence to reject unsound cases)
Refactor must_use lint into two parts #104359 (Refactor must_use lint into two parts)
Lower return type outside async block creation #104612 (Lower return type outside async block creation)
Fix --extern library finding errors #104621 (Fix --extern library finding errors)
enable fuzzy_provenance_casts lint in liballoc and libstd #104647 (enable fuzzy_provenance_casts lint in liballoc and libstd)
Refactor ty::ClosureKind related stuff #104732 (Refactor ty::ClosureKind related stuff)
Bump fd-lock in bootstrap again #104750 (Bump fd-lock in bootstrap again)

Failed merges:

r? @ghost
@rustbot modify labels: rollup

This allows feeding a different output type to async blocks with a different `ImplTraitContext`.

Before, the lint did the checking for `must_use` and pretty printing the types in a special format in one pass, causing quite complex and untranslatable code. Now the collection and printing is split in two. That should also make it easier to translate or extract the type pretty printing in the future. Also fixes an integer overflow in the array length pluralization calculation.

…ect unsound cases

…ence

…lally allow trait resolution to prove false things during coherence

…in favour of `TyCtxt::fn_trait_kind_from_def_id`

This is valid per the comment of the `ClosureKind` defition

Followup to rust-lang#103778 Sorry for the quick succession but this fixes one more building issue for Tier 3 `windows-gnullvm` that I have previously missed, and it would be nice to have it in the release.

Allow opaque types in trait impl headers and rely on coherence to reject unsound cases r? ```@lcnr``` fixes rust-lang#99840

Refactor must_use lint into two parts Before, the lint did the checking for `must_use` and pretty printing the types in a special format in one pass, causing quite complex and untranslatable code. Now the collection and printing is split in two. That should also make it easier to translate or extract the type pretty printing in the future. Also fixes an integer overflow in the array length pluralization calculation. fixes rust-lang#104352

Lower return type outside async block creation This allows feeding a different output type to async blocks with a different `ImplTraitContext`. Spotted this while working on rust-lang#104321

Fix --extern library finding errors - `crate_name` is not specified/passed to `metadata_crate_location_unknown_type` https://github.com/rust-lang/rust/blob/c493bae0d8efd75723460ce5c371f726efa93f15/compiler/rustc_error_messages/locales/en-US/metadata.ftl#L274-L275 - `metadata_lib_filename_form` is missing `$` - Add additional check to ensure that library is file Testing 1. Create file `a.rs` ```rust extern crate t; fn main() {} ``` 1. Create empty file `x` 1. Create empty directory `y` 1. Run ```sh $ rustc -o a a.rs --extern t=x $ rustc -o a a.rs --extern t=y ``` Both currently panic with stable.

…r=thomcc enable fuzzy_provenance_casts lint in liballoc and libstd r? ```@thomcc```

…piler-errors Refactor `ty::ClosureKind` related stuff I've tried to fix all duplication and weirdness, but if I missed something do tell :p r? `@compiler-errors`

Bump `fd-lock` in `bootstrap` again Followup to rust-lang#103778 Sorry for the quick succession but this fixes one more building issue for Tier 3 `windows-gnullvm` that I have previously missed, and it would be nice to have it in the release.

Manishearth · 2022-11-23T02:05:25Z

@bors r+ p=7

mutually exclusive with #104743

bors · 2022-11-23T02:05:27Z

📌 Commit b6c8794 has been approved by Manishearth

It is now in the queue for this repository.

bors · 2022-11-23T03:17:49Z

🔒 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-cui4g1a (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-cui4g1a --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 src/test/ui/type-alias-impl-trait/issue-84660-trait-impl-for-tait.stderr
Removing src/test/ui/type-alias-impl-trait/issue-76202-trait-impl-for-tait.stderr
Auto-merging compiler/rustc_trait_selection/src/traits/error_reporting/suggestions.rs
Auto-merging compiler/rustc_middle/src/ty/sty.rs
Auto-merging compiler/rustc_middle/src/ty/print/pretty.rs
Auto-merging compiler/rustc_middle/src/ty/closure.rs
CONFLICT (content): Merge conflict in compiler/rustc_middle/src/ty/closure.rs
Automatic merge failed; fix conflicts and then commit the result.

Manishearth · 2022-11-23T03:37:39Z

I'll fix this in a bit

Manishearth · 2022-11-23T03:56:46Z

#104758

bors · 2022-11-23T04:19:06Z

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

Swatinem and others added 30 commits November 19, 2022 18:23

Lower return type outside async block creation

b59090e

This allows feeding a different output type to async blocks with a different `ImplTraitContext`.

Fix CrateLocationUnknownType error

1e4adaf

Fix metadata_lib_filename_form

40b7e0e

Check that library is file

a1ea1c1

enable fuzzy_provenance_casts lint in liballoc

644a5a3

enable fuzzy_provenance_casts lint in libstd

7f5addd

dont attempt strict provenance in SGX

1a69666

Allow opaque types in trait impl headers and rely on coherence to rej…

2752e32

…ect unsound cases

Treat different opaque types of the same def id as equal during coher…

94fe30f

…ence

Add an always-ambiguous predicate to make sure that we don't accident…

ae80c76

…lally allow trait resolution to prove false things during coherence

nit treat different opaque types

9cd44f8

Move a field around

9a8e1ee

Register obligations from type relation

f42e490

Remove a function that doesn't actually do anything

11ae334

Type generalization should not look at opaque type in coherence

7301cd7

Add some more assertions for type relations not used during coherence

11adf03

Test generalization during coherence

c16a90f

Remove extra . in metadata_lib_filename_form

395f2b8

Tests for bad --extern library path and file

7169c7d

Rename fn_trait_kind_from_{from_lang=>def_id} to better convey meaning

ec41bc6

Remove ty::ClosureKind::from_def_id

632b96f

…in favour of `TyCtxt::fn_trait_kind_from_def_id`

Add TyCtxt::is_fn_trait

d6f73c1

Simplify ty::ClosureKind::extends

e9f6db5

This is valid per the comment of the `ClosureKind` defition

micro doc fixes

3d407cc

Use TyCtxt::is_fn_trait is a couple more places

48fee7a

Bump fd-lock in bootstrap again

cd22ce6

Followup to rust-lang#103778 Sorry for the quick succession but this fixes one more building issue for Tier 3 `windows-gnullvm` that I have previously missed, and it would be nice to have it in the release.

Rollup merge of rust-lang#103488 - oli-obk:impl_trait_for_tait, r=lcnr

8c1cec9

Allow opaque types in trait impl headers and rely on coherence to reject unsound cases r? ```@lcnr``` fixes rust-lang#99840

Rollup merge of rust-lang#104612 - Swatinem:async-ret-y, r=estebank

cb4887b

Lower return type outside async block creation This allows feeding a different output type to async blocks with a different `ImplTraitContext`. Spotted this while working on rust-lang#104321

Manishearth added 4 commits November 22, 2022 21:04

Rollup merge of rust-lang#104647 - RalfJung:alloc-strict-provenance, …

8aa6ab8

…r=thomcc enable fuzzy_provenance_casts lint in liballoc and libstd r? ```@thomcc```

Rollup merge of rust-lang#104732 - WaffleLapkin:from_def_idn't, r=com…

1f1bbfc

…piler-errors Refactor `ty::ClosureKind` related stuff I've tried to fix all duplication and weirdness, but if I missed something do tell :p r? `@compiler-errors`

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 23, 2022

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 Nov 23, 2022

Manishearth closed this Nov 23, 2022

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Rollup of 7 pull requests #104756

Rollup of 7 pull requests #104756

Manishearth commented Nov 23, 2022

Manishearth commented Nov 23, 2022

bors commented Nov 23, 2022

bors commented Nov 23, 2022

Manishearth commented Nov 23, 2022

Manishearth commented Nov 23, 2022

bors commented Nov 23, 2022

Rollup of 7 pull requests #104756

Rollup of 7 pull requests #104756

Conversation

Manishearth commented Nov 23, 2022

Manishearth commented Nov 23, 2022

bors commented Nov 23, 2022

bors commented Nov 23, 2022

Manishearth commented Nov 23, 2022

Manishearth commented Nov 23, 2022

bors commented Nov 23, 2022