Rollup of 10 pull requests #121327

Noratrieb · 2024-02-20T06:35:50Z

Successful merges:

Change leak check and suspicious auto trait lint warning messages #120716 (Change leak check and suspicious auto trait lint warning messages)
unstable-book: Separate testing and production sanitizers #121195 (unstable-book: Separate testing and production sanitizers)
Merge CompilerError::CompilationFailed and CompilerError::ICE. #121205 (Merge CompilerError::CompilationFailed and CompilerError::ICE.)
Move the extra directives for Mode::CoverageRun into iter_header #121233 (Move the extra directives for Mode::CoverageRun into iter_header)
Allow AST and HIR visitors to return ControlFlow #121256 (Allow AST and HIR visitors to return ControlFlow)
Drive-by DUMMY_SP -> Span and fmt changes #121307 (Drive-by DUMMY_SP -> Span and fmt changes)
Add regression test for #103369 #121308 (Add regression test for Noisy conflicting implementations error for a trait which has a const generic parameter that panics in multiple implementations #103369)
Remove an old hack for rustdoc #121310 (Remove an old hack for rustdoc)
Make is_nonoverlapping #[inline] #121311 (Make is_nonoverlapping #[inline])
return ty::Error when equating ty::Error #121319 (return ty::Error when equating ty::Error)

r? @ghost
@rustbot modify labels: rollup

`CompilerError` has `CompilationFailed` and `ICE` variants, which seems reasonable at first. But the way it identifies them is flawed: - If compilation errors out, i.e. `RunCompiler::run` returns an `Err`, it uses `CompilationFailed`, which is reasonable. - If compilation panics with `FatalError`, it catches the panic and uses `ICE`. This is sometimes right, because ICEs do cause `FatalError` panics, but sometimes wrong, because certain compiler errors also cause `FatalError` panics. (The compiler/rustdoc/clippy/whatever just catches the `FatalError` with `catch_with_exit_code` in `main`.) In other words, certain non-ICE compilation failures get miscategorized as ICEs. It's not possible to reliably distinguish the two cases, so this commit merges them. It also renames the combined variant as just `Failed`, to better match the existing `Interrupted` and `Skipped` variants. Here is an example of a non-ICE failure that causes a `FatalError` panic, from `tests/ui/recursion_limit/issue-105700.rs`: ``` #![recursion_limit="4"] #![invalid_attribute] #![invalid_attribute] #![invalid_attribute] #![invalid_attribute] #![invalid_attribute] //~^ERROR recursion limit reached while expanding fn main() {{}} ```

When these extra directives were ported over as part of rust-lang#112300, it made sense to introduce `iter_header_extra` and pass them in as an extra argument. But now that rust-lang#120881 has added a `mode` parameter to `iter_header` for its own purposes, it's slightly simpler to move the coverage special-case code directly into `iter_header` as well. This lets us get rid of `iter_header_extra`.

… future

Noticed these while doing something else. There's no practical change, but it's preferable to use `DUMMY_SP` as little as possible, particularly when we have perfectlly useful `Span`s available.

It showed up with 3% execution time in a compiler profile.

This helps iron out a difference between Sub and Equate

…r=lcnr Change leak check and suspicious auto trait lint warning messages The leak check lint message "this was previously accepted by the compiler but is being phased out; it will become a hard error in a future release!" is misleading as some cases may not be phased out and could end being accepted. This is under discussion still. The suspicious auto trait lint the change in behavior already happened, so the new message is probably more accurate. r? `@lcnr` Closes rust-lang#93367

