Rollup of 8 pull requests #113006

GuillaumeGomez · 2023-06-24T18:26:47Z

Successful merges:

[-Ztrait-solver=next, mir-typeck] instantiate hidden types in the root universe #112703 ([-Ztrait-solver=next, mir-typeck] instantiate hidden types in the root universe)
fix: add cfg diagnostic for unresolved import error #112854 (fix: add cfg diagnostic for unresolved import error)
style-guide: Rewrite let-else section for clarity, without changing formatting #112912 (style-guide: Rewrite let-else section for clarity, without changing formatting)
Update runtests.py : grammar correction #112915 (Update runtests.py : grammar correction)
issue template: add clippy entry which points to the clippy repo #112971 (issue template: add clippy entry which points to the clippy repo)
Add a regression test for #109141 #112989 (Add a regression test for ICE: generic_const_exprs: ´assertion failed: self.errors_reported` #109141)
bootstrap: Backup settings.json to the correct filename #113002 (bootstrap: Backup settings.json to the correct filename)
Fix old python deprecation check in x.py #113003 (Fix old python deprecation check in x.py)

r? @ghost
@rustbot modify labels: rollup

…ormatting The section as written did not cover all cases, and left some of them implicit. Rewrite it to systematically cover all cases. Place examples immediately following the corresponding case. In the process, reorder to move the simplest cases first: start with single-line and add progressively more line breaks. This does not change the meaning of the section at all, and in particular does not change the defined style for let-else statements.

Signed-off-by: Yuki Okushi <jtitor@2k36.org>

The old code actually replaced `.json` with `.bak` (so, `settings.bak`), rather than appending `.bak` as claimed (`settings.json.bak`). `Path::set_extension` can instead be used with dots: > The new extension may contain dots and will be used in its entirety, > but only the part after the final dot will be reflected in > self.extension.

The warning suppression variable was not checked correctly.

…ompiler-errors [-Ztrait-solver=next, mir-typeck] instantiate hidden types in the root universe Fixes an ICE in the test `member-constraints-in-root-universe`. Main motivation is to make rust-lang#112691 pass under the new solver. r? ``@compiler-errors``

fix: add cfg diagnostic for unresolved import error Fixes rust-lang#112674 An easy fix, r? `@Nilstrieb`

…ications, r=calebcartwright style-guide: Rewrite let-else section for clarity, without changing formatting The section as written did not cover all cases, and left some of them implicit. Rewrite it to systematically cover all cases. Place examples immediately following the corresponding case. In the process, reorder to move the simplest cases first: start with single-line and add progressively more line breaks. This does not change the meaning of the section at all, and in particular does not change the defined style for let-else statements.

…lacrum Update runtests.py : grammar correction - Grammatically corrected the sentence

…Simulacrum issue template: add clippy entry which points to the clippy repo Try to guide people to the clippy repo.

…-errors Add a regression test for rust-lang#109141 Closes rust-lang#109141 r? ``@compiler-errors``

…jyn514 bootstrap: Backup `settings.json` to the correct filename The old code actually replaced `.json` with `.bak` (so, `settings.bak`), rather than appending `.bak` as claimed (`settings.json.bak`). `Path::set_extension` can instead be used with dots: > The new extension may contain dots and will be used in its entirety, > but only the part after the final dot will be reflected in > `self.extension`. r? ``@jyn514``

…precation-warning, r=jyn514 Fix old python deprecation check in x.py The warning suppression variable was not checked correctly. I tested it with python 2.7 and it worked correctly.

GuillaumeGomez · 2023-06-24T18:26:58Z

@bors r+ p=8 rollup=never

bors · 2023-06-24T18:27:00Z

📌 Commit 4d9ba1a has been approved by GuillaumeGomez

It is now in the queue for this repository.

bors · 2023-06-24T21:04:18Z

⌛ Testing commit 4d9ba1a with merge f7ca9df...

bors · 2023-06-24T23:45:32Z

☀️ Test successful - checks-actions
Approved by: GuillaumeGomez
Pushing f7ca9df to master...

rust-timer · 2023-06-24T23:47:46Z

📌 Perf builds for each rolled up PR:

PR#	Perf Build Sha
#113003	5f96b066195213b9fa0dd4fc45dc885774a7f517
#113002	0b446ed9c7dcfaa46be83be3439004483e14d577
#112989	1ae5f9a30dca23fa929d6edb0d2bed3a05069971
#112971	c2320664a18be91a169edf3b2b28bbfa399a567c
#112915	40967a5effe36f72fdbcc2d59c47572927ed9a96
#112912	7857b03a988721a9ea6928f4468c6db79c1c9263
#112854	6410c2f250d6cd7fb8eb03083510c58b76755174
#112703	294d9a20368d99bc4495a58bd4fe21e88992d5b0

