replace `track_errors` usages with bubbling up `ErrorGuaranteed` by oli-obk · Pull Request #119869 · rust-lang/rust

oli-obk · 2024-01-11T22:15:41Z

more of the same as #117449 (removing track_errors)

rustbot · 2024-01-11T22:15:49Z

(rustbot has picked a reviewer for you, use r? to override)

oli-obk · 2024-01-11T22:18:55Z

compiler/rustc_hir_analysis/src/impl_wf_check.rs

-        return;
+        // This is super fishy, but our current `rustc_hir_analysis::check_crate` pipeline depends on
+        // `type_of` having been called much earlier, and thus this value being read from cache.
+        // Compilation must continue in order for other important diagnostics to keep showing up.
+        return Ok(());


The new errors in the tests happen because of this hack.

If we track_errors the type_of call above, we'd get zero diagnostics changes.

If we use error_reported()? on the type returned from type_of, we lose lots of useful diagnostics

If we ignore the Result returned from check_mod_impl_wf, we get lots of new diagnostics, sometimes not very useful.

We can change this easily in the future, but I'd rather write separate PRs to compare, and not do it in this PR.

oli-obk · 2024-01-11T22:19:15Z

r? @matthewjasper

oli-obk · 2024-01-12T16:13:36Z

compiler/rustc_hir_analysis/src/lib.rs

