Rollup of 6 pull requests #133841

matthiaskrgr · 2024-12-04T04:42:11Z

Successful merges:

Update NonZero and NonNull to not field-project (per MCP#807) #133651 (Update NonZero and NonNull to not field-project (per MCP#807))
rustdoc: Rename set_back_info to restore_module_data. #133764 (rustdoc: Rename set_back_info to restore_module_data.)
Fix MutVisitor's default implementations to visit Stmt's and BinOp's spans #133784 (Fix MutVisitor's default implementations to visit Stmt's and BinOp's spans)
stop replacing bivariant args with 'static when computing closure requirements #133798 (stop replacing bivariant args with 'static when computing closure requirements)
Improve code for FileName retrieval in rustdoc #133804 (Improve code for FileName retrieval in rustdoc)
Use eprintln instead of println in bootstrap/compiletest/tidy #133817 (Use eprintln instead of println in bootstrap/compiletest/tidy)

Failed merges:

remove unnecessary eval_verify_bound #133810 (remove unnecessary eval_verify_bound)

r? @ghost
@rustbot modify labels: rollup

It is unnecessary, these get constrained when checking that the opaque type is well-formed. It also results in the opaque type no longer being well formed. If you've got `fn foo<'a>() -> impl Sized + 'a` the opaque is `type Opaque<'a, 'aDummy> where 'a: 'aDummy, 'aDummy: 'a` where `'aDummy` is bivariant. If we call `foo::<'b>()` inside of a closure and its return type ends up in a type test, we start out with the WF `Opaque<'b, 'b>`, and then replace the bivariant `'b` with `'static`. `Opaque<'b, 'static>` is no longer well-formed. Given how these type tests are used, I don't think this caused any practical issues.

