-
Notifications
You must be signed in to change notification settings - Fork 12.8k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Add ErrorGuaranteed
to hir::{Expr,Ty}Kind::Err
variants
#108379
Conversation
r? @lcnr (rustbot has picked a reviewer for you, use r? to override) |
This comment has been minimized.
This comment has been minimized.
Some changes occurred in src/tools/clippy cc @rust-lang/clippy |
Why does |
☔ The latest upstream changes (presumably #108369) made this pull request unmergeable. Please resolve the merge conflicts. |
Two reasons. First is that Even if I fix this somehow, I'll be back into the same situation if/when I want to add I'm not sure if there's a good way to untangle this cycle now I think of it. I could pull |
What a knot, indeed. |
r=me after rebase |
cbb7901
to
ccbe33a
Compare
ccbe33a
to
0f4a7d1
Compare
@bors r=cjgillot |
…iaskrgr Rollup of 9 pull requests Successful merges: - rust-lang#107941 (Treat `str` as containing `[u8]` for auto trait purposes) - rust-lang#108299 (Require `literal`s for some `(u)int_impl!` parameters) - rust-lang#108337 (hir-analysis: make a helpful note) - rust-lang#108379 (Add `ErrorGuaranteed` to `hir::{Expr,Ty}Kind::Err` variants) - rust-lang#108418 (Replace parse_[sth]_expr with parse_expr_[sth] function names) - rust-lang#108424 (rustc_infer: Consolidate obligation elaboration de-duplication) - rust-lang#108475 (Fix `VecDeque::shrink_to` and add tests.) - rust-lang#108482 (statically guarantee that current error codes are documented) - rust-lang#108484 (Remove `from` lang item) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
First step in making the
Err
variants ofExprKind
andTyKind
require anErrorGuaranteed
during parsing. Making the corresponding AST versions requireErrorGuaranteed
is a bit harder, whereas it was pretty easy to do this for HIR, so let's do that first.The only weird thing about this PR is that
ErrorGuaranteed
is moved torustc_span
. This is certainly not the right place to put it, butrustc_hir
cannot depend onrustc_error
because the latter already depends on the former. Should I just pull out some of the error machinery fromrustc_error
into an even more minimal crate thatrustc_hir
can depend on? Advice would be appreciated.