A bunch of cleanups #133567

bjorn3 · 2024-11-28T10:09:16Z

These are all extracted from a branch I have to get rid of driver queries. Most of the commits are not directly necessary for this, but were found in the process of implementing the removal of driver queries.

Previous PR: #132410

rustbot · 2024-11-28T10:09:25Z

r? @estebank

rustbot has assigned @estebank.
They will have a look at your PR within the next two weeks and either review your PR or reassign to another reviewer.

Use r? to explicitly pick a reviewer

rustbot · 2024-11-28T10:09:27Z

The Miri subtree was changed

cc @rust-lang/miri

Some changes occurred in src/tools/rustfmt

cc @rust-lang/rustfmt

Some changes occurred in src/tools/clippy

cc @rust-lang/clippy

compiler/rustc_interface/src/queries.rs

compiler/rustc_errors/src/json.rs

bors · 2024-11-28T14:24:33Z

☔ The latest upstream changes (presumably #133568) made this pull request unmergeable. Please resolve the merge conflicts.

bors · 2024-12-06T18:38:40Z

☔ The latest upstream changes (presumably #133956) made this pull request unmergeable. Please resolve the merge conflicts.

And pass this to the individual emitters when necessary.

It was inconsistently done (sometimes even within a single function) and most of the rest of the compiler uses fatal errors instead, which need to be caught using catch_with_exit_code anyway. Using fatal errors instead of ErrorGuaranteed everywhere in the driver simplifies things a bit.

…ding delayed bugs

cjgillot

3 nits and r=me

cjgillot · 2024-12-07T16:58:36Z

compiler/rustc_driver_impl/src/lib.rs

@@ -446,23 +449,21 @@ fn run_compiler(
                    return early_exit();
                }

-                tcx.analysis(())?;
+                let _ = tcx.analysis(());


This should use tcx.ensure().analysis(()).

The analysis query returns a unit, so skipping returning of the query result doesn't save us anything. I think we do however need to make sure that the query gets executed (rather than just doing nothing if all dependencies are unchanged) to prevent query stealing from going wrong and I'm not sure if .ensure() does that.

analysis is eval_always, so yes, it will be re-executed in any case.
ensure() is more about uniform style. When the return type is not (), let _ = some query should always be replaced by ensure() or ensure_with_value(), to make meaning explicit.

cjgillot · 2024-12-07T16:58:58Z

compiler/rustc_driver_impl/src/pretty.rs

-    if ppm.needs_analysis() && ex.tcx().analysis(()).is_err() {
-        FatalError.raise();
+    if ppm.needs_analysis() {
+        let _ = ex.tcx().analysis(());


This should use ensure().

compiler/rustc_interface/src/interface.rs

bjorn3 · 2024-12-08T16:57:37Z

@bors r=cjgillot

bors · 2024-12-08T16:57:40Z

📌 Commit 0df8094 has been approved by cjgillot

It is now in the queue for this repository.

…iaskrgr Rollup of 7 pull requests Successful merges: - rust-lang#133567 (A bunch of cleanups) - rust-lang#133789 (Add doc alias 'then_with' for `then` method on `bool`) - rust-lang#133880 (Expand home_dir docs) - rust-lang#134036 (crash tests: use individual mir opts instead of mir-opt-level where easily possible) - rust-lang#134045 (Fix some triagebot mentions paths) - rust-lang#134046 (Remove ignored tests for hangs w/ new solver) - rust-lang#134050 (Miri subtree update) r? `@ghost` `@rustbot` modify labels: rollup

Rollup merge of rust-lang#133567 - bjorn3:various_cleanups, r=cjgillot A bunch of cleanups These are all extracted from a branch I have to get rid of driver queries. Most of the commits are not directly necessary for this, but were found in the process of implementing the removal of driver queries. Previous PR: rust-lang#132410

Upgrade toolchain to 12/12. The only substantive changes are for the 12/10 toolchain; 12/11 and 12/12 are just updating the LLBC tests. Culprit PR: rust-lang/rust#133567 (specifically [this commit](rust-lang/rust@401dd84) and [this commit](rust-lang/rust@030545d)). Resolves #3770 By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 and MIT licenses.

…l, r=oli-obk Stop using driver queries in the public API Follow up to rust-lang#132410 and rust-lang#133567 The next PR will completely get rid of driver queries. That PR will also contains some non-trivial refactorings enabled by no longer needing to support entering TyCtxt multiple times after it is constructed. The changes in the current PR have been split out to make it easier to review the api changes and to reduce the size of the next PR to review. ## Custom driver breaking change The `after_crate_root_parsing` and `after_expansion` callbacks now accept `ast::Crate` and `TyCtxt` respectively rather than `Queries`. The only safe query in `Queries` to call inside these callbacks are `parse()` and `global_ctxt()` respectively which allows you to access the `ast::Crate` and `TyCtxt` either way. To fix your custom driver, replace the `queries: &'tcx Queries<'tcx>` argument with `crate_: ast::Crate` and `tcx: TyCtxt<'tcx>` respectively and for `after_expansion` remove your `queries.global_ctxt().unwrap().enter(|tcx| { ... })` call and only keep the contents of the closure.

A bunch of cleanups (part 2) Just like rust-lang#133567 these were all found while looking at the respective code, but are not blocking any other changes I want to make in the short term.

Rollup merge of rust-lang#134130 - bjorn3:prepare_driver_query_removal, r=oli-obk Stop using driver queries in the public API Follow up to rust-lang#132410 and rust-lang#133567 The next PR will completely get rid of driver queries. That PR will also contains some non-trivial refactorings enabled by no longer needing to support entering TyCtxt multiple times after it is constructed. The changes in the current PR have been split out to make it easier to review the api changes and to reduce the size of the next PR to review. ## Custom driver breaking change The `after_crate_root_parsing` and `after_expansion` callbacks now accept `ast::Crate` and `TyCtxt` respectively rather than `Queries`. The only safe query in `Queries` to call inside these callbacks are `parse()` and `global_ctxt()` respectively which allows you to access the `ast::Crate` and `TyCtxt` either way. To fix your custom driver, replace the `queries: &'tcx Queries<'tcx>` argument with `crate_: ast::Crate` and `tcx: TyCtxt<'tcx>` respectively and for `after_expansion` remove your `queries.global_ctxt().unwrap().enter(|tcx| { ... })` call and only keep the contents of the closure.

A bunch of cleanups (part 2) Just like rust-lang#133567 these were all found while looking at the respective code, but are not blocking any other changes I want to make in the short term.

Rollup merge of rust-lang#134251 - bjorn3:various_cleanups2, r=oli-obk A bunch of cleanups (part 2) Just like rust-lang#133567 these were all found while looking at the respective code, but are not blocking any other changes I want to make in the short term.

A bunch of cleanups (part 2) Just like rust-lang/rust#133567 these were all found while looking at the respective code, but are not blocking any other changes I want to make in the short term.

rust-lang/rust#133567

…iaskrgr Rollup of 7 pull requests Successful merges: - rust-lang#133567 (A bunch of cleanups) - rust-lang#133789 (Add doc alias 'then_with' for `then` method on `bool`) - rust-lang#133880 (Expand home_dir docs) - rust-lang#134036 (crash tests: use individual mir opts instead of mir-opt-level where easily possible) - rust-lang#134045 (Fix some triagebot mentions paths) - rust-lang#134046 (Remove ignored tests for hangs w/ new solver) - rust-lang#134050 (Miri subtree update) r? `@ghost` `@rustbot` modify labels: rollup

rust-lang/rust#133567

A bunch of cleanups (part 2) Just like rust-lang/rust#133567 these were all found while looking at the respective code, but are not blocking any other changes I want to make in the short term.

rustbot assigned estebank Nov 28, 2024

oli-obk reviewed Nov 28, 2024

View reviewed changes

compiler/rustc_interface/src/queries.rs Show resolved Hide resolved

oli-obk reviewed Nov 28, 2024

View reviewed changes

compiler/rustc_errors/src/json.rs Show resolved Hide resolved

This comment has been minimized.

Sign in to view

bjorn3 force-pushed the various_cleanups branch from 1ccb4f8 to 00727eb Compare November 28, 2024 15:12

This comment has been minimized.

Sign in to view

bjorn3 force-pushed the various_cleanups branch from 00727eb to 83f5142 Compare November 28, 2024 15:36

This comment has been minimized.

Sign in to view

bjorn3 force-pushed the various_cleanups branch from 83f5142 to 8c0f39e Compare November 28, 2024 16:13

This comment has been minimized.

Sign in to view

cjgillot self-assigned this Nov 29, 2024

bjorn3 added 6 commits December 6, 2024 18:41

Remove 'tcx lifetime from OnDiskCache

84873f8

Move some timers around

ea6f5cb

Store a single copy of the error registry in DiagCtxt

030545d

And pass this to the individual emitters when necessary.

Handle unwinding out of the closure argument of run_compiler with pen…

618d4c3

…ding delayed bugs

Fix ui-fulldep tests

85414eb

bjorn3 force-pushed the various_cleanups branch from 1bea2e5 to 85414eb Compare December 6, 2024 18:42

cjgillot reviewed Dec 7, 2024

View reviewed changes

bjorn3 added 2 commits December 7, 2024 17:13

Reduce indentation in run_compiler

23fda35

Use ensure for analysis calls

0df8094

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 8, 2024

matthiaskrgr mentioned this pull request Dec 9, 2024

Rollup of 7 pull requests #134052

Merged

bors merged commit d2881e4 into rust-lang:master Dec 9, 2024
6 checks passed

rustbot added this to the 1.85.0 milestone Dec 9, 2024

bjorn3 deleted the various_cleanups branch December 9, 2024 06:47

GrigorenkoPV mentioned this pull request Dec 9, 2024

Add Ref/RefMut try_map method #118087

Open

bjorn3 mentioned this pull request Dec 10, 2024

Stop using driver queries in the public API #134130

Merged

carolynzech mentioned this pull request Dec 12, 2024

Upgrade toolchain to 2024-12-12 model-checking/kani#3774

Merged

bjorn3 mentioned this pull request Dec 13, 2024

A bunch of cleanups (part 2) #134251

Merged

smoelius added a commit to trailofbits/dylint that referenced this pull request Dec 15, 2024

Account for changes to RunCompiler::run

32207b5

rust-lang/rust#133567

smoelius added a commit to trailofbits/dylint that referenced this pull request Dec 15, 2024

Account for changes to RunCompiler::run

2ffd165

rust-lang/rust#133567

smoelius added a commit to trailofbits/dylint that referenced this pull request Dec 15, 2024

Account for changes to RunCompiler::run

825a1fe

rust-lang/rust#133567

smoelius added a commit to trailofbits/dylint that referenced this pull request Dec 16, 2024

Account for changes to RunCompiler::run

ddb443b

rust-lang/rust#133567

github-merge-queue bot pushed a commit to trailofbits/dylint that referenced this pull request Dec 16, 2024

Account for changes to RunCompiler::run

fcc0677

rust-lang/rust#133567

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

A bunch of cleanups #133567

A bunch of cleanups #133567

bjorn3 commented Nov 28, 2024

rustbot commented Nov 28, 2024

rustbot commented Nov 28, 2024

This comment has been minimized.

bors commented Nov 28, 2024

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

bors commented Dec 6, 2024

cjgillot left a comment

cjgillot Dec 7, 2024

bjorn3 Dec 7, 2024

cjgillot Dec 8, 2024

cjgillot Dec 7, 2024

bjorn3 commented Dec 8, 2024

bors commented Dec 8, 2024

A bunch of cleanups #133567

A bunch of cleanups #133567

Conversation

bjorn3 commented Nov 28, 2024

rustbot commented Nov 28, 2024

rustbot commented Nov 28, 2024

This comment has been minimized.

bors commented Nov 28, 2024

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

bors commented Dec 6, 2024

cjgillot left a comment

Choose a reason for hiding this comment

cjgillot Dec 7, 2024

Choose a reason for hiding this comment

bjorn3 Dec 7, 2024

Choose a reason for hiding this comment

cjgillot Dec 8, 2024

Choose a reason for hiding this comment

cjgillot Dec 7, 2024

Choose a reason for hiding this comment

bjorn3 commented Dec 8, 2024

bors commented Dec 8, 2024