Rollup of 10 pull requests #110546

matthiaskrgr · 2023-04-19T15:54:44Z

Successful merges:

'./configure' now checks if 'config.toml' exists before writing to that destination #110123 ('./configure' now checks if 'config.toml' exists before writing to that destination)
Spelling src bootstrap #110429 (Spelling src bootstrap)
Spelling src ci #110430 (Spelling src ci)
Don't special-case download-rustc in maybe_install_llvm #110515 (Don't special-case download-rustc in maybe_install_llvm)
Fix x test lint-docs linkchecker when download-rustc is enabled #110521 (Fix x test lint-docs linkchecker when download-rustc is enabled)
Fix tests/run-make-translation when download-rustc is enabled #110525 (Fix tests/run-make-translation when download-rustc is enabled)
small type system cleanup #110531 (small type system cleanup)
Missing blanket impl trait not public #110533 (Missing blanket impl trait not public)
Fix wrong comment in rustc_hir/src/hir.rs #110540 (Fix wrong comment in rustc_hir/src/hir.rs)
Fix various configure bugs #110541 (Fix various configure bugs)

Failed merges:

r? @ghost
@rustbot modify labels: rollup

…at destination

* although * correct * granular * libunwind * repository * section Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>

* architecture * configures * preparation * toolstate * unknown Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>

This is no longer necessary now that the llvm in `rust-dev` matches the one in `rustc`.

Bootstrap was setting LD_LIBRARY_PATH for bootstrap tools in `tool_cmd`, and rustc inherited that environment. That broke when download-rustc was enabled; see the new comment for details.

When building locally, we never generate a `share` directory in the local sysroot. However, when we download the `rustc` component from ci, it includes a `share/man` directory in the sysroot. The `run-make/translation` test assumed that it didn't exist, and would create a link from `fakeroot` to the real share directory, and write symbolic links into it. Change it not to create the link, so that rustc doesn't try to load multiple copies of the same `.ftl` file.

…correct exit code

Before, it only worked for numbers, not strings.

This also makes some other minor cleanups: - Suggest `python x.py` on windows instead of `./x.py`, which usually doesn't work - Move the "Configure and Make" section to a subsection of "Building on Unix" - Mention `config.toml` earlier - Suggest `x.py setup user` on Windows, since `configure` won't work

'./configure' now checks if 'config.toml' exists before writing to that destination Fixes rust-lang#110109 Instead of overwriting the current `config.toml` file, exit the `./configure` script with a message stating why.