unstable-book: Separate testing and production sanitizers This is a redo of [this PR](rust-lang#108942). Left the commit as before (except for reflowing to 80-width), since it already got approved.

…rError, r=oli-obk Merge `CompilerError::CompilationFailed` and `CompilerError::ICE`. `CompilerError` has `CompilationFailed` and `ICE` variants, which seems reasonable at first. But the way it identifies them is flawed: - If compilation errors out, i.e. `RunCompiler::run` returns an `Err`, it uses `CompilationFailed`, which is reasonable. - If compilation panics with `FatalError`, it catches the panic and uses `ICE`. This is sometimes right, because ICEs do cause `FatalError` panics, but sometimes wrong, because certain compiler errors also cause `FatalError` panics. (The compiler/rustdoc/clippy/whatever just catches the `FatalError` with `catch_with_exit_code` in `main`.) In other words, certain non-ICE compilation failures get miscategorized as ICEs. It's not possible to reliably distinguish the two cases, so this commit merges them. It also renames the combined variant as just `Failed`, to better match the existing `Interrupted` and `Skipped` variants. Here is an example of a non-ICE failure that causes a `FatalError` panic, from `tests/ui/recursion_limit/issue-105700.rs`: ``` #![recursion_limit="4"] #![invalid_attribute] #![invalid_attribute] #![invalid_attribute] #![invalid_attribute] #![invalid_attribute] //~^ERROR recursion limit reached while expanding fn main() {{}} ``` r? ``@spastorino``

Move the extra directives for `Mode::CoverageRun` into `iter_header` When these extra directives were ported over as part of rust-lang#112300, it made sense to introduce `iter_header_extra` and pass them in as an extra argument. But now that rust-lang#120881 has added a `mode` parameter to `iter_header` for its own purposes, it's slightly simpler to move the coverage special-case code directly into `iter_header` as well. This lets us get rid of `iter_header_extra`.

Allow AST and HIR visitors to return `ControlFlow` Alternative to rust-lang#108598. Since rust-lang/libs-team#187 was rejected, this implements our own version of the `Try` trait (`VisitorResult`) and the `try` macro (`try_visit`). Since this change still allows visitors to return `()`, no changes have been made to the existing ones. They can be done in a separate PR.

Drive-by `DUMMY_SP` -> `Span` and fmt changes Noticed these while doing something else. There's no practical change, but it's preferable to use `DUMMY_SP` as little as possible, particularly when we have perfectlly useful `Span`s available.

Add regression test for rust-lang#103369 The issue was fixed in 1.70.0. Closes rust-lang#103369.

…rieb Remove an old hack for rustdoc Since rust-lang#78696 has been resolved

…thlin Make `is_nonoverlapping` `#[inline]` It showed up with 3% execution time in a compiler profile. backlink to rust-lang#120848 r? ``@saethlin``

return `ty::Error` when equating `ty::Error` This helps iron out a difference in diagnostics between `Sub` and `Equate` relations, which I'm currently trying to unify. r? oli-obk

Noratrieb · 2024-02-20T06:36:08Z

@bors r+ rollup=never p=10

bors · 2024-02-20T06:36:10Z

📌 Commit 599768d has been approved by Nilstrieb

It is now in the queue for this repository.

bors · 2024-02-20T06:56:44Z

⌛ Testing commit 599768d with merge 5af2130...

bors · 2024-02-20T09:00:20Z

☀️ Test successful - checks-actions
Approved by: Nilstrieb
Pushing 5af2130 to master...

rust-timer · 2024-02-20T09:03:19Z

📌 Perf builds for each rolled up PR:

PR#	Message	Perf Build Sha
#120716	Change leak check and suspicious auto trait lint warning me…	`cfbc193b0a1eec073f7662d4c433a0c36112e6d4` (link)
#121195	unstable-book: Separate testing and production sanitizers	`0009fcf989a7700a1dc88f17a71e4531390b74dc` (link)
#121205	Merge `CompilerError::CompilationFailed` and `CompilerError…	`8341a7f60da556211c8ac6c079c882c2c48f6d7d` (link)
#121233	Move the extra directives for `Mode::CoverageRun` into `ite…	`3405cce3f2cfc3e01da2299afc4308f11f15f7dc` (link)
#121256	Allow AST and HIR visitors to return `ControlFlow`	`e022ef0c7dfc9f6e72a082cbdb4c274168b7720f` (link)
#121307	Drive-by `DUMMY_SP` -> `Span` and fmt changes	`7fe440733a16dcf075912ca27fe583dee354198b` (link)
#121308	Add regression test for #103369	`6108ac3b0a280b0e024636475c9be1b84b08f5a8` (link)
#121310	Remove an old hack for rustdoc	`d751869150c276dd64445855a9732a785e2736fb` (link)
#121311	Make `is_nonoverlapping` `#[inline]`	`17c454c9519b66345d9c8cc787b2f08c695e2af8` (link)
#121319	return `ty::Error` when equating `ty::Error`	`03164daaef5a68eda71aebfd3260050b44bdf6c5` (link)

previous master: bcea3cb748

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-02-20T11:15:11Z

Finished benchmarking commit (5af2130): 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)	-	-	0
Regressions ❌ (secondary)	0.2%	[0.2%, 0.2%]	1
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-	-	0
All ❌✅ (primary)	-	-	0

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)	2.5%	[2.5%, 2.6%]	2
Regressions ❌ (secondary)	-	-	0
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-3.4%	[-3.4%, -3.4%]	1
All ❌✅ (primary)	2.5%	[2.5%, 2.6%]	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)	1.8%	[1.7%, 1.9%]	2
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-	-	0
All ❌✅ (primary)	-	-	0