…projection, r=oli-obk Update `NonZero` and `NonNull` to not field-project (per MCP#807) rust-lang/compiler-team#807 (comment) was accepted, so this is the first PR towards moving the library to not using field projections into `[rustc_layout_scalar_valid_range_*]` types. `NonZero` was already using `transmute` nearly everywhere, so there are very few changes to it. `NonNull` needed more changes, but they're mostly simple, changing `.pointer` to `.as_ptr()`. r? libs cc rust-lang#133324, which will tidy up some of the MIR from this a bit more, but isn't a blocker.

…omez rustdoc: Rename `set_back_info` to `restore_module_data`. Follow-up to rust-lang#133345, r? `@GuillaumeGomez` Most of the references to `info` got removed as it was clear that `module_data` makes more sense here. Makes it clearer that `save_module_data` and `restore_module_data` are a pair.

Fix MutVisitor's default implementations to visit Stmt's and BinOp's spans The `Stmt` case is a bug introduced almost certainly unintentionally by rust-lang#126993. The code _used_ to visit and mutate `span` correctly, but got changed as follows by that PR. Notice how `span` is **copied** into the output by `|kind| Stmt { id, kind, span }` which happens after the mutation in the correct code (red) and before the mutation in the incorrect code (green). ```diff pub fn noop_flat_map_stmt<T: MutVisitor>( Stmt { kind, mut span, mut id }: Stmt, vis: &mut T, ) -> SmallVec<[Stmt; 1]> { vis.visit_id(&mut id); - vis.visit_span(&mut span); let stmts: SmallVec<_> = noop_flat_map_stmt_kind(kind, vis) .into_iter() .map(|kind| Stmt { id, kind, span }) .collect(); if stmts.len() > 1 { panic!(...); } + vis.visit_span(&mut span); stmts } ```

…iler-errors stop replacing bivariant args with `'static` when computing closure requirements It is unnecessary, these get constrained when checking that the opaque type is well-formed. It also results in the opaque type no longer being well formed. If you've got `fn foo<'a>() -> impl Sized + 'a` the opaque is `type Opaque<'a, 'aDummy> where 'a: 'aDummy, 'aDummy: 'a` where `'aDummy` is bivariant. If we call `foo::<'b>()` inside of a closure and its return type ends up in a type test, we start out with the WF `Opaque<'b, 'b>`, and then replace the bivariant `'b` with `'static`. `Opaque<'b, 'static>` is no longer well-formed. Given how these type tests are used, I don't think this caused any practical issues. r? types

…riddle Improve code for FileName retrieval in rustdoc Some calls were performed twice (first in `is_real_and_local` and then in the function calling it). Also the `FileName` was matched on a few times too. r? `@notriddle`

…eyouxu Use `eprintln` instead of `println` in bootstrap/compiletest/tidy A big unconditional CTRL-F replace to start with to check if there's anything that CI expects to be on stdout r? `@jieyouxu`

matthiaskrgr · 2024-12-04T04:42:35Z

@bors r+ rollup=never p=7

bors · 2024-12-04T04:42:38Z

📌 Commit 0585134 has been approved by matthiaskrgr

It is now in the queue for this repository.

bors · 2024-12-04T07:24:29Z

⌛ Testing commit 0585134 with merge 733616f...

bors · 2024-12-04T10:32:25Z

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

rust-timer · 2024-12-04T10:34:12Z

📌 Perf builds for each rolled up PR:

PR#	Message	Perf Build Sha
#133651	Update `NonZero` and `NonNull` to not field-project (per MC…	`571bc7e5f9e30fd326916c16cdf05ccc0c5844ad` (link)
#133764	rustdoc: Rename `set_back_info` to `restore_module_data`.	`3984e429c7747d7992980c67fec286fe29a66473` (link)
#133784	Fix MutVisitor's default implementations to visit Stmt's an…	`42952d75cfb162a2a4cf11ccf0f56ba71c34dc08` (link)
#133798	stop replacing bivariant args with `'static` when computing…	`e6d0889b1e998b1e2a69e7aaac77e3b895a3963d` (link)
#133804	Improve code for FileName retrieval in rustdoc	`5e01c4adee9830b65606b6637a90786474f95d6a` (link)
#133817	Use `eprintln` instead of `println` in bootstrap/compiletes…	`8b07dabab3c566811b6f333ef341c9b440f2bc4a` (link)

previous master: 2633e01929

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 · 2024-12-04T12:33:47Z

Finished benchmarking commit (733616f): comparison URL.

Overall result: ❌✅ regressions and improvements - please read the text below

Our benchmarks found a performance regression caused by this PR.
This might be an actual regression, but it can also be just noise.

Next Steps:

If the regression was expected or you think it can be justified,
please write a comment with sufficient written justification, and add
@rustbot label: +perf-regression-triaged to it, to mark the regression as triaged.
If you think that you know of a way to resolve the regression, try to create
a new PR with a fix for the regression.
If you do not understand the regression or you think that it is just noise,
you can ask the @rust-lang/wg-compiler-performance working group for help (members of this group
were already notified of this PR).

@rustbot label: +perf-regression
cc @rust-lang/wg-compiler-performance

Instruction count

This is the most reliable metric that we have; it was used to determine the overall result at the top of this comment. However, even this metric can sometimes exhibit noise.

	mean	range	count
Regressions ❌ (primary)	0.7%	[0.2%, 1.4%]	10
Regressions ❌ (secondary)	0.6%	[0.6%, 0.6%]	1
Improvements ✅ (primary)	-0.3%	[-0.5%, -0.1%]	2
Improvements ✅ (secondary)	-0.2%	[-0.4%, -0.1%]	5
All ❌✅ (primary)	0.5%	[-0.5%, 1.4%]	12

Max RSS (memory usage)

Results (primary -1.9%)

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.6%	[1.6%, 3.6%]	2
Regressions ❌ (secondary)	-	-	0
Improvements ✅ (primary)	-4.2%	[-6.8%, -1.6%]	4
Improvements ✅ (secondary)	-	-	0
All ❌✅ (primary)	-1.9%	[-6.8%, 3.6%]	6

Cycles

Results (primary 1.1%)

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)	1.1%	[1.0%, 1.3%]	3
Regressions ❌ (secondary)	-	-	0
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-	-	0
All ❌✅ (primary)	1.1%	[1.0%, 1.3%]	3

Binary size

Results (primary 0.2%, secondary -0.4%)

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.3%	[0.0%, 2.6%]	54
Regressions ❌ (secondary)	0.1%	[0.0%, 0.3%]	8
Improvements ✅ (primary)	-0.2%	[-0.6%, -0.1%]	12
Improvements ✅ (secondary)	-1.4%	[-6.1%, -0.2%]	5
All ❌✅ (primary)	0.2%	[-0.6%, 2.6%]	66

Bootstrap: 767.384s -> 766.894s (-0.06%)
Artifact size: 330.84 MiB -> 330.84 MiB (0.00%)

