Rollup of 3 pull requests #116346

matthiaskrgr · 2023-10-02T14:23:55Z

Successful merges:

Some small cleanups in rustc_abi #116313 (Some small cleanups in rustc_abi)
Correct misleading std::fmt::Binary example (#116165) #116326 (Correct misleading std::fmt::Binary example (documentation for fmt binary trait: slightly misleading example #116165))
skip_binder to instantiate_identity #116340 (skip_binder to instantiate_identity)

r? @ghost
@rustbot modify labels: rollup

To match `parse_address_space` and `parse_bits` above.

By making every `alt_foo` exactly match a `foo`.

Some small cleanups in `rustc_abi` Minor things I found while looking at this crate's code. r? `@the8472`

…oshtriplett Correct misleading std::fmt::Binary example (rust-lang#116165) Nothing too crazy... - Add two to the width specifier (so all 32 bits are correctly displayed) - Pad out the compared string so the assert passes - Add `// Note` comment highlighting the need for the extra width when using the `#` flag. The exact contents (and placement?) of the note are, of course, highly bikesheddable.

…ompiler-errors `skip_binder` to `instantiate_identity`

matthiaskrgr · 2023-10-02T14:24:19Z

@bors r rollup=never p=3

bors · 2023-10-02T14:24:21Z

📌 Commit cfe9e13 has been approved by matthiaskrgr

It is now in the queue for this repository.

bors · 2023-10-02T15:56:35Z

⌛ Testing commit cfe9e13 with merge 5ead745...

bors · 2023-10-02T17:46:59Z

☀️ Test successful - checks-actions
Approved by: matthiaskrgr
Pushing 5ead745 to master...

rust-timer · 2023-10-02T17:47:52Z

📌 Perf builds for each rolled up PR:

PR#	Message	Perf Build Sha
#116313	Some small cleanups in `rustc_abi`	`5d4b7ef075711dd8b48832156394af3c3216a89c` (link)
#116326	Correct misleading std::fmt::Binary example (#116165)	`59b6263d5ddd73e7a400855f9b8b3ef6d2282a8c` (link)
#116340	`skip_binder` to `instantiate_identity`	`8195db976efa7b8c09f39c07b099ee28e0e9ed76` (link)

previous master: b0889cb4ed

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-10-02T19:09:14Z

Finished benchmarking commit (5ead745): comparison URL.

Overall result: ❌ regressions - 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)	1.1%	[1.1%, 1.1%]	1
Regressions ❌ (secondary)	-	-	0
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-	-	0
All ❌✅ (primary)	1.1%	[1.1%, 1.1%]	1

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)	1.2%	[1.2%, 1.2%]	1
Regressions ❌ (secondary)	4.6%	[4.6%, 4.6%]	1
Improvements ✅ (primary)	-2.2%	[-2.2%, -2.2%]	1
Improvements ✅ (secondary)	-	-	0
All ❌✅ (primary)	-0.5%	[-2.2%, 1.2%]	2

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

Binary size

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

Bootstrap: 628.193s -> 628.136s (-0.01%)
Artifact size: 273.37 MiB -> 273.35 MiB (-0.01%)

nnethercote and others added 9 commits October 1, 2023 21:57

Minor comment and whitespace tweaks.

86ecfdd

Rename two parsing closures.

ddb7422

To match `parse_address_space` and `parse_bits` above.

Remove unnecessary pubs.

2369adc

Name some local variables more consistently.

17e3793

By making every `alt_foo` exactly match a `foo`.

Correct misleading std::fmt::Binary example

f2ecf7c

skip_binder to instantiate_identity

dbc2cc8

Rollup merge of rust-lang#116313 - nnethercote:rustc_abi, r=the8472

e51a2aa

Some small cleanups in `rustc_abi` Minor things I found while looking at this crate's code. r? `@the8472`

Rollup merge of rust-lang#116340 - lcnr:early-binder-skip_binder, r=c…

cfe9e13

…ompiler-errors `skip_binder` to `instantiate_identity`

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 Oct 2, 2023

bors added the merged-by-bors This PR was explicitly merged by bors. label Oct 2, 2023

bors merged commit 5ead745 into rust-lang:master Oct 2, 2023
12 checks passed

rustbot added this to the 1.75.0 milestone Oct 2, 2023

bors mentioned this pull request Oct 2, 2023

Bring back generic parameters for indices in rustc_abi and make it compile on stable #116269

Merged

pvdrz mentioned this pull request Oct 4, 2023

Fix divergence from upstream master ferrocene/ferrocene#23

Merged

matthiaskrgr deleted the rollup-uwepk8j branch March 16, 2024 18:19

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Rollup of 3 pull requests #116346

Rollup of 3 pull requests #116346

matthiaskrgr commented Oct 2, 2023

matthiaskrgr commented Oct 2, 2023

bors commented Oct 2, 2023

bors commented Oct 2, 2023

bors commented Oct 2, 2023

rust-timer commented Oct 2, 2023

rust-timer commented Oct 2, 2023

Rollup of 3 pull requests #116346

Rollup of 3 pull requests #116346

Conversation

matthiaskrgr commented Oct 2, 2023

matthiaskrgr commented Oct 2, 2023

bors commented Oct 2, 2023

bors commented Oct 2, 2023

bors commented Oct 2, 2023

rust-timer commented Oct 2, 2023

rust-timer commented Oct 2, 2023

Overall result: ❌ regressions - no action needed

Instruction count

Max RSS (memory usage)

Cycles

Binary size