Silence some follow-up errors [2/x]#119813
Merged
bors merged 3 commits intorust-lang:masterfrom Jan 11, 2024
Merged
Conversation
Collaborator
|
r? @davidtwco (rustbot has picked a reviewer for you, use r? to override) |
rustbot
added
S-waiting-on-review
This comment has been minimized.
This comment has been minimized.
oli-obk
force-pushed
the
even_more_follow_up_errors2
branch
from
f67b99f to
671d10e
Compare
estebank
reviewed
Jan 10, 2024
Comment on lines
393
to
394
| if let Err(err) = &arg_count.correct { | ||
| if let Some(reported) = err.reported { |
Contributor
There was a problem hiding this comment.
Suggested change
| if let Err(err) = &arg_count.correct { | |
| if let Some(reported) = err.reported { | |
| if let Err(err) = &arg_count.correct | |
| && let Some(reported) = err.reported | |
| { |
estebank
reviewed
Jan 10, 2024
estebank
approved these changes
Jan 10, 2024
Collaborator
|
☔ The latest upstream changes (presumably #119751) made this pull request unmergeable. Please resolve the merge conflicts. |
oli-obk
force-pushed
the
even_more_follow_up_errors2
branch
from
671d10e to
55cab53
Compare
Contributor
Author
|
@bors r=estebank |
Collaborator
bors
added
S-waiting-on-bors
Member
Contributor
Author
|
It may help somewhat, or at least provide the infrastructure to fix it in a different way. We'll need to look at some backtraces and see if any of them are from within |
matthiaskrgr
added a commit
to matthiaskrgr/rust
that referenced
this pull request
Jan 11, 2024
…2, r=estebank Silence some follow-up errors [2/x] this is one piece of the requested cleanups from rust-lang#117449 the `type_of` query frequently uses astconv to convert a `hir::Ty` to a `ty::Ty`. This process is infallible, but may produce errors as it goes. All the error reporting sites that had access to the `ItemCtxt` are now tainting it, causing `type_of` to return a `ty::Error` instead of anything else.
This was referenced Jan 11, 2024
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Jan 11, 2024
…iaskrgr Rollup of 8 pull requests Successful merges: - rust-lang#119448 (annotate-snippets: update to 0.10) - rust-lang#119813 (Silence some follow-up errors [2/x]) - rust-lang#119836 (chore: remove unnecessary blank line) - rust-lang#119841 (Remove `DiagnosticBuilder::buffer`) - rust-lang#119842 (coverage: Add enums to accommodate other kinds of coverage mappings) - rust-lang#119845 (rint: further doc tweaks) - rust-lang#119852 (give const-err4 a more descriptive name) - rust-lang#119853 (rustfmt.toml: don't ignore just any tests path, only root one) r? `@ghost` `@rustbot` modify labels: rollup
rust-timer
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Jan 11, 2024
Rollup merge of rust-lang#119813 - oli-obk:even_more_follow_up_errors2, r=estebank Silence some follow-up errors [2/x] this is one piece of the requested cleanups from rust-lang#117449 the `type_of` query frequently uses astconv to convert a `hir::Ty` to a `ty::Ty`. This process is infallible, but may produce errors as it goes. All the error reporting sites that had access to the `ItemCtxt` are now tainting it, causing `type_of` to return a `ty::Error` instead of anything else.
flip1995
pushed a commit
to flip1995/rust
that referenced
this pull request
Jan 25, 2024
…iaskrgr Rollup of 8 pull requests Successful merges: - rust-lang#119448 (annotate-snippets: update to 0.10) - rust-lang#119813 (Silence some follow-up errors [2/x]) - rust-lang#119836 (chore: remove unnecessary blank line) - rust-lang#119841 (Remove `DiagnosticBuilder::buffer`) - rust-lang#119842 (coverage: Add enums to accommodate other kinds of coverage mappings) - rust-lang#119845 (rint: further doc tweaks) - rust-lang#119852 (give const-err4 a more descriptive name) - rust-lang#119853 (rustfmt.toml: don't ignore just any tests path, only root one) r? `@ghost` `@rustbot` modify labels: rollup
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
6 participants
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.
this is one piece of the requested cleanups from #117449
the
type_ofquery frequently uses astconv to convert ahir::Tyto aty::Ty. This process is infallible, but may produce errors as it goes. All the error reporting sites that had access to theItemCtxtare now tainting it, causingtype_ofto return aty::Errorinstead of anything else.