Rollup of 4 pull requests #118957

workingjubilee · 2023-12-15T00:07:49Z

Successful merges:

Add all known target_feature configs to check-cfg #118908 (Add all known target_feature configs to check-cfg)
Cleanup errors handlers even more #118933 (Cleanup errors handlers even more)
update measureme to 10.1.2 to deduplicate parking_lot #118943 (update measureme to 10.1.2 to deduplicate parking_lot)
Use the Waker::noop API in tests #118948 (Use the Waker::noop API in tests)

r? @ghost
@rustbot modify labels: rollup

It has a single call site.

It's necessary for `derive(Diagnostic)`, but is best avoided elsewhere because there are clearer alternatives. This required adding `Handler::struct_almost_fatal`.

It's unclear why this is used here. All entries in the third column of `UNICODE_ARRAY` are covered by `ASCII_ARRAY`, so if the lookup fails it's a genuine compiler bug. It was added way back in rust-lang#29837, for no clear reason. This commit changes it to `span_bug`, which is more typical.

To `msg: impl Into<DiagnosticMessage>`, like all the other diagnostics. For consistency.

The `Handler` functions that directly emit diagnostics can be more easily implemented using `struct_foo(msg).emit()`. This mirrors `Handler::emit_err` which just does `create_err(err).emit()`. `Handler::bug` is not converted because of weirdness involving conflation bugs and fatal errors with `EmissionGuarantee`. I'll fix that later.

Compare `Handler::warn` and `Handler::span_warn`. Conceptually they are almost identical. But their implementations are weirdly different. `warn`: - calls `DiagnosticBuilder::<()>::new(self, Warning(None), msg)`, then `emit()` - which calls `G::diagnostic_builder_emit_producing_guarantee(self)` - which calls `handler.emit_diagnostic(&mut db.inner.diagnostic)` `span_warn`: - calls `self.emit_diag_at_span(Diagnostic::new(Warning(None), msg), span)` - which calls `self.emit_diagnostic(diag.set_span(sp))` I.e. they both end up at `emit_diagnostic`, but take very different routes to get there. This commit changes `span_*` and similar ones to not use `emit_diag_at_span`. Instead they just call `struct_span_*` + `emit`. Some nice side-effects of this: - `span_fatal` and `span_fatal_with_code` don't need `FatalError.raise()`, because `emit` does that. - `span_err` and `span_err_with_code` doesn't need `unwrap`. - `struct_span_note`'s `span` arg type is changed from `Span` to `impl Into<MultiSpan>` like all the other functions.

Currently, `emit_diagnostic` takes `&mut self`. This commit changes it so `emit_diagnostic` takes `self` and the new `emit_diagnostic_without_consuming` function takes `&mut self`. I find the distinction useful. The former case is much more common, and avoids a bunch of `mut` and `&mut` occurrences. We can also restrict the latter with `pub(crate)` which is nice.

…=TaKO8Ki,GuillaumeGomez,workingjubilee Add all known `target_feature` configs to check-cfg This PR adds all the known `target_feature` from ~~`rustc_codegen_ssa`~~ `rustc_target` to the well known list of check-cfg. It does so by moving the list from `rustc_codegen_ssa` to `rustc_target` ~~`rustc_session` (I not sure about this, but some of the moved function take a `Session`)~~, then using it the `fill_well_known` function. This already proved to be useful since portable-simd had a bad cfg. cc `@nnethercote` (since we discussed it in rust-lang#118494)

…re, r=compiler-errors Cleanup errors handlers even more A sequel to rust-lang#118587. r? `@compiler-errors`

update `measureme` to 10.1.2 to deduplicate `parking_lot` This PR updates `measureme` to the latest release to remove the last duplicates of `parking_lot` 0.11 we had in our dependency tree. ```console Updating measureme v10.1.1 -> v10.1.2 Removing parking_lot v0.11.2 Removing parking_lot_core v0.8.6 ``` Also removes `instant` from the allowed list of dependencies, as it's no longer used. r? `@michaelwoerister` (Thanks for the release in the first place 🙏)

Use the `Waker::noop` API in tests Avoids the need to duplicate this code over and over again r? eholk

workingjubilee · 2023-12-15T00:08:06Z

@bors r+ rollup=never p=4

bors · 2023-12-15T00:08:09Z

📌 Commit 9648c48 has been approved by workingjubilee

It is now in the queue for this repository.

bors · 2023-12-15T00:14:14Z

⌛ Testing commit 9648c48 with merge 03515c6...

bors · 2023-12-15T02:14:48Z

☀️ Test successful - checks-actions
Approved by: workingjubilee
Pushing 03515c6 to master...

rust-timer · 2023-12-15T02:15:58Z

📌 Perf builds for each rolled up PR:

PR#	Message	Perf Build Sha
#118908	Add all known `target_feature` configs to check-cfg	`fbaf04b11d92b3eea26353dbc38973e890fb82fa` (link)
#118933	Cleanup errors handlers even more	`13e4a8f009b904e2aba57ac2445918b762f526c2` (link)
#118943	update `measureme` to 10.1.2 to deduplicate `parking_lot`	`78342cd93e32f5ebfded46738199a99a7313db55` (link)
#118948	Use the `Waker::noop` API in tests	`5034e6a16b071078c65d1a128b4a30d49eddc6fe` (link)

previous master: de686cbc65

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-12-15T04:21:52Z

Finished benchmarking commit (03515c6): 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

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.8%	[0.7%, 0.9%]	2
Regressions ❌ (secondary)	-	-	0
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-	-	0
All ❌✅ (primary)	0.8%	[0.7%, 0.9%]	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)	-0.8%	[-0.8%, -0.8%]	1
Improvements ✅ (secondary)	-	-	0
All ❌✅ (primary)	-0.8%	[-0.8%, -0.8%]	1