previous master: 69a63737fa

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-06-25T00:58:58Z

Finished benchmarking commit (f7ca9df): 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.6%	[0.3%, 1.2%]	30
Regressions ❌ (secondary)	0.6%	[0.3%, 0.9%]	20
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-	-	0
All ❌✅ (primary)	0.6%	[0.3%, 1.2%]	30

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)	2.7%	[2.7%, 2.7%]	1
Regressions ❌ (secondary)	3.1%	[3.0%, 3.2%]	2
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-	-	0
All ❌✅ (primary)	2.7%	[2.7%, 2.7%]	1

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)	4.6%	[1.6%, 10.7%]	9
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-	-	0
All ❌✅ (primary)	-	-	0

Binary size

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

Bootstrap: 661.855s -> 662.756s (0.14%)

Mark-Simulacrum · 2023-06-27T12:38:36Z

Many (all those I checked) of these regressions recovered in the next commit, so dropping the regression label. Likely some kind of noise.

joshtriplett and others added 16 commits June 21, 2023 16:18

Update runtests.py : grammar correction

e5e4805

issue template: add clippy entry which points to the clippy repo

5a0c8e3

Add a regression test for rust-lang#109141

13cc8dd

Signed-off-by: Yuki Okushi <jtitor@2k36.org>

instantiate hidden types in root universe

a72013f

fix: add cfg diagnostic for unresolved import error

8c8c7ef

Fix old python deprecation check in x.py

f799e78

The warning suppression variable was not checked correctly.

Rollup merge of rust-lang#112854 - bvanjoi:fix-112674, r=Nilstrieb

a1f2f23

fix: add cfg diagnostic for unresolved import error Fixes rust-lang#112674 An easy fix, r? `@Nilstrieb`

Rollup merge of rust-lang#112915 - preveen-stack:patch-1, r=Mark-Simu…

530516f

…lacrum Update runtests.py : grammar correction - Grammatically corrected the sentence

Rollup merge of rust-lang#112971 - matthiaskrgr:templ_clippy, r=Mark-…

f0907b2

…Simulacrum issue template: add clippy entry which points to the clippy repo Try to guide people to the clippy repo.

Rollup merge of rust-lang#112989 - JohnTitor:issue-109141, r=compiler…

9e0f427

…-errors Add a regression test for rust-lang#109141 Closes rust-lang#109141 r? ``@compiler-errors``

Rollup merge of rust-lang#113003 - Nilstrieb:uh-yeah-so-about-that-de…

4d9ba1a

…precation-warning, r=jyn514 Fix old python deprecation check in x.py The warning suppression variable was not checked correctly. I tested it with python 2.7 and it worked correctly.

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 Jun 24, 2023

bors mentioned this pull request Jun 24, 2023

rustdoc: Align search results horizontally for easy scanning #112937

Merged

bors added the merged-by-bors This PR was explicitly merged by bors. label Jun 24, 2023

bors merged commit f7ca9df into rust-lang:master Jun 24, 2023

rustbot added this to the 1.72.0 milestone Jun 24, 2023

rustbot added the perf-regression Performance regression. label Jun 25, 2023

GuillaumeGomez deleted the rollup-l2js0wa branch June 25, 2023 08:45

Mark-Simulacrum removed the perf-regression Performance regression. label Jun 27, 2023

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Rollup of 8 pull requests #113006

Rollup of 8 pull requests #113006

GuillaumeGomez commented Jun 24, 2023

GuillaumeGomez commented Jun 24, 2023

bors commented Jun 24, 2023

bors commented Jun 24, 2023

bors commented Jun 24, 2023

rust-timer commented Jun 24, 2023

rust-timer commented Jun 25, 2023

Mark-Simulacrum commented Jun 27, 2023

Rollup of 8 pull requests #113006

Rollup of 8 pull requests #113006

Conversation

GuillaumeGomez commented Jun 24, 2023

GuillaumeGomez commented Jun 24, 2023

bors commented Jun 24, 2023

bors commented Jun 24, 2023

bors commented Jun 24, 2023

rust-timer commented Jun 24, 2023

rust-timer commented Jun 25, 2023

Overall result: ❌ regressions - ACTION NEEDED

Instruction count

Max RSS (memory usage)

Cycles

Binary size

Mark-Simulacrum commented Jun 27, 2023