Skip to content

Conversation

oli-obk
Copy link
Contributor

@oli-obk oli-obk commented Jan 10, 2024

this is one piece of the requested cleanups from #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.

@rustbot
Copy link
Collaborator

rustbot commented Jan 10, 2024

r? @davidtwco

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

@rustbot 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 10, 2024
@rust-log-analyzer

This comment has been minimized.

@oli-obk oli-obk force-pushed the even_more_follow_up_errors2 branch from f67b99f to 671d10e Compare January 10, 2024 16:24
Comment on lines 393 to 394
if let Err(err) = &arg_count.correct {
if let Some(reported) = err.reported {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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
{

@bors
Copy link
Collaborator

bors commented Jan 10, 2024

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

@oli-obk oli-obk force-pushed the even_more_follow_up_errors2 branch from 671d10e to 55cab53 Compare January 11, 2024 09:04
@oli-obk
Copy link
Contributor Author

oli-obk commented Jan 11, 2024

@bors r=estebank

@bors
Copy link
Collaborator

bors commented Jan 11, 2024

📌 Commit 55cab53 has been approved by estebank

It is now in the queue for this repository.

@bors 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 11, 2024
@davidtwco
Copy link
Member

@oli-obk does this help with what we were trying to fix in #113125?

@oli-obk
Copy link
Contributor Author

oli-obk commented Jan 11, 2024

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 type_of

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.
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
@bors bors merged commit bd61caf into rust-lang:master Jan 11, 2024
@rustbot rustbot added this to the 1.77.0 milestone Jan 11, 2024
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
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants