Rollup of 8 pull requests #118107

matthiaskrgr · 2023-11-20T19:56:44Z

Successful merges:

Add documentation for some queries #117327 (Add documentation for some queries)
Note about object lifetime defaults in does not live long enough error #117835 (Note about object lifetime defaults in does not live long enough error)
Uplift InferConst to rustc_type_ir #117851 (Uplift InferConst to rustc_type_ir)
test: Add test for async-move in 2015 Rust proc macro #117973 (test: Add test for async-move in 2015 Rust proc macro)
Don't require intercrate mode for negative coherence #117992 (Don't require intercrate mode for negative coherence)
Typeck break expr even if break is illegal #118010 (Typeck break expr even if break is illegal)
Don't consider generic args of supertrait in deref_into_dyn_supertrait lint #118026 (Don't consider regions in deref_into_dyn_supertrait lint)
intercrate_ambiguity_causes: handle self ty infer + reservation impls #118089 (intercrate_ambiguity_causes: handle self ty infer + reservation impls)

r? @ghost
@rustbot modify labels: rollup

This is a aspect of Rust that frequently trips up people who are not aware of it yet. This diagnostic attempts to explain what's happening and why the lifetime constraint, that was never mentioned in the source, arose.

We were earlier returning immediately when encountering an illegal break. However, this caused problems later when the expr that the break was returning was evaluated during writeback. So now we don't return and instead simply set tainted by error. This lets typeck of break expr to occur even though we've encountered an illegal break.

Add a test to ensure issue rust-lang#89699 does not show up again. This test emits an `async move` closure in a proc macro, which is used in a test program compiled with edition 2015. We make sure the error message is nice and shows up properly.

…ith placeholders

…ler-errors Add documentation for some queries

…aults, r=compiler-errors Note about object lifetime defaults in does not live long enough error This is a aspect of Rust that frequently trips up people who are not aware of it yet. This diagnostic attempts to explain what's happening and why the lifetime constraint, that was never mentioned in the source, arose. The implementation feels a bit questionable, I'm not sure whether there are better ways to do this. There probably are. fixes rust-lang#117835 r? types

…, r=spastorino Uplift `InferConst` to `rustc_type_ir` We need this in `rustc_type_ir` because the canonicalizer must understand the difference between a const vid and an effect vid. In that way, it's not an implementation detail of the representation of an infer const, but just part of the type ir. If we find out later on that it's better to leave the representation up to the consumer of `rustc_type_ir`, we could abstract `InferConst` (and probably `InferTy` as well) with some traits, but I don't see the benefit of that indirection currently.

test: Add test for async-move in 2015 Rust proc macro Fixes rust-lang#89699 Ran cargo bisect-rustc to find when this was fixed exactly, which is in 474709a

…lete, r=lcnr,aliemjay Don't require intercrate mode for negative coherence Negative coherence needs to be *sound*, but does not need to be *complete*, since it's looking for the *existence* of a negative goal, not the non-existence of a positive goal. This removes some trivial and annoying ambiguities when a negative impl has region constraints. r? lcnr idk if this needs an fcp but if it does, pls kick it off

…-var, r=compiler-errors Typeck break expr even if break is illegal Fixes rust-lang#117821 We were returning immediately when encountering an illegal break. However, this caused problems later when the expr that the break was returning was evaluated during writeback. So now we don't return and instead simply set tainted by error. This lets typeck of break expr to occur even though we've encountered an illegal break.

…ions, r=lcnr Don't consider regions in `deref_into_dyn_supertrait` lint I actually wonder if we should just warn on *any* deref impl with a target type that matches a supertrait by *def-id*. cc rust-lang#89460 r? types

…ler-errors intercrate_ambiguity_causes: handle self ty infer + reservation impls r? `@compiler-errors`

matthiaskrgr · 2023-11-20T19:56:57Z

@bors r+ rollup=never p=8

bors · 2023-11-20T19:57:00Z

📌 Commit 6c62b42 has been approved by matthiaskrgr

It is now in the queue for this repository.

bors · 2023-11-20T21:00:42Z

⌛ Testing commit 6c62b42 with merge b8e8b47...

…iaskrgr Rollup of 8 pull requests Successful merges: - rust-lang#117327 (Add documentation for some queries) - rust-lang#117835 (Note about object lifetime defaults in does not live long enough error) - rust-lang#117851 (Uplift `InferConst` to `rustc_type_ir`) - rust-lang#117973 (test: Add test for async-move in 2015 Rust proc macro) - rust-lang#117992 (Don't require intercrate mode for negative coherence) - rust-lang#118010 (Typeck break expr even if break is illegal) - rust-lang#118026 (Don't consider regions in `deref_into_dyn_supertrait` lint) - rust-lang#118089 (intercrate_ambiguity_causes: handle self ty infer + reservation impls) r? `@ghost` `@rustbot` modify labels: rollup

bors · 2023-11-20T21:05:02Z

💔 Test failed - checks-actions

rust-log-analyzer · 2023-11-20T21:06:56Z

A job failed! Check out the build log: (web) (plain)

Click to see the possible cause of the failure (guessed by this bot)

compiler-errors · 2023-11-20T21:08:19Z

@bors retry

bors · 2023-11-20T23:06:18Z

⌛ Testing commit 6c62b42 with merge 549c0b9...

…iaskrgr Rollup of 8 pull requests Successful merges: - rust-lang#117327 (Add documentation for some queries) - rust-lang#117835 (Note about object lifetime defaults in does not live long enough error) - rust-lang#117851 (Uplift `InferConst` to `rustc_type_ir`) - rust-lang#117973 (test: Add test for async-move in 2015 Rust proc macro) - rust-lang#117992 (Don't require intercrate mode for negative coherence) - rust-lang#118010 (Typeck break expr even if break is illegal) - rust-lang#118026 (Don't consider regions in `deref_into_dyn_supertrait` lint) - rust-lang#118089 (intercrate_ambiguity_causes: handle self ty infer + reservation impls) r? `@ghost` `@rustbot` modify labels: rollup

rust-log-analyzer · 2023-11-21T00:02:29Z

The job aarch64-gnu failed! Check out the build log: (web) (plain)

Click to see the possible cause of the failure (guessed by this bot)

[TIMING] core::build_steps::test::BookTest { compiler: Compiler { stage: 2, host: aarch64-unknown-linux-gnu }, path: "src/doc/rustc", name: "rustc", is_ext_doc: false } -- 2.520
[TIMING] core::build_steps::test::RustcBook { compiler: Compiler { stage: 2, host: aarch64-unknown-linux-gnu } } -- 0.000
Generating lint docs (aarch64-unknown-linux-gnu)
##[group]Running stage2 lint-docs (aarch64-unknown-linux-gnu)
##[error]The runner has received a shutdown signal. This can happen when the runner service is stopped, or a manually started runner is canceled.
##[group]Clock drift check
  local time: Tue Nov 21 00:02:08 UTC 2023
  local time: Tue Nov 21 00:02:08 UTC 2023
Session terminated, killing shell... ...killed.
##[error]The operation was canceled.
Cleaning up orphan processes

bors · 2023-11-21T00:02:52Z

💔 Test failed - checks-actions

compiler-errors · 2023-11-21T01:18:32Z

This also looks spurious, since it failed during lint docs.

@bors retry

bors · 2023-11-21T02:02:34Z

⌛ Testing commit 6c62b42 with merge baf4abf...

bors · 2023-11-21T03:58:31Z

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

rust-timer · 2023-11-21T04:00:46Z

📌 Perf builds for each rolled up PR:

PR#	Message	Perf Build Sha
#117327	Add documentation for some queries	`2acf7eb2e42cd838e72c78d883df4a7834b3de7d` (link)
#117835	Note about object lifetime defaults in does not live long e…	`2ae157b889fc318688d20656c1b254361aa862f9` (link)
#117851	Uplift `InferConst` to `rustc_type_ir`	`2d78ee40cee46c519f552c32fe7ba7973819acc8` (link)
#117973	test: Add test for async-move in 2015 Rust proc macro	`cebf357f421f83723f0657b542eddf9786645fbd` (link)
#117992	Don't require intercrate mode for negative coherence	`5856d236a3b3f1c5cf7504be5edd48f0cc305deb` (link)
#118010	Typeck break expr even if break is illegal	`f4edc8d3cfa3e0716af6c63a43f003979ed01081` (link)
#118026	Don't consider regions in `deref_into_dyn_supertrait` lint	`41ff8aa02ccd4fc2d5b688dd08d7acedc577cbc6` (link)
#118089	intercrate_ambiguity_causes: handle self ty infer + reserva…	`b4cc3a08ab45c8af1e92d96fc1026a471fd750be` (link)

previous master: 853492329c

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-11-21T23:37:40Z

Finished benchmarking commit (baf4abf): comparison URL.

Overall result: ✅ improvements - no action needed

@rustbot label: -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
Regressions ❌ (secondary)	-	-	0
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-2.3%	[-2.3%, -2.3%]	1
All ❌✅ (primary)	-	-	0

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.6%	[1.6%, 1.6%]	1
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-4.1%	[-4.1%, -4.1%]	1
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: 675.862s -> 674.861s (-0.15%)
Artifact size: 313.73 MiB -> 313.77 MiB (0.01%)

Noratrieb and others added 20 commits November 12, 2023 13:51

Add documentation for some queries

5e32da5

self ty infer ambiguity: add proof tree cand

97043c2

handle reservation impls, track impl source

35c8a37

Use InferTy from rustc_type_ir unconditionally

c3ba158

Uplift InferConst to rustc_type_ir

b4c3d7f

Don't drop region constraints that come from plugging infer regions w…

19a5e1d

…ith placeholders

Don't require intercrate mode for negative coherence

253f502

Don't consider regions in deref_into_dyn_supertrait lint

63b34cf

Bump future release warning mode

e6ca8e1

Rollup merge of rust-lang#117327 - Nilstrieb:more-query-docs, r=compi…

da5eebf

…ler-errors Add documentation for some queries

Rollup merge of rust-lang#117973 - CohenArthur:fix-89699, r=lqd

7fd7dad

test: Add test for async-move in 2015 Rust proc macro Fixes rust-lang#89699 Ran cargo bisect-rustc to find when this was fixed exactly, which is in 474709a

Rollup merge of rust-lang#118089 - lcnr:intercrate-ambig-msg, r=compi…

6c62b42

…ler-errors intercrate_ambiguity_causes: handle self ty infer + reservation impls 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 20, 2023

bors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Nov 20, 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 Nov 20, 2023

bors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Nov 21, 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 Nov 21, 2023

bors added the merged-by-bors This PR was explicitly merged by bors. label Nov 21, 2023

bors merged commit baf4abf into rust-lang:master Nov 21, 2023
12 checks passed

rustbot added this to the 1.76.0 milestone Nov 21, 2023

This was referenced Nov 21, 2023

blame the furthest statement in borrowck errors #113917

Closed

Add HashStable_NoContext to simplify HashStable implementations in rustc_type_ir #117580

Merged

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

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Rollup of 8 pull requests #118107

Rollup of 8 pull requests #118107

matthiaskrgr commented Nov 20, 2023

matthiaskrgr commented Nov 20, 2023

bors commented Nov 20, 2023

bors commented Nov 20, 2023

bors commented Nov 20, 2023

rust-log-analyzer commented Nov 20, 2023

compiler-errors commented Nov 20, 2023

bors commented Nov 20, 2023

rust-log-analyzer commented Nov 21, 2023

bors commented Nov 21, 2023

compiler-errors commented Nov 21, 2023

bors commented Nov 21, 2023

bors commented Nov 21, 2023

rust-timer commented Nov 21, 2023

rust-timer commented Nov 21, 2023

Rollup of 8 pull requests #118107

Rollup of 8 pull requests #118107

Conversation

matthiaskrgr commented Nov 20, 2023

matthiaskrgr commented Nov 20, 2023

bors commented Nov 20, 2023

bors commented Nov 20, 2023

bors commented Nov 20, 2023

rust-log-analyzer commented Nov 20, 2023

compiler-errors commented Nov 20, 2023

bors commented Nov 20, 2023

rust-log-analyzer commented Nov 21, 2023

bors commented Nov 21, 2023

compiler-errors commented Nov 21, 2023

bors commented Nov 21, 2023

bors commented Nov 21, 2023

rust-timer commented Nov 21, 2023

rust-timer commented Nov 21, 2023

Overall result: ✅ improvements - no action needed

Instruction count

Max RSS (memory usage)

Cycles

Binary size