Rollup of 6 pull requests #109714

matthiaskrgr · 2023-03-29T04:02:44Z

Successful merges:

Improve error message when writer is forgotten in write and writeln macro #109149 (Improve error message when writer is forgotten in write and writeln macro)
Streamline fast rejection #109367 (Streamline fast rejection)
AnnotationColumn struct to fix hard tab column numbers in errors #109548 (AnnotationColumn struct to fix hard tab column numbers in errors)
do not panic on failure to acquire jobserver token #109694 (do not panic on failure to acquire jobserver token)
new solver: check for intercrate mode when accessing the cache #109705 (new solver: check for intercrate mode when accessing the cache)
Specialization involving RPITITs is broken so ignore the diagnostic differences #109708 (Specialization involving RPITITs is broken so ignore the diagnostic differences)

Failed merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

added ui test blessed stderrs fixed typo reblessed

It factors out a repeated code pattern.

It has a single callsite.

Because it has a single call site, and it lets us move a small amount of the work outside the loop.

…ifferences for them

…er-errors,WaffleLapkin Improve error message when writer is forgotten in write and writeln macro Modified write! macro error message when writer is forgotten as in issue rust-lang#108713 Fixes rust-lang#108713 r? ``@WaffleLapkin``

…compiler-errors Streamline fast rejection Some reworkings of this code that make it a little nicer. r? `@lcnr`

…th-hard-tabs, r=petrochenkov AnnotationColumn struct to fix hard tab column numbers in errors Fixes rust-lang#109537 i don't know if this is the best way of fixing this but it works

… r=bjorn3 do not panic on failure to acquire jobserver token Purpose: remove `panic`. Rust fails to acquire token if an error in build system occurs - environment variable contains incorrect `jobserver-auth`. It isn't ice so compiler shouldn't panic on such error. Related issue: rust-lang#46981

…-errors new solver: check for intercrate mode when accessing the cache r? ``@compiler-errors``

…er-errors Specialization involving RPITITs is broken so ignore the diagnostic differences Just bless the corresponding test for `-Zlower-impl-trait-in-trait-to-assoc-ty` r? `@compiler-errors`

matthiaskrgr · 2023-03-29T04:03:09Z

@bors r+ rollup=never p=6

bors · 2023-03-29T04:03:11Z

📌 Commit 439c68c has been approved by matthiaskrgr

It is now in the queue for this repository.

bors · 2023-03-29T04:23:10Z

⌛ Testing commit 439c68c with merge 40cd031...

bors · 2023-03-29T06:57:31Z

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

rust-timer · 2023-03-29T06:59:15Z

📌 Perf builds for each rolled up PR:

PR#	Perf Build Sha
#109708	54fd83499f547729d80c731c2869cdcf13a672aa
#109705	d9b9f02d0fc2fa21770bf072386170cf60ec2e78
#109694	af805cfa17e75f1f995b1e3d1a5e53890e3ef671
#109548	c8795dac902277f0723f16276859bf9583ce0e0e
#109367	95204a33d65f0abf428737b5c1e3fdcf539b8b2c
#109149	830ec0e34537c1c08f494f3cdbe6786508dce3c0

previous master: acd27bb557

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-03-29T08:13:59Z

Finished benchmarking commit (40cd031): 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.4%	[-0.7%, -0.3%]	5
Improvements ✅ (secondary)	-	-	0
All ❌✅ (primary)	-0.4%	[-0.7%, -0.3%]	5

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.1%	[0.1%, 0.1%]	1
Regressions ❌ (secondary)	-	-	0
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-2.4%	[-2.4%, -2.4%]	1
All ❌✅ (primary)	0.1%	[0.1%, 0.1%]	1

Cycles

This benchmark run did not return any relevant results for this metric.

ASISBusiness

RQ

mj10021 and others added 14 commits March 27, 2023 21:01

check for write macro and write_fmt with err msg

ff88787

added ui test blessed stderrs fixed typo reblessed

Create AnnotationColumn struct to fix hard tab column numbers in errors

b82608a

[fix] don't panic on failure to acquire jobserver token

be6a09f

check for intercrate mode when accessing the cache

27a3b10

Introduce DeepRejectCtxt::substs_refs_may_unify.

47225e8

It factors out a repeated code pattern.

Inline and remove generic_args_may_unify.

9fa6947

It has a single callsite.

Inline and remove SelectionContext::fast_reject_trait_refs.

0392366

Because it has a single call site, and it lets us move a small amount of the work outside the loop.

Specialization involving RPITITs is broken so ignore the diagnostic d…

eb7f645

…ifferences for them

Rollup merge of rust-lang#109367 - nnethercote:opt-fast-rejection, r=…

ba21643

…compiler-errors Streamline fast rejection Some reworkings of this code that make it a little nicer. r? `@lcnr`

Rollup merge of rust-lang#109548 - pommicket:better-column-numbers-wi…

6be27b1

…th-hard-tabs, r=petrochenkov AnnotationColumn struct to fix hard tab column numbers in errors Fixes rust-lang#109537 i don't know if this is the best way of fixing this but it works

Rollup merge of rust-lang#109705 - lcnr:coherence-caching, r=compiler…

9d6c36e

…-errors new solver: check for intercrate mode when accessing the cache r? ``@compiler-errors``

Rollup merge of rust-lang#109708 - spastorino:new-rpitit-20, r=compil…

439c68c

…er-errors Specialization involving RPITITs is broken so ignore the diagnostic differences Just bless the corresponding test for `-Zlower-impl-trait-in-trait-to-assoc-ty` 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 Mar 29, 2023

bors added the merged-by-bors This PR was explicitly merged by bors. label Mar 29, 2023

bors merged commit 40cd031 into rust-lang:master Mar 29, 2023

rustbot added this to the 1.70.0 milestone Mar 29, 2023

bors mentioned this pull request Mar 29, 2023

Don't emit alias-relate goal if projections are structurally equal after resolving vars #109617

Closed

ASISBusiness reviewed Jul 5, 2023

View reviewed changes

matthiaskrgr deleted the rollup-wipns5h branch March 16, 2024 18:20

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Rollup of 6 pull requests #109714

Rollup of 6 pull requests #109714

matthiaskrgr commented Mar 29, 2023

matthiaskrgr commented Mar 29, 2023

bors commented Mar 29, 2023

bors commented Mar 29, 2023

bors commented Mar 29, 2023

rust-timer commented Mar 29, 2023

rust-timer commented Mar 29, 2023

ASISBusiness left a comment

Rollup of 6 pull requests #109714

Rollup of 6 pull requests #109714

Conversation

matthiaskrgr commented Mar 29, 2023

matthiaskrgr commented Mar 29, 2023

bors commented Mar 29, 2023

bors commented Mar 29, 2023

bors commented Mar 29, 2023

rust-timer commented Mar 29, 2023

rust-timer commented Mar 29, 2023

Overall result: ✅ improvements - no action needed

Instruction count

Max RSS (memory usage)

Cycles

ASISBusiness left a comment

Choose a reason for hiding this comment