…lbertlarsan68 Spelling src bootstrap The various src/* items seem slightly disparate, so I'm doing src/* individually. split from rust-lang#110392

…rsan68 Spelling src ci The various src/* items seem slightly disparate, so I'm doing src/* individually. split from rust-lang#110392

…rtlarsan68 Don't special-case download-rustc in `maybe_install_llvm` This is no longer necessary now that the llvm in `rust-dev` matches the one in `rustc`. cc rust-lang#110490 (comment), rust-lang#110263

…san68 Fix `x test lint-docs linkchecker` when download-rustc is enabled Bootstrap was setting LD_LIBRARY_PATH for bootstrap tools in `tool_cmd`, and rustc inherited that environment. That broke when download-rustc was enabled; see the new comment for details. Fixes rust-lang#110354

… r=albertlarsan68 Fix `tests/run-make-translation` when download-rustc is enabled When building locally, we never generate a `share` directory in the local sysroot. However, when we download the `rustc` component from ci, it includes a `share/man` directory in the sysroot. The `run-make/translation` test assumed that it didn't exist, and would create a link from `fakeroot` to the real share directory, and write symbolic links into it. Change it not to create the link, so that rustc doesn't try to load multiple copies of the same `.ftl` file. Fixes rust-lang#110357.

small type system cleanup

…l-trait-not-public, r=notriddle Missing blanket impl trait not public Fixes rust-lang#94183. The problem was that we should have checked if the trait was reachable instead of only "directly public". r? `@notriddle`

Fix wrong comment in rustc_hir/src/hir.rs

Fix various configure bugs Fixes rust-lang#107050. Fixes rust-lang#108928. Closes rust-lang#108641. I recommend reading this commit-by-commit to see the commit descriptions, but the code changes are small. This also changes the README to suggest `configure` instead of `printf`, as well as a few other cleanups described in the commit message.

matthiaskrgr · 2023-04-19T15:55:27Z

@bors r+ rollup=never p=10

bors · 2023-04-19T15:55:29Z

📌 Commit 0820e31 has been approved by matthiaskrgr

It is now in the queue for this repository.

bors · 2023-04-19T16:13:17Z

⌛ Testing commit 0820e31 with merge d7c55ca384776ab81435ed4b929c47e2b0238da6...

rust-log-analyzer · 2023-04-19T17:00:36Z

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

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

bors · 2023-04-19T17:01:04Z

💔 Test failed - checks-actions

matthiaskrgr · 2023-04-19T17:05:04Z

@bors retry no longs

bors · 2023-04-19T19:11:09Z

⌛ Testing commit 0820e31 with merge 9c51cf7...

bors · 2023-04-19T21:21:09Z

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

rust-timer · 2023-04-19T21:23:59Z

📌 Perf builds for each rolled up PR:

PR#	Perf Build Sha
#110541	9ef329c4475aa2afe9397e2ee7c625d8d5333024
#110540	26acd351eefddaa9d9a24e20bccc500652ac8732
#110533	94d9793f11b3dc4cdf76b33654e9d7c5a2cfdf4e
#110531	9607643fb0f785d93e1af0aec52bcb4e0f94218e
#110525	c21b27081505a3a8048bea54ee2a9367ddebd95e
#110521	c3d35f658079adb141ea48ce9917b48673a70629
#110515	e05a5074f06d40e648f5419a35e699ebc4adfa8e
#110430	5c739974a0ff29b057fb4a6ff25e9ae97d55f5c2
#110429	e374ee1812425177500ffc890bcfb81af852a4c7
#110123	f7c5cf6df085e2082b4d7ad605db9f93b62a4755

previous master: df0d9b492d

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-04-19T22:36:57Z

Finished benchmarking commit (9c51cf7): comparison URL.

Overall result: ❌✅ regressions and improvements - 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)	1.6%	[1.1%, 2.1%]	3
Regressions ❌ (secondary)	-	-	0
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-3.1%	[-3.1%, -3.1%]	1
All ❌✅ (primary)	1.6%	[1.1%, 2.1%]	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.0%	[4.0%, 4.0%]	1
Improvements ✅ (primary)	-2.3%	[-2.3%, -2.3%]	1
Improvements ✅ (secondary)	-	-	0
All ❌✅ (primary)	-2.3%	[-2.3%, -2.3%]	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)	2.4%	[1.7%, 3.5%]	4
Regressions ❌ (secondary)	-	-	0
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-	-	0
All ❌✅ (primary)	2.4%	[1.7%, 3.5%]	4

madsravn and others added 25 commits April 9, 2023 22:50

'./configure' now checks if 'config.toml' exists before writing to th…

9aa3f05

…at destination

Merge remote-tracking branch 'upstream/master'

69b12ff

Spelling src/bootstrap

70ce74e

* although * correct * granular * libunwind * repository * section Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>

Spelling src/ci

9c8d10a

* architecture * configures * preparation * toolstate * unknown Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>

Don't special-case download-rustc in maybe_install_llvm

5a8b189

This is no longer necessary now that the llvm in `rust-dev` matches the one in `rustc`.

Fix x test lint-docs when download-rustc is enabled

abf9cbc

Bootstrap was setting LD_LIBRARY_PATH for bootstrap tools in `tool_cmd`, and rustc inherited that environment. That broke when download-rustc was enabled; see the new comment for details.

small type system cleanup

16d061e

Fix missing blanket impl if the trait is not directly public

9876a11

Add regression test for rust-lang#94183

96f4f4e

Changing position of early exit and using standard error method with …

010d797

…correct exit code

configure: Fix bug in configure_top_level_key

6d07dbc

Before, it only worked for numbers, not strings.

Fix wrong comment in rustc_hir/src/hir.rs

0b6b72e

configure: Set profile = user by default

b7607a9

Rollup merge of rust-lang#110123 - madsravn:master, r=jyn514

73bfa18

'./configure' now checks if 'config.toml' exists before writing to that destination Fixes rust-lang#110109 Instead of overwriting the current `config.toml` file, exit the `./configure` script with a message stating why.

Rollup merge of rust-lang#110429 - jsoref:spelling-src-bootstrap, r=a…

af92c6a

…lbertlarsan68 Spelling src bootstrap The various src/* items seem slightly disparate, so I'm doing src/* individually. split from rust-lang#110392

Rollup merge of rust-lang#110430 - jsoref:spelling-src-ci, r=albertla…

dc0de09

…rsan68 Spelling src ci The various src/* items seem slightly disparate, so I'm doing src/* individually. split from rust-lang#110392

Rollup merge of rust-lang#110515 - jyn514:download-rustc-llvm, r=albe…

6fdc121

…rtlarsan68 Don't special-case download-rustc in `maybe_install_llvm` This is no longer necessary now that the llvm in `rust-dev` matches the one in `rustc`. cc rust-lang#110490 (comment), rust-lang#110263

Rollup merge of rust-lang#110531 - lcnr:type-system-stuff, r=aliemjay

75de33c

small type system cleanup

Rollup merge of rust-lang#110540 - safinaskar:patch-1, r=WaffleLapkin

b59658c

Fix wrong comment in rustc_hir/src/hir.rs

rustbot added T-infra Relevant to the infrastructure team, which will review and decide on the PR/issue. T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue. rollup A PR which is a rollup labels Apr 19, 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 19, 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 19, 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 19, 2023

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

bors merged commit 9c51cf7 into rust-lang:master Apr 19, 2023

rustbot added this to the 1.71.0 milestone Apr 19, 2023

This was referenced Apr 19, 2023

Introduce AliasKind::Inherent for inherent associated types #109410

Merged

configure --set support list as arguments #109702

Merged

rustbot added the perf-regression Performance regression. label Apr 19, 2023

matthiaskrgr mentioned this pull request Nov 20, 2023

ICE: broken MIR in DefId: index of non-array #118111

Closed

matthiaskrgr mentioned this pull request Feb 27, 2024

ICE: assertion failed: Binder == Binder #121688

Closed

matthiaskrgr deleted the rollup-346kik6 branch March 16, 2024 18:18

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Rollup of 10 pull requests #110546

Rollup of 10 pull requests #110546

matthiaskrgr commented Apr 19, 2023

matthiaskrgr commented Apr 19, 2023

bors commented Apr 19, 2023

bors commented Apr 19, 2023

rust-log-analyzer commented Apr 19, 2023

bors commented Apr 19, 2023

matthiaskrgr commented Apr 19, 2023

bors commented Apr 19, 2023

bors commented Apr 19, 2023

rust-timer commented Apr 19, 2023

rust-timer commented Apr 19, 2023

Rollup of 10 pull requests #110546

Rollup of 10 pull requests #110546

Conversation

matthiaskrgr commented Apr 19, 2023

matthiaskrgr commented Apr 19, 2023

bors commented Apr 19, 2023

bors commented Apr 19, 2023

rust-log-analyzer commented Apr 19, 2023

bors commented Apr 19, 2023

matthiaskrgr commented Apr 19, 2023

bors commented Apr 19, 2023

bors commented Apr 19, 2023

rust-timer commented Apr 19, 2023

rust-timer commented Apr 19, 2023

Overall result: ❌✅ regressions and improvements - ACTION NEEDED

Instruction count

Max RSS (memory usage)

Cycles