Mark-Simulacrum · 2024-12-09T12:56:48Z

@rust-timer build e6d0889

rust-timer · 2024-12-09T14:14:52Z

Finished benchmarking commit (e6d0889): comparison URL.

Overall result: ✅ improvements - no action needed

Instruction count

This is the most reliable metric that we have; it was used to determine the overall result at the top of this comment. However, even this metric can sometimes exhibit noise.

	mean	range	count
Regressions ❌ (primary)	-	-	0
Regressions ❌ (secondary)	-	-	0
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-0.3%	[-0.3%, -0.3%]	1
All ❌✅ (primary)	-	-	0

Max RSS (memory usage)

Results (secondary 3.4%)

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

Cycles

Results (primary -2.5%, secondary 3.0%)

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)	3.0%	[2.4%, 3.9%]	9
Improvements ✅ (primary)	-2.5%	[-2.5%, -2.5%]	1
Improvements ✅ (secondary)	-	-	0
All ❌✅ (primary)	-2.5%	[-2.5%, -2.5%]	1

Binary size

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

Bootstrap: 767.384s -> 764.718s (-0.35%)
Artifact size: 330.84 MiB -> 330.82 MiB (-0.00%)

aDotInTheVoid and others added 19 commits December 2, 2024 19:06

rustdoc: Rename set_back_info to restore_module_data.

cb9838c

update instrumentation

67defd7

small code cleanup

65d0b5d

Visit BinOp span in MutVisitor::visit_expr

a2eca35

Visit Stmt span in MutVisitor::flat_map_stmt

a3cfe2f

Improve code for FileName retrieval in rustdoc

2e1f25b

closure-requirements: add regression tests

1c96ddd

Update NonZero and NonNull to not field-project (per MCP807)

7afce4f

Rename is_real_and_local function into filename_real_and_local

2997ec5

bootstrap: println! -> eprintln!

3fadb87

compiletest: println! -> eprintln!

2372561

tidy: println! -> eprintln!

8374f7c

Rollup merge of rust-lang#133817 - clubby789:bootstrap-eprintln, r=ji…

0585134

…eyouxu Use `eprintln` instead of `println` in bootstrap/compiletest/tidy A big unconditional CTRL-F replace to start with to check if there's anything that CI expects to be on stdout r? `@jieyouxu`

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 Dec 4, 2024

bors added the merged-by-bors This PR was explicitly merged by bors. label Dec 4, 2024

bors merged commit 733616f into rust-lang:master Dec 4, 2024
7 checks passed

rustbot added this to the 1.85.0 milestone Dec 4, 2024

rustbot added the perf-regression Performance regression. label Dec 4, 2024

This comment has been minimized.

Sign in to view

matthiaskrgr deleted the rollup-2snj3hc branch January 25, 2025 09:13

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Rollup of 6 pull requests #133841

Rollup of 6 pull requests #133841

Uh oh!

matthiaskrgr commented Dec 4, 2024

Uh oh!

matthiaskrgr commented Dec 4, 2024

Uh oh!

bors commented Dec 4, 2024

Uh oh!

bors commented Dec 4, 2024

Uh oh!

bors commented Dec 4, 2024

Uh oh!

Uh oh!

rust-timer commented Dec 4, 2024

Uh oh!

rust-timer commented Dec 4, 2024

Uh oh!

Mark-Simulacrum commented Dec 9, 2024

Uh oh!

This comment has been minimized.

rust-timer commented Dec 9, 2024

Uh oh!

Uh oh!

Rollup of 6 pull requests #133841

Rollup of 6 pull requests #133841

Uh oh!

Conversation

matthiaskrgr commented Dec 4, 2024

Uh oh!

matthiaskrgr commented Dec 4, 2024

Uh oh!

bors commented Dec 4, 2024

Uh oh!

bors commented Dec 4, 2024

Uh oh!

bors commented Dec 4, 2024

Uh oh!

Uh oh!

rust-timer commented Dec 4, 2024

Uh oh!

rust-timer commented Dec 4, 2024

Overall result: ❌✅ regressions and improvements - please read the text below

Uh oh!

Mark-Simulacrum commented Dec 9, 2024

Uh oh!

This comment has been minimized.

rust-timer commented Dec 9, 2024

Overall result: ✅ improvements - no action needed

Uh oh!

Uh oh!