replace track_errors usages with bubbling up ErrorGuaranteed
#119869
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
r? @BoxyUwU (rustbot has picked a reviewer for you, use r? to override) |
rustbot
added
S-waiting-on-review
oli-obk
commented
Jan 11, 2024
Comment on lines
-83
to
+91
| 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(()); |
There was a problem hiding this comment.
The new errors in the tests happen because of this hack.
- If we
track_errorsthetype_ofcall above, we'd get zero diagnostics changes. - If we use
error_reported()?on the type returned fromtype_of, we lose lots of useful diagnostics - If we ignore the
Resultreturned fromcheck_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
force-pushed
the
track_errors2
branch
from
41ea446
to
4d66bb7
Compare
oli-obk
commented
Jan 12, 2024
Comment on lines
+182
to
+180
| // 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(|| { |
There was a problem hiding this comment.
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
This comment has been minimized.
This comment has been minimized.
oli-obk
force-pushed
the
track_errors2
branch
from
4d66bb7
to
767d253
Compare
|
Some changes occurred in src/librustdoc/clean/types.rs cc @camelid |
This comment has been minimized.
This comment has been minimized.
|
Some changes occurred in src/tools/clippy cc @rust-lang/clippy |
…rors up instead.
oli-obk
force-pushed
the
track_errors2
branch
from
e6dc52f
to
18e6643
Compare
|
@bors r+ |
bors
added
S-waiting-on-bors
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Jan 18, 2024
…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
Merged
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Jan 19, 2024
…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
rust-timer
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Jan 19, 2024
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`)
matthiaskrgr
added a commit
to matthiaskrgr/rust
that referenced
this pull request
Jan 25, 2024
…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.
rust-timer
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Jan 25, 2024
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.
flip1995
pushed a commit
to flip1995/rust
that referenced
this pull request
Jan 25, 2024
…sper replace `track_errors` usages with bubbling up `ErrorGuaranteed` more of the same as rust-lang#117449 (removing `track_errors`)
feliperodri
added a commit
to model-checking/kani
that referenced
this pull request
Feb 8, 2024
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>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
more of the same as #117449 (removing
track_errors)