Rollup of 6 pull requests #104758

Manishearth · 2022-11-23T03:54:42Z

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)
Bump fd-lock in bootstrap again #104750 (Bump fd-lock in bootstrap again)

Failed merges:

Refactor ty::ClosureKind related stuff #104732 (Refactor ty::ClosureKind related stuff)

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

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````

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-23T03:54:53Z

@bors r+ p=5 rollup=never

bors · 2022-11-23T03:54:55Z

📌 Commit 42afb70 has been approved by Manishearth

It is now in the queue for this repository.

bors · 2022-11-23T06:49:00Z

⌛ Testing commit 42afb70 with merge 3f2b2ee...

bors · 2022-11-23T10:01:41Z

☀️ Test successful - checks-actions
Approved by: Manishearth
Pushing 3f2b2ee to master...

rust-timer · 2022-11-23T10:03:40Z

📌 Perf builds for each rolled up PR:

PR#	Perf Build Sha
#104750	3ebb092dd78129c504556164567bfe11ed6dce40
#104647	e7e1adfa04b712d954ba31d83f38583ae61af0ff
#104621	a90f466373bb8389b27ec461d2d764075550bf89
#104612	443fcb79bc1e22ee7ee2328a69d2c69b27de5c6e
#104359	6a29d7b7067204ef58ac86e955028b11681e14ba
#103488	a6cffd7c23c77e73f1e688a0f8efb0389c65b98c

previous master: 008bc1d587

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 · 2022-11-23T11:55:33Z

Finished benchmarking commit (3f2b2ee): comparison URL.

Overall result: ❌ regressions - ACTION NEEDED

Next Steps: If you can justify the regressions found in this perf run, please indicate this with @rustbot label: +perf-regression-triaged along with sufficient written justification. If you cannot justify the regressions please open an issue or create a new PR that fixes the regressions, add a comment linking to the newly created issue or PR, and then add the perf-regression-triaged label to this PR.

@rustbot label: +perf-regression
cc @rust-lang/wg-compiler-performance

Instruction count

This is a highly reliable metric that was used to determine the overall result at the top of this comment.

	mean	range	count
Regressions ❌ (primary)	0.3%	[0.3%, 0.3%]	1
Regressions ❌ (secondary)	2.1%	[0.6%, 7.1%]	13
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-	-	0
All ❌✅ (primary)	0.3%	[0.3%, 0.3%]	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.

	mean	range	count
Regressions ❌ (primary)	-	-	0
Regressions ❌ (secondary)	5.3%	[2.5%, 14.3%]	9
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-	-	0
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.

	mean	range	count
Regressions ❌ (primary)	-	-	0
Regressions ❌ (secondary)	3.0%	[1.3%, 6.0%]	7
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-	-	0
All ❌✅ (primary)	-	-	0

lqd · 2022-11-23T12:34:48Z

@rust-timer build a6cffd7c23c77e73f1e688a0f8efb0389c65b98c

rust-timer · 2022-11-23T13:54:19Z

Finished benchmarking commit (a6cffd7c23c77e73f1e688a0f8efb0389c65b98c): comparison URL.

Overall result: ❌ regressions - ACTION NEEDED

Benchmarking this pull request likely means that it is perf-sensitive, so we're automatically marking it as not fit for rolling up. While you can manually mark this PR as fit for rollup, we strongly recommend not doing so since this PR may lead to changes in compiler perf.

Next Steps: If you can justify the regressions found in this try perf run, please indicate this with @rustbot label: +perf-regression-triaged along with sufficient written justification. If you cannot justify the regressions please fix the regressions and do another perf run. If the next run shows neutral or positive results, the label will be automatically removed.

@bors rollup=never
@rustbot label: +S-waiting-on-review -S-waiting-on-perf +perf-regression

Instruction count

This is a highly reliable metric that was used to determine the overall result at the top of this comment.

	mean	range	count
Regressions ❌ (primary)	0.3%	[0.3%, 0.3%]	1
Regressions ❌ (secondary)	2.1%	[0.6%, 7.1%]	13
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-	-	0
All ❌✅ (primary)	0.3%	[0.3%, 0.3%]	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.

	mean	range	count
Regressions ❌ (primary)	-	-	0
Regressions ❌ (secondary)	4.2%	[1.9%, 14.0%]	12
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-	-	0
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.

	mean	range	count
Regressions ❌ (primary)	-	-	0
Regressions ❌ (secondary)	3.0%	[1.3%, 5.9%]	6
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-	-	0
All ❌✅ (primary)	-	-	0

Mark-Simulacrum · 2022-11-29T13:15:37Z

Labeling this PR as perf-triaged, tagging #103488 as a perf-regression.

Swatinem and others added 27 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

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

53eab24

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

36815c6

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

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

316bda8

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

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

Manishearth mentioned this pull request Nov 23, 2022

Rollup of 7 pull requests #104756

Closed

bors added the merged-by-bors This PR was explicitly merged by bors. label Nov 23, 2022

bors merged commit 3f2b2ee into rust-lang:master Nov 23, 2022

rustbot added this to the 1.67.0 milestone Nov 23, 2022

rustbot added the perf-regression Performance regression. label Nov 23, 2022

This comment has been minimized.

Sign in to view

rustbot added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Nov 23, 2022

Mark-Simulacrum added the perf-regression-triaged The performance regression has been triaged. label Nov 29, 2022

Mark-Simulacrum mentioned this pull request Nov 29, 2022

Allow opaque types in trait impl headers and rely on coherence to reject unsound cases #103488

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Rollup of 6 pull requests #104758

Rollup of 6 pull requests #104758

Manishearth commented Nov 23, 2022

Manishearth commented Nov 23, 2022

bors commented Nov 23, 2022

bors commented Nov 23, 2022

bors commented Nov 23, 2022

rust-timer commented Nov 23, 2022

rust-timer commented Nov 23, 2022

lqd commented Nov 23, 2022

This comment has been minimized.

rust-timer commented Nov 23, 2022

Mark-Simulacrum commented Nov 29, 2022

Rollup of 6 pull requests #104758

Rollup of 6 pull requests #104758

Conversation

Manishearth commented Nov 23, 2022

Manishearth commented Nov 23, 2022

bors commented Nov 23, 2022

bors commented Nov 23, 2022

bors commented Nov 23, 2022

rust-timer commented Nov 23, 2022

rust-timer commented Nov 23, 2022

Overall result: ❌ regressions - ACTION NEEDED

Instruction count

Max RSS (memory usage)

Cycles

lqd commented Nov 23, 2022

This comment has been minimized.

rust-timer commented Nov 23, 2022

Overall result: ❌ regressions - ACTION NEEDED

Instruction count

Max RSS (memory usage)

Cycles

Mark-Simulacrum commented Nov 29, 2022