+        // FIXME(matthewjasper) We shouldn't need to use `track_errors` anywhere in this function
+        // or the compiler in general.
+        res.and(tcx.sess.track_errors(|| {


This last one is hard. I started a zulip thread about it: https://rust-lang.zulipchat.com/#narrow/stream/131828-t-compiler/topic/ty.3A.3AError.20and.20wrong.20.60ErrorGuaranteed.60

rustbot · 2024-01-12T16:28:23Z

Some changes occurred in src/librustdoc/clean/types.rs

cc @camelid

rustbot · 2024-01-12T16:58:38Z

Some changes occurred in src/tools/clippy

cc @rust-lang/clippy

…rors up instead.

matthewjasper · 2024-01-18T10:25:54Z

@bors r+

bors · 2024-01-18T10:25:57Z

📌 Commit 18e6643 has been approved by matthewjasper

It is now in the queue for this repository.

…iaskrgr Rollup of 9 pull requests Successful merges: - rust-lang#119582 (bootstrap: handle vendored sources when remapping crate paths) - rust-lang#119730 (docs: fix typos) - rust-lang#119828 (Improved collapse_debuginfo attribute, added command-line flag) - rust-lang#119869 (replace `track_errors` usages with bubbling up `ErrorGuaranteed`) - rust-lang#120037 (Remove `next_root_ty_var`) - rust-lang#120094 (tests/ui/asm/inline-syntax: adapt for LLVM 18) - rust-lang#120096 (Set RUSTC_BOOTSTRAP=1 consistently) - rust-lang#120101 (change `.unwrap()` to `?` on write where `fmt::Result` is returned) - rust-lang#120102 (Fix typo in munmap_partial.rs) r? `@ghost` `@rustbot` modify labels: rollup

Rollup merge of rust-lang#119869 - oli-obk:track_errors2, r=matthewjasper replace `track_errors` usages with bubbling up `ErrorGuaranteed` more of the same as rust-lang#117449 (removing `track_errors`)

…asper Remove `track_errors` entirely follow up to rust-lang#119869 r? `@matthewjasper` There are some diagnostic changes adding new diagnostics or not emitting some anymore. We can improve upon that in follow-up work imo.

Rollup merge of rust-lang#119895 - oli-obk:track_errors_3, r=matthewjasper Remove `track_errors` entirely follow up to rust-lang#119869 r? `@matthewjasper` There are some diagnostic changes adding new diagnostics or not emitting some anymore. We can improve upon that in follow-up work imo.

…sper replace `track_errors` usages with bubbling up `ErrorGuaranteed` more of the same as rust-lang#117449 (removing `track_errors`)

Related PRs so far: - rust-lang/rust#119869 - rust-lang/rust#120080 - rust-lang/rust#120128 - rust-lang/rust#119369 - rust-lang/rust#116672 By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 and MIT licenses. --------- Signed-off-by: Felipe R. Monteiro <felisous@amazon.com> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: tautschnig <tautschnig@users.noreply.github.com> Co-authored-by: Qinheping Hu <qinhh@amazon.com> Co-authored-by: Michael Tautschnig <tautschn@amazon.com> Co-authored-by: Felipe R. Monteiro <felisous@amazon.com>

rustbot assigned BoxyUwU Jan 11, 2024

rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. labels Jan 11, 2024

oli-obk commented Jan 11, 2024

View reviewed changes

rustbot assigned matthewjasper and unassigned BoxyUwU Jan 11, 2024

oli-obk force-pushed the track_errors2 branch from 41ea446 to 4d66bb7 Compare January 12, 2024 16:12

oli-obk commented Jan 12, 2024

View reviewed changes

oli-obk mentioned this pull request Jan 12, 2024

Remove track_errors entirely #119895

Merged

This comment has been minimized.

Sign in to view

oli-obk force-pushed the track_errors2 branch from 4d66bb7 to 767d253 Compare January 12, 2024 16:28

This comment has been minimized.

Sign in to view

oli-obk added 5 commits January 17, 2024 10:02

Stop using track_errors for some forever unstable rustc_attr analyses

4db93c5

Move check_mod_impl_wf query call out of track_errors and bubble er…

b1ce8a4

…rors up instead.

Make crate_inherent_impls_overlap_check bubble up its errors

49347ee

Make crate_inherent_impls fallible and stop using track_errors for it

557b111

Fix clippy

18e6643

oli-obk force-pushed the track_errors2 branch from e6dc52f to 18e6643 Compare January 17, 2024 10:03

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 Jan 18, 2024

matthiaskrgr mentioned this pull request Jan 18, 2024

Rollup of 9 pull requests #120112

Merged

oli-obk mentioned this pull request Jan 18, 2024

Fix error counting #119986

Merged

bors merged commit fa52eda into rust-lang:master Jan 19, 2024

rustbot added this to the 1.77.0 milestone Jan 19, 2024

oli-obk mentioned this pull request Jan 22, 2024

Make generic const type mismatches not hide trait impls from the trait solver #120059

Merged

celinval mentioned this pull request Jan 24, 2024

Upgrade Rust toolchain to nightly-2024-01-23 model-checking/kani#2983

Merged

rust-timer mentioned this pull request Jan 26, 2024

Rollup of 9 pull requests #120375

Merged

lqd mentioned this pull request May 14, 2024

rustc ICEs, "expected a Fn(u64) closure, found F" #125099

Open

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

replace `track_errors` usages with bubbling up `ErrorGuaranteed`#119869

replace `track_errors` usages with bubbling up `ErrorGuaranteed`#119869
bors merged 5 commits intorust-lang:masterfrom
oli-obk:track_errors2

oli-obk commented Jan 11, 2024

Uh oh!

rustbot commented Jan 11, 2024

Uh oh!

oli-obk Jan 11, 2024

Uh oh!

oli-obk commented Jan 11, 2024

Uh oh!

oli-obk Jan 12, 2024

Uh oh!

This comment has been minimized.

rustbot commented Jan 12, 2024

Uh oh!

This comment has been minimized.

rustbot commented Jan 12, 2024

Uh oh!

matthewjasper commented Jan 18, 2024

Uh oh!

bors commented Jan 18, 2024

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants

Uh oh!

Conversation

oli-obk commented Jan 11, 2024

Uh oh!

rustbot commented Jan 11, 2024

Uh oh!

oli-obk Jan 11, 2024

Choose a reason for hiding this comment

Uh oh!

oli-obk commented Jan 11, 2024

Uh oh!

oli-obk Jan 12, 2024

Choose a reason for hiding this comment

Uh oh!

This comment has been minimized.

rustbot commented Jan 12, 2024

Uh oh!

This comment has been minimized.

rustbot commented Jan 12, 2024

Uh oh!

matthewjasper commented Jan 18, 2024

Uh oh!

bors commented Jan 18, 2024

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants