Make adjust_fulfillment_errors work with HostEffectPredicate and const_conditions
#133403
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
rustbot
added
S-waiting-on-review
|
☔ The latest upstream changes (presumably #133516) made this pull request unmergeable. Please resolve the merge conflicts. |
rustbot
added
S-waiting-on-author
lcnr
reviewed
Nov 28, 2024
| @@ -95,6 +128,51 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> { | |||
| } | |||
|
|
|||
| match self.tcx.hir_node(hir_id) { | |||
| hir::Node::Expr(&hir::Expr { | |||
There was a problem hiding this comment.
vibe: please move all hir::Node::Expr branches into a submatch in a sub-fn, and start that fn by checking self.closure_span_overlaps_error(error, span). This function is currently very difficult to parse for me
|
some nits from me as well, then r=fee1-dead,lcnr |
compiler-errors
force-pushed
the
adjust-host-effect-preds
branch
from
eb6d265 to
d5c5d58
Compare
|
Pulled out that helper function and simplified the logic a bit more. @bors r=fee1-dead,lcnr |
bors
added
S-waiting-on-bors
matthiaskrgr
added a commit
to matthiaskrgr/rust
that referenced
this pull request
Dec 1, 2024
…-preds, r=fee1-dead,lcnr Make `adjust_fulfillment_errors` work with `HostEffectPredicate` and `const_conditions` Greatly improves the spans for reporting unsatisfied `~const` bounds :) r? project-const-traits or maybe `@lcnr` (if you want to deal with a diagnostics PR lmao)
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Dec 1, 2024
…iaskrgr Rollup of 8 pull requests Successful merges: - rust-lang#128004 (codegen `#[naked]` functions using global asm) - rust-lang#132974 (Properly pass linker arguments that contain commas) - rust-lang#133403 (Make `adjust_fulfillment_errors` work with `HostEffectPredicate` and `const_conditions`) - rust-lang#133482 (Only error raw lifetime followed by `\'` in edition 2021+) - rust-lang#133595 (Do not emit `missing_doc_code_examples` rustdoc lint on module and a few other items) - rust-lang#133669 (Move some functions out of const_swap feature gate) - rust-lang#133674 (Fix chaining `carrying_add`s) - rust-lang#133691 (Check let source before suggesting annotation) r? `@ghost` `@rustbot` modify labels: rollup
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Dec 1, 2024
…iaskrgr Rollup of 7 pull requests Successful merges: - rust-lang#132974 (Properly pass linker arguments that contain commas) - rust-lang#133403 (Make `adjust_fulfillment_errors` work with `HostEffectPredicate` and `const_conditions`) - rust-lang#133482 (Only error raw lifetime followed by `\'` in edition 2021+) - rust-lang#133595 (Do not emit `missing_doc_code_examples` rustdoc lint on module and a few other items) - rust-lang#133669 (Move some functions out of const_swap feature gate) - rust-lang#133674 (Fix chaining `carrying_add`s) - rust-lang#133691 (Check let source before suggesting annotation) r? `@ghost` `@rustbot` modify labels: rollup
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Dec 1, 2024
…iaskrgr Rollup of 7 pull requests Successful merges: - rust-lang#132974 (Properly pass linker arguments that contain commas) - rust-lang#133403 (Make `adjust_fulfillment_errors` work with `HostEffectPredicate` and `const_conditions`) - rust-lang#133482 (Only error raw lifetime followed by `\'` in edition 2021+) - rust-lang#133595 (Do not emit `missing_doc_code_examples` rustdoc lint on module and a few other items) - rust-lang#133669 (Move some functions out of const_swap feature gate) - rust-lang#133674 (Fix chaining `carrying_add`s) - rust-lang#133691 (Check let source before suggesting annotation) r? `@ghost` `@rustbot` modify labels: rollup
rust-timer
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Dec 1, 2024
Rollup merge of rust-lang#133403 - compiler-errors:adjust-host-effect-preds, r=fee1-dead,lcnr Make `adjust_fulfillment_errors` work with `HostEffectPredicate` and `const_conditions` Greatly improves the spans for reporting unsatisfied `~const` bounds :) r? project-const-traits or maybe ``@lcnr`` (if you want to deal with a diagnostics PR lmao)
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.
Greatly improves the spans for reporting unsatisfied
~constbounds :)r? project-const-traits or maybe @lcnr (if you want to deal with a diagnostics PR lmao)