Binary size

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

Bootstrap: 672.615s -> 671.324s (-0.19%)
Artifact size: 312.48 MiB -> 312.42 MiB (-0.02%)

nnethercote and others added 19 commits December 14, 2023 15:53

Remove unused Handler::treat_err_as_bug.

43a0f55

Inline and remove HandlerInner::emit_diag_at_span.

dc05a30

It has a single call site.

Avoid struct_diagnostic where possible.

7bdb227

It's necessary for `derive(Diagnostic)`, but is best avoided elsewhere because there are clearer alternatives. This required adding `Handler::struct_almost_fatal`.

Move rustc_codegen_ssa target features to rustc_target

428395e

Use all the known features in check-cfg

acac133

Don't forget pure rustc target features in check-cfg

c355040

Fix target_feature config in portable-simd

3ea1331

update measureme to 10.1.2 to deduplicate parking_lot

4cb2a28

remove instant from allowed dependencies

05b64a8

Use the Waker::noop API in tests

3c17514

Change msg: impl Into<String> for bug diagnostics.

19d28a4

To `msg: impl Into<DiagnosticMessage>`, like all the other diagnostics. For consistency.

Rollup merge of rust-lang#118933 - nnethercote:cleanup-errors-even-mo…

9e872b7

…re, r=compiler-errors Cleanup errors handlers even more A sequel to rust-lang#118587. r? `@compiler-errors`

Rollup merge of rust-lang#118948 - compiler-errors:noop, r=eholk

9648c48

Use the `Waker::noop` API in tests Avoids the need to duplicate this code over and over again r? eholk

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 15, 2023

bors added the merged-by-bors This PR was explicitly merged by bors. label Dec 15, 2023

bors merged commit 03515c6 into rust-lang:master Dec 15, 2023

rustbot added this to the 1.76.0 milestone Dec 15, 2023

This was referenced Dec 15, 2023

Stabilize Wasm target features that are in phase 4 and 5 #117457

Merged

Stabilize Wasm relaxed SIMD #117468

Merged

Range experiment #118769

Closed

workingjubilee deleted the rollup-2hcwnp3 branch December 15, 2023 04:16

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Rollup of 4 pull requests #118957

Rollup of 4 pull requests #118957

Uh oh!

workingjubilee commented Dec 15, 2023

Uh oh!

workingjubilee commented Dec 15, 2023

Uh oh!

bors commented Dec 15, 2023

Uh oh!

bors commented Dec 15, 2023

Uh oh!

bors commented Dec 15, 2023

Uh oh!

rust-timer commented Dec 15, 2023

Uh oh!

rust-timer commented Dec 15, 2023

Uh oh!

Uh oh!

Rollup of 4 pull requests #118957

Rollup of 4 pull requests #118957

Uh oh!

Conversation

workingjubilee commented Dec 15, 2023

Uh oh!

workingjubilee commented Dec 15, 2023

Uh oh!

bors commented Dec 15, 2023

Uh oh!

bors commented Dec 15, 2023

Uh oh!

bors commented Dec 15, 2023

Uh oh!

rust-timer commented Dec 15, 2023

Uh oh!

rust-timer commented Dec 15, 2023

Overall result: no relevant changes - no action needed

Instruction count

Max RSS (memory usage)

Cycles

Binary size

Uh oh!

Uh oh!