Rollup of 6 pull requests #110127

matthiaskrgr · 2023-04-09T21:40:06Z

Successful merges:

Instantiate instead of erasing binder when probing param methods #108843 (Instantiate instead of erasing binder when probing param methods)
Add little is_test_crate function #109985 (Add little is_test_crate function)
Migrate rustc_hir_analysis to session diagnostic [Part 3] #110028 (Migrate rustc_hir_analysis to session diagnostic [Part 3])
Migrate remainder of rustc_ty_utils to SessionDiagnostic #110095 (Migrate remainder of rustc_ty_utils to SessionDiagnostic)
Add renaming of ignore-git to changelog #110108 (Add renaming of ignore-git to changelog)
compiletest: Give a better error message if node isn't installed #110114 (compiletest: Give a better error message if node isn't installed)

Failed merges:

r? @ghost
@rustbot modify labels: rollup

Part 3: Finishing `collect.rs` file

Fix formatting that rustfmt can't handle currently. Co-authored-by: Michael Goulet <michael@errs.io>

…rs-method-probe, r=jackh726 Instantiate instead of erasing binder when probing param methods Fixes rust-lang#108836 There is a really old comment saying that a `WhereClauseCandidate` probe candidate "should not contain any inference variables", but I'm not really confident that that comment applies anymore. In contrast, other candidates that we assemble during method probe contain inference variables in their substitutions (e.g. `InherentImplCandidate`)... Since this change is made only to support a nightly feature, I'm happy to gate the new behavior behind this feature flag or discuss it further. r? types

…errors Add little `is_test_crate` function Ok, this is quite a story. I'm mainly a Clippy contributor, so I was fixing [this Clippy issue](rust-lang/rust-clippy#10584) about a lint having to ignore test modules but that wasn't ignoring test files (integration test, `test/` dirs and such). As test **files** don't tend to have an inner `#[cfg(test)]` module inside them, I tried everything, looking for filenames, looking for item's parents in the HIR Map, doing black magic... I even asked [on Zulip](https://rust-lang.zulipchat.com/#narrow/stream/122651-general/topic/.E2.9C.94.20Checking.20if.20file.20is.20integration.20test), and jyn answered something about `--cfg test`. Aha! That's something that I might be looking for, so I started looking at `rustc_driver_impl` flag parsing and configuration and all that. Then, I stumbled on [this function right here](https://github.com/rust-lang/rust/blob/2e486be8d29d198d48bc26bfce5712a4822814f5/compiler/rustc_driver_impl/src/lib.rs#L174-L181), and noticed the argument `config: Config`. That's a hint. So [Config](https://doc.rust-lang.org/beta/nightly-rustc/rustc_interface/interface/struct.Config.html) has the field `opts: Options`, and [`Options`](https://doc.rust-lang.org/beta/nightly-rustc/rustc_session/options/struct.Options.html) has the field `test`. This journey has been ~7 or 8 hours in 3 days, it's a very hard thing to find, so this PR adds a mini-function to check if the current crate is a testing one. So that no one has to travel through the same as me, and can just search for `is_test_crate` in the documentation.

…tics-3, r=compiler-errors Migrate `rustc_hir_analysis` to session diagnostic [Part 3] Part 3: Finishing `collect.rs` file r? ``@compiler-errors``

…, r=compiler-errors Migrate remainder of rustc_ty_utils to `SessionDiagnostic` This moves the remaining errors in `rust_ty_utils` to `SessionsDiagnostic`. r? ``@davidtwco``

…gelog, r=ozkanonur Add renaming of ignore-git to changelog `bootstrap`'s `ignore-git` option has been renamed to `omit-git-hash` in rust-lang#110059. This PR adds this change to the `CHANGELOG.md`. See also rust-lang#110020 (comment).

compiletest: Give a better error message if `node` isn't installed

matthiaskrgr · 2023-04-09T21:40:28Z

@bors r+ rollup=never p=6

bors · 2023-04-09T21:40:30Z

📌 Commit dd5942d has been approved by matthiaskrgr

It is now in the queue for this repository.

bors · 2023-04-09T23:12:42Z

⌛ Testing commit dd5942d with merge b845362c5b6f3077313b1a52eaecd31c3fb9bdf1...

bors · 2023-04-10T00:17:21Z

💔 Test failed - checks-actions

bors · 2023-04-10T00:34:30Z

⌛ Testing commit dd5942d with merge f5c05d46a95a14916f3179b8847f79efce99bcee...

bors · 2023-04-10T00:40:19Z

💔 Test failed - checks-actions

ehuss · 2023-04-10T00:51:44Z

@bors retry

crates.io network blip

bors · 2023-04-10T01:36:54Z

⌛ Testing commit dd5942d with merge b6d27939c490f5a9438c6b1815c7fcad9d18b438...

bors · 2023-04-10T01:42:31Z

💔 Test failed - checks-actions

ehuss · 2023-04-10T01:57:14Z

@bors treeclosed=10

crates.io is still failing

ehuss · 2023-04-10T01:57:43Z

@bors retry p=10

bors · 2023-04-10T01:57:53Z

⌛ Testing commit dd5942d with merge 3c2e2dd...

rust-log-analyzer · 2023-04-10T02:07:36Z

The job dist-armhf-linux failed! Check out the build log: (web) (plain)

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

ehuss · 2023-04-10T03:32:04Z

@bors treeclosed-

Looks like it is resolved.

bors · 2023-04-10T04:09:23Z

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

rust-timer · 2023-04-10T04:11:07Z

📌 Perf builds for each rolled up PR:

PR#	Perf Build Sha
#110114	e43b7861a1e398b1d637e6c95733fa661299f097
#110108	3b2f12924b196d5aec17b545108167b9b219bf7b
#110095	a971043f972ae66023290f2d5a167e1c40ccc559
#110028	1e86b2a0c7a149411917652787018bf77df8ae6d
#109985	be8744877de03a9c4b8aa00a3589ae7def9c2d41
#108843	d274f798778652250759c93d06c455ad1f2cec19

previous master: 696aaad58c

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-log-analyzer · 2023-04-10T04:52:56Z

The job dist-mips64el-linux failed! Check out the build log: (web) (plain)

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

rust-timer · 2023-04-10T05:25:36Z

Finished benchmarking commit (3c2e2dd): 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)	-5.9%	[-8.4%, -3.0%]	3
Improvements ✅ (secondary)	-	-	0
All ❌✅ (primary)	-5.9%	[-8.4%, -3.0%]	3

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.8%	[2.5%, 7.1%]	2
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)	-	-	0
Improvements ✅ (primary)	-4.8%	[-6.6%, -2.4%]	3
Improvements ✅ (secondary)	-	-	0
All ❌✅ (primary)	-4.8%	[-6.6%, -2.4%]	3