Binary size

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

Bootstrap: 639.837s -> 641.541s (0.27%)
Artifact size: 308.63 MiB -> 308.58 MiB (-0.02%)

nnethercote and others added 23 commits February 17, 2024 09:40

Wrap iter_header callback arguments in a documentable struct

488ffaa

Allow AST and HIR visitors to return ControlFlow

864cee3

Change leak check lint message to behavior is likely to change in the…

eee9d2a

… future

Drive-by DUMMY_SP -> Span and fmt changes

b4a424f

Noticed these while doing something else. There's no practical change, but it's preferable to use `DUMMY_SP` as little as possible, particularly when we have perfectlly useful `Span`s available.

regression test for rust-lang#103369

7fd7b47

Remove an old hack for rustdoc

ac1754b

Make is_nonoverlapping #[inline]

0b59748

It showed up with 3% execution time in a compiler profile.

Separate testing and production sanitizers

3e5ad42

Remove suspicious auto trait lint

086463b

Inline do_orphan_check_impl

4803f17

return ty::Error when equating ty::Error

84baf2f

This helps iron out a difference between Sub and Equate

Rollup merge of rust-lang#121195 - D0liphin:master, r=ehuss

4c2af78

unstable-book: Separate testing and production sanitizers This is a redo of [this PR](rust-lang#108942). Left the commit as before (except for reflowing to 80-width), since it already got approved.

Rollup merge of rust-lang#121308 - kadiwa4:test_103369, r=TaKO8Ki

930566f

Add regression test for rust-lang#103369 The issue was fixed in 1.70.0. Closes rust-lang#103369.

Rollup merge of rust-lang#121310 - GrigorenkoPV:doc-smallfix, r=Nilst…

dcb7c69

…rieb Remove an old hack for rustdoc Since rust-lang#78696 has been resolved

Rollup merge of rust-lang#121311 - Nilstrieb:is-it-overlapping, r=sae…

9788b19

…thlin Make `is_nonoverlapping` `#[inline]` It showed up with 3% execution time in a compiler profile. backlink to rust-lang#120848 r? ``@saethlin``

Rollup merge of rust-lang#121319 - compiler-errors:err, r=oli-obk

599768d

return `ty::Error` when equating `ty::Error` This helps iron out a difference in diagnostics between `Sub` and `Equate` relations, which I'm currently trying to unify. r? oli-obk

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 Feb 20, 2024

bors added the merged-by-bors This PR was explicitly merged by bors. label Feb 20, 2024

bors merged commit 5af2130 into rust-lang:master Feb 20, 2024
12 checks passed

rustbot added this to the 1.78.0 milestone Feb 20, 2024

Noratrieb deleted the rollup-zxcwwwy branch February 20, 2024 09:31

This was referenced Feb 20, 2024

Add ErrorGuaranteed to ast::ExprKind::Err #120586

Merged

Add initial support for DataFlowSanitizer #120761

Merged

Add newtypes for bool fields/params/return types #121060

Merged

Merge check_mod_impl_wf and check_mod_type_wf #121154

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Rollup of 10 pull requests #121327

Rollup of 10 pull requests #121327

Noratrieb commented Feb 20, 2024

Noratrieb commented Feb 20, 2024

bors commented Feb 20, 2024

bors commented Feb 20, 2024

bors commented Feb 20, 2024

rust-timer commented Feb 20, 2024

rust-timer commented Feb 20, 2024

Rollup of 10 pull requests #121327

Rollup of 10 pull requests #121327

Conversation

Noratrieb commented Feb 20, 2024

Noratrieb commented Feb 20, 2024

bors commented Feb 20, 2024

bors commented Feb 20, 2024

bors commented Feb 20, 2024

rust-timer commented Feb 20, 2024

rust-timer commented Feb 20, 2024

Overall result: ❌ regressions - no action needed

Instruction count

Max RSS (memory usage)

Cycles

Binary size