Rollup of 5 pull requests #130200

matthiaskrgr · 2024-09-10T15:35:17Z

Successful merges:

miri-test-libstd: add missing BOOTSTRAP_ARGS #130143 (miri-test-libstd: add missing BOOTSTRAP_ARGS)
rustdoc: add two regression tests #130173 (rustdoc: add two regression tests)
rustc_mir_transform cleanups 3 #130175 (rustc_mir_transform cleanups 3)
coverage: Clean up terminology in counter creation #130184 (coverage: Clean up terminology in counter creation)
abi/compatibility test: remove tests inside repr(C) wrappers #130185 (abi/compatibility test: remove tests inside repr(C) wrappers)

r? @ghost
@rustbot modify labels: rollup

also don't unnecessarily set BOOTSTRAP_SKIP_TARGET_SANITY while we are at it

By reflowing comment lines that are too long, and a few that are very short. Plus some other very minor formatting tweaks.

These are all functions with a single callsite, where having a separate function does nothing to help with readability. These changes make the code a little shorter and easier to read.

The "as" is equivalent to "because", but I originally read it more like "when", which was confusing.

This was non-obvious to me.

In all cases the struct can own the relevant thing instead of having a reference to it. This makes the code simpler, and in some cases removes a struct lifetime.

It's a thin wrapper around `check_live_drops`, but it's enough to fix the FIXME comment.

The counter-creation code needs to know which BCB nodes require counters, but isn't interested in why, so treat that as an opaque detail.

This makes the graph terminology a bit more consistent, and avoids potential confusion with branch coverage.

…ler-errors miri-test-libstd: add missing BOOTSTRAP_ARGS Note sure if BOOTSTRAP_ARGS will make any difference here, but all the other x.py invocations have it and I did not *deliberately* leave it away when I added these, so... probably best to add them? Also don't unnecessarily set BOOTSTRAP_SKIP_TARGET_SANITY while we are at it.

…=notriddle rustdoc: add two regression tests They were basically copy/pasted from `tests/ui/` to `tests/rustdoc-ui/`. Not sure if it's worth adding these, I can just close these issues as is if you want. This brings the number of https://github.com/rust-lang/rust/labels/T-rustdoc + https://github.com/rust-lang/rust/labels/E-needs-test from 3 down to 1. The remaining one – rust-lang#103004 — is a nasty one to retroactively find a proper(!) test for. Fixes rust-lang#98250. Fixes rust-lang#107872. r? rustdoc

…eanups-3, r=saethlin `rustc_mir_transform` cleanups 3 More cleanups in the style of rust-lang#129929. r? `@saethlin`

coverage: Clean up terminology in counter creation Some of the terminology in this module is confusing, or has drifted out of sync with other parts of the coverage code. This PR therefore renames some variables and methods, and adjusts comments and debug logging statements, to make things clearer and more consistent. No functional changes, other than some small tweaks to debug logging.

…s, r=compiler-errors abi/compatibility test: remove tests inside repr(C) wrappers When I wrote the test I assumed we'd guarantee ABI compatibility to be "structural" wrt `repr(C)` types, i.e. if two `repr(C)` types have all their fields be pairwise ABI-compatible then the types are ABI-compatible. That got removed from the ABI compatibility docs before they landed, though, so let's also remove it from this test.

matthiaskrgr · 2024-09-10T15:35:56Z

@bors r+ rollup=never p=5

bors · 2024-09-10T15:35:59Z

📌 Commit a42d67e has been approved by matthiaskrgr

It is now in the queue for this repository.

bors · 2024-09-10T17:28:31Z

⌛ Testing commit a42d67e with merge 2a6bc2f...

…iaskrgr Rollup of 5 pull requests Successful merges: - rust-lang#130143 (miri-test-libstd: add missing BOOTSTRAP_ARGS) - rust-lang#130173 (rustdoc: add two regression tests) - rust-lang#130175 (`rustc_mir_transform` cleanups 3) - rust-lang#130184 (coverage: Clean up terminology in counter creation) - rust-lang#130185 (abi/compatibility test: remove tests inside repr(C) wrappers) r? `@ghost` `@rustbot` modify labels: rollup

rust-log-analyzer · 2024-09-10T19:13:45Z

The job x86_64-msvc-ext failed! Check out the build log: (web) (plain)

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

[RUSTC-TIMING] miri test:false 4.547
error: failed to remove file `C:\a\rust\rust\build\x86_64-pc-windows-msvc\stage1-tools\x86_64-pc-windows-msvc\release\miri.exe`

Caused by:
  Access is denied. (os error 5)
Command has failed. Rerun with -v to see more details.
  local time: Tue, Sep 10, 2024  7:13:28 PM
  network time: Tue, 10 Sep 2024 19:13:28 GMT
##[error]Process completed with exit code 1.
Post job cleanup.

bors · 2024-09-10T19:14:20Z

💔 Test failed - checks-actions

matthiaskrgr · 2024-09-10T19:19:35Z

@bors retry

bors · 2024-09-10T20:18:30Z

⌛ Testing commit a42d67e with merge 0ee7cb5...

bors · 2024-09-10T22:46:34Z

☀️ Test successful - checks-actions
Approved by: matthiaskrgr
Pushing 0ee7cb5 to master...

rust-timer · 2024-09-10T22:47:59Z