rust-log-analyzer · 2023-04-10T07:46:14Z

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)

compiler-errors and others added 17 commits March 7, 2023 05:41

Instantiate instead of erasing binder when probing param methods

b7a5f3a

Move FnPtrAddr error to SessionDiagnostic

f7f2eb3

Migrate rustc_hir_analysis to session diagnostic

066638b

Part 3: Finishing `collect.rs` file

Move SIMD layout errors to SessionDiagnostic

804e938

Update compiler/rustc_ty_utils/src/layout.rs

8e76c76

Fix formatting that rustfmt can't handle currently. Co-authored-by: Michael Goulet <michael@errs.io>

Add test for new delayed bug code path

c17a705

Add renaming of ignore-git to changelog

5c75dcd

Add PR link to changelog entry for renaming of ignore-git

3fcc007

Add little is_test_crate function

28e19f1

compiletest: Give a better error message if node isn't installed

7ca7c8f

Migrate sess.opts.tests uses to sess.is_test_crate()

2c97676

Rollup merge of rust-lang#110028 - obeis:hir-analysis-migrate-diagnos…

164d70d

…tics-3, r=compiler-errors Migrate `rustc_hir_analysis` to session diagnostic [Part 3] Part 3: Finishing `collect.rs` file r? ``@compiler-errors``

Rollup merge of rust-lang#110095 - matthewjasper:ty-utils-diagnostics…

f482745

…, r=compiler-errors Migrate remainder of rustc_ty_utils to `SessionDiagnostic` This moves the remaining errors in `rust_ty_utils` to `SessionsDiagnostic`. r? ``@davidtwco``

Rollup merge of rust-lang#110114 - jyn514:wasm-errors, r=compiler-errors

dd5942d

compiletest: Give a better error message if `node` isn't installed

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 Apr 9, 2023

bors removed the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Apr 10, 2023

bors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Apr 10, 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 Apr 10, 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 Apr 10, 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 Apr 10, 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 Apr 10, 2023

bors added the merged-by-bors This PR was explicitly merged by bors. label Apr 10, 2023

bors merged commit 3c2e2dd into rust-lang:master Apr 10, 2023

rustbot added this to the 1.70.0 milestone Apr 10, 2023

matthiaskrgr deleted the rollup-6ui12x5 branch March 16, 2024 18:18

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Rollup of 6 pull requests #110127

Rollup of 6 pull requests #110127

matthiaskrgr commented Apr 9, 2023

matthiaskrgr commented Apr 9, 2023

bors commented Apr 9, 2023

bors commented Apr 9, 2023

bors commented Apr 10, 2023

bors commented Apr 10, 2023

bors commented Apr 10, 2023

ehuss commented Apr 10, 2023

bors commented Apr 10, 2023

bors commented Apr 10, 2023

ehuss commented Apr 10, 2023

ehuss commented Apr 10, 2023

bors commented Apr 10, 2023

rust-log-analyzer commented Apr 10, 2023

ehuss commented Apr 10, 2023

bors commented Apr 10, 2023

rust-timer commented Apr 10, 2023

rust-log-analyzer commented Apr 10, 2023

rust-timer commented Apr 10, 2023

rust-log-analyzer commented Apr 10, 2023

Rollup of 6 pull requests #110127

Rollup of 6 pull requests #110127

Conversation

matthiaskrgr commented Apr 9, 2023

matthiaskrgr commented Apr 9, 2023

bors commented Apr 9, 2023

bors commented Apr 9, 2023

bors commented Apr 10, 2023

bors commented Apr 10, 2023

bors commented Apr 10, 2023

ehuss commented Apr 10, 2023

bors commented Apr 10, 2023

bors commented Apr 10, 2023

ehuss commented Apr 10, 2023

ehuss commented Apr 10, 2023

bors commented Apr 10, 2023

rust-log-analyzer commented Apr 10, 2023

ehuss commented Apr 10, 2023

bors commented Apr 10, 2023

rust-timer commented Apr 10, 2023

rust-log-analyzer commented Apr 10, 2023

rust-timer commented Apr 10, 2023

Overall result: ✅ improvements - no action needed

Instruction count

Max RSS (memory usage)

Cycles

rust-log-analyzer commented Apr 10, 2023