Use full expr span for return suggestion on type error/ambiguity#127129
Merged
bors merged 1 commit intorust-lang:masterfrom Jul 1, 2024
Merged
Use full expr span for return suggestion on type error/ambiguity#127129bors merged 1 commit intorust-lang:masterfrom
bors merged 1 commit intorust-lang:masterfrom
Conversation
Collaborator
rustbot
added
S-waiting-on-review
This comment has been minimized.
This comment has been minimized.
compiler-errors
force-pushed
the
full-expr-span
branch
from
7ac8186 to
d5bddee
Compare
jieyouxu
reviewed
Jun 30, 2024
Member
jieyouxu
left a comment
jieyouxu
left a comment
There was a problem hiding this comment.
The span changes LGTM, the UI test I believe has incorrect "follow-up error annotation" syntax (pre-existing, which may have led you astray).
Member
There was a problem hiding this comment.
Problem: I think this needs to be
Suggested change
| //| HELP you might have meant to return this value | |
| //~| HELP you might have meant to return this value |
to quality as a "follow-up error annotation" in the UI test mode (and suite). Hm. Actually, is the HELP error annotation just wrong in that entire file? I dug through compiletest a little and
rust/src/tools/compiletest/src/errors.rs
Lines 125 to 131 in 716752e
to the best of my knowledge //| is not a supported form of test annotation lol. Apparently there's a few other tests that also does the //| but AFAICT compiletest only uses the //~| form (cargo or r-a might be different here).
Contributor
Author
There was a problem hiding this comment.
Yeah that was my typo from copypasting from the file without thinking rather than just writing my own UI test -- //| is definitely not valid and I should have seen that lmao
Member
|
@rustbot author |
rustbot
added
S-waiting-on-author
compiler-errors
force-pushed
the
full-expr-span
branch
from
d5bddee to
583b5fc
Compare
Contributor
Author
|
Made the test file less dumb @rustbot ready |
rustbot
added
S-waiting-on-review
jieyouxu
approved these changes
Jul 1, 2024
Member
jieyouxu
left a comment
jieyouxu
left a comment
There was a problem hiding this comment.
Looks good! r=me after CI is green.
Contributor
Author
|
@bors r=jieyouxu rollup |
Collaborator
bors
added
S-waiting-on-bors
GuillaumeGomez
added a commit
to GuillaumeGomez/rust
that referenced
this pull request
Jul 1, 2024
…jieyouxu Use full expr span for return suggestion on type error/ambiguity We sometimes use parts of an expression rather than the whole thing for an obligation span. For example, a method obligation will just point to the path segment corresponding to the `method` in `rcvr.method(args)`. So let's not use that assuming it'll point to the *whole* expression span, which we can access from the expr hir id we store in `ObligationCauseCode::WhereClauseInExpr`. Fixes rust-lang#127109
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Jul 1, 2024
…llaumeGomez Rollup of 7 pull requests Successful merges: - rust-lang#126753 (Add nightly style guide section for `precise_capturing` `use<>` syntax) - rust-lang#126880 (Migrate `volatile-intrinsics`, `weird-output-filenames`, `wasm-override-linker`, `wasm-exceptions-nostd` to `rmake`) - rust-lang#126941 (Migrate `run-make/llvm-ident` to `rmake.rs`) - rust-lang#127128 (Stabilize `duration_abs_diff`) - rust-lang#127129 (Use full expr span for return suggestion on type error/ambiguity) - rust-lang#127188 ( improve the way bootstrap handles rustlib components) - rust-lang#127201 (Improve run-make-support API) r? `@ghost` `@rustbot` modify labels: rollup
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Jul 1, 2024
…llaumeGomez Rollup of 8 pull requests Successful merges: - rust-lang#126732 (Stabilize `PanicInfo::message()` and `PanicMessage`) - rust-lang#126753 (Add nightly style guide section for `precise_capturing` `use<>` syntax) - rust-lang#126832 (linker: Refactor interface for passing arguments to linker) - rust-lang#126880 (Migrate `volatile-intrinsics`, `weird-output-filenames`, `wasm-override-linker`, `wasm-exceptions-nostd` to `rmake`) - rust-lang#127128 (Stabilize `duration_abs_diff`) - rust-lang#127129 (Use full expr span for return suggestion on type error/ambiguity) - rust-lang#127188 ( improve the way bootstrap handles rustlib components) - rust-lang#127201 (Improve run-make-support API) r? `@ghost` `@rustbot` modify labels: rollup
rust-timer
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Jul 1, 2024
Rollup merge of rust-lang#127129 - compiler-errors:full-expr-span, r=jieyouxu Use full expr span for return suggestion on type error/ambiguity We sometimes use parts of an expression rather than the whole thing for an obligation span. For example, a method obligation will just point to the path segment corresponding to the `method` in `rcvr.method(args)`. So let's not use that assuming it'll point to the *whole* expression span, which we can access from the expr hir id we store in `ObligationCauseCode::WhereClauseInExpr`. Fixes rust-lang#127109
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
5 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.
We sometimes use parts of an expression rather than the whole thing for an obligation span. For example, a method obligation will just point to the path segment corresponding to the
methodinrcvr.method(args).So let's not use that assuming it'll point to the whole expression span, which we can access from the expr hir id we store in
ObligationCauseCode::WhereClauseInExpr.Fixes #127109