📌 Perf builds for each rolled up PR:

PR#	Message	Perf Build Sha
#130143	miri-test-libstd: add missing BOOTSTRAP_ARGS	`dbf9327721ac0c4e2d2a9349680ee9947f47e120` (link)
#130173	rustdoc: add two regression tests	`37b31a4da1911c21641ffc144e1a44bc429b019e` (link)
#130175	`rustc_mir_transform` cleanups 3	`669fc159e5db1b3e5bc7c5fef0bf9c9cdaaa89bb` (link)
#130184	coverage: Clean up terminology in counter creation	`b96b2e22156ef1a90e7d0ac1d32e070bb89a81e6` (link)
#130185	abi/compatibility test: remove tests inside repr(C) wrappers	`7fcc81282e27bb298d2cc7ac8aa95774a0456342` (link)

previous master: 33855f80d4

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-09-11T00:29:18Z

Finished benchmarking commit (0ee7cb5): comparison URL.

Overall result: no relevant changes - no action needed

@rustbot label: -perf-regression

Instruction count

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

Max RSS (memory usage)

Results (primary 2.1%, secondary -0.3%)

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.1%	[2.1%, 2.1%]	1
Regressions ❌ (secondary)	2.6%	[2.6%, 2.6%]	1
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-3.2%	[-3.2%, -3.2%]	1
All ❌✅ (primary)	2.1%	[2.1%, 2.1%]	1

Cycles

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

Binary size

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

Bootstrap: 757.872s -> 756.373s (-0.20%)
Artifact size: 341.32 MiB -> 341.27 MiB (-0.01%)

RalfJung and others added 19 commits September 9, 2024 12:12

bootstrap/Makefile.in: miri: add missing BOOTSTRAP ARGS

62d196f

also don't unnecessarily set BOOTSTRAP_SKIP_TARGET_SANITY while we are at it

rustdoc: add two regression tests

6d61dfd

Improve comment formatting.

8235af0

By reflowing comment lines that are too long, and a few that are very short. Plus some other very minor formatting tweaks.

Inline and remove some functions.

48064d4

These are all functions with a single callsite, where having a separate function does nothing to help with readability. These changes make the code a little shorter and easier to read.

Clarify a comment.

baa16d2

The "as" is equivalent to "because", but I originally read it more like "when", which was confusing.

Add a useful comment.

e26692d

Add a useful comment about PromoteTemps.

51e1c39

This was non-obvious to me.

Use IndexVec::from_raw to construct a const IndexVec.

d1c55a3

Remove references from some structs.

7023402

In all cases the struct can own the relevant thing instead of having a reference to it. This makes the code simpler, and in some cases removes a struct lifetime.

Make check_live_drops into a MirLint.

8949b44

It's a thin wrapper around `check_live_drops`, but it's enough to fix the FIXME comment.

coverage: Avoid referring to "coverage spans" in counter creation

96d545a

The counter-creation code needs to know which BCB nodes require counters, but isn't interested in why, so treat that as an opaque detail.

coverage: Avoid referring to out-edges as "branches"

8be70c7

This makes the graph terminology a bit more consistent, and avoids potential confusion with branch coverage.

coverage: Avoid referring to "operands" in counter creation

10cd5e8

abi/compatibility test: remove tests inside repr(C) wrappers

8607575

Rollup merge of rust-lang#130175 - nnethercote:rustc_mir_transform-cl…

accd77e

…eanups-3, r=saethlin `rustc_mir_transform` cleanups 3 More cleanups in the style of rust-lang#129929. r? `@saethlin`

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 Sep 10, 2024

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 Sep 10, 2024

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 Sep 10, 2024

bors added the merged-by-bors This PR was explicitly merged by bors. label Sep 10, 2024

bors merged commit 0ee7cb5 into rust-lang:master Sep 10, 2024
7 checks passed

rustbot added this to the 1.83.0 milestone Sep 10, 2024

This was referenced Sep 10, 2024

Support mcdc analysis for pattern matching #124278

Open

[Coverage][MCDC] Adapt mcdc to llvm 19 #126733

Merged

Encode coroutine_by_move_body_def_id in crate metadata #130201

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Rollup of 5 pull requests #130200

Rollup of 5 pull requests #130200

matthiaskrgr commented Sep 10, 2024

matthiaskrgr commented Sep 10, 2024

bors commented Sep 10, 2024

bors commented Sep 10, 2024

rust-log-analyzer commented Sep 10, 2024

bors commented Sep 10, 2024

matthiaskrgr commented Sep 10, 2024

bors commented Sep 10, 2024

bors commented Sep 10, 2024

rust-timer commented Sep 10, 2024

rust-timer commented Sep 11, 2024

Rollup of 5 pull requests #130200

Rollup of 5 pull requests #130200

Conversation

matthiaskrgr commented Sep 10, 2024

matthiaskrgr commented Sep 10, 2024

bors commented Sep 10, 2024

bors commented Sep 10, 2024

rust-log-analyzer commented Sep 10, 2024

bors commented Sep 10, 2024

matthiaskrgr commented Sep 10, 2024

bors commented Sep 10, 2024

bors commented Sep 10, 2024

rust-timer commented Sep 10, 2024

rust-timer commented Sep 11, 2024

Overall result: no relevant changes - no action needed

Instruction count

Max RSS (memory usage)

Cycles

Binary size