-
Notifications
You must be signed in to change notification settings - Fork 13k
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
On method chain expression failure, look for missing method in earlier segments of the chain #115229
Conversation
Thanks for the pull request, and welcome! The Rust team is excited to review your changes, and you should hear from @wesleywiser (or someone else) soon. Please see the contribution instructions for more information. Namely, in order to ensure the minimum review times lag, PR authors and assigned reviewers should ensure that the review label (
|
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
r? @oli-obk Please include some high level information about this PR in the main message (e.g. link to the issue and state what new message you are adding to which existing message) |
it looks like there are tests other than yours that are affected by this change. If you bless all ui tests, you should see some changes in your git status view |
This comment has been minimized.
This comment has been minimized.
@rustbot review |
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
r? @estebank |
@estebank Contents of tests/ui/structs/method-chain-expression-failure.stdout:
|
In this case, should we check for return type of |
If we can filter the method with the right return type, I would prefer to suggest it, otherwise I would mention all of them. Give me a minute to check the rest of the PR and correlate with the logs you have here. |
Ah! I see what's happening. |
prev_ty, | ||
rcvr_expr.hir_id, | ||
ProbeScope::TraitsInScope,) { | ||
err.span_label(method_span, format!("{item_kind} `{item_name}` is available on `{prev_ty}`")); |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
If you use parent_expr.span
, it would make the error be correct, but when you have more than one element in the chain you would end up with overlapping spans which won't look great.
An option we have is to iterate once using the while let
as you have it now, but collect the messages and spans in a vec and emit the diagnostics afterwards by iterating over the vec and peeking at the next span.
// Only if an appropriate error source is not found, check method chain for possible candiates | ||
let error_source_not_found = unsatisfied_predicates.is_empty(); | ||
if error_source_not_found && let Mode::MethodCall = mode && let SelfSource::MethodCall(mut rcvr_expr) = source { | ||
while let hir::ExprKind::MethodCall(_path_segment, parent_expr, _args, method_span) = |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I would prefer we called parent_expr
to something that includes rcvr
/receiver
in the name, because the parent
concept is highly overloaded :)
LL | A.b().c().d().foo(); | ||
| --- ^^^ method not found in `D` | ||
| | | ||
| method `foo` is available on `&B` |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
To drive the point home, if you look at the impl the span label should be pointing at the .b()
which returns B
and not at the method call .c()
which returns C
.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I love the results so far! On your next change, please squash your commits as I don't think we need the prior attempts anymore and expect us to land this shortly.
d7214df
to
39c4312
Compare
This comment has been minimized.
This comment has been minimized.
You'll need to run |
This comment has been minimized.
This comment has been minimized.
763194d
to
7441d1e
Compare
Had found an issue. Done now. |
…s receiver to align spans
7441d1e
to
56a109d
Compare
@bors r+ |
☀️ Test successful - checks-actions |
Finished benchmarking commit (edf0b1d): comparison URL. Overall result: no relevant changes - no action needed@rustbot label: -perf-regression Instruction countThis benchmark run did not return any relevant results for this metric. Max RSS (memory usage)ResultsThis is a less reliable metric that may be of interest but was not used to determine the overall result at the top of this comment.
CyclesResultsThis is a less reliable metric that may be of interest but was not used to determine the overall result at the top of this comment.
Binary sizeThis benchmark run did not return any relevant results for this metric. Bootstrap: 674.395s -> 675.48s (0.16%) |
Update Rust toolchain from nightly-2023-11-10 to nightly-2023-11-11 without any other source changes. This is an automatically generated pull request. If any of the CI checks fail, manual intervention is required. In such a case, review the changes at https://github.com/rust-lang/rust from rust-lang@0f44eb3 up to rust-lang@edf0b1d. The log for this commit range is: rust-lang@edf0b1db0a Auto merge of rust-lang#115229 - iSwapna:issue-115222-fix, r=estebank rust-lang@56a109d15b Recurse over the method chain and maintain a stack to peek at previous receiver to align spans rust-lang@d4c86cfc49 Auto merge of rust-lang#117779 - bjorn3:sync_cg_clif-2023-11-10, r=bjorn3 rust-lang@d186b49460 Merge commit 'c84d1871dc4456539b7b578830268ab3539915d0' into sync_cg_clif-2023-11-10 rust-lang@c84d1871dc Rustup to rustc 1.75.0-nightly (0f44eb3 2023-11-09) rust-lang@6e7961ac5d Sync from rust 0f44eb3 rust-lang@3d0e99d632 Auto merge of rust-lang#117765 - onur-ozkan:fix-117762, r=clubby789 rust-lang@17d0a45f5d Auto merge of rust-lang#117572 - RalfJung:addr_of, r=cuviper rust-lang@e30f8ae867 mention null explicitly rust-lang@0a1e5598b0 Auto merge of rust-lang#117750 - klensy:icu-followup, r=Nilstrieb rust-lang@d42d73b144 Auto merge of rust-lang#117769 - matthiaskrgr:rollup-4efjlg3, r=matthiaskrgr rust-lang@186a3c8c61 Rollup merge of rust-lang#117751 - aDotInTheVoid:unkind, r=GuillaumeGomez rust-lang@7607597d3a Rollup merge of rust-lang#117743 - sjwang05:issue-117720, r=estebank rust-lang@7fd7719ca1 Rollup merge of rust-lang#117741 - eltociear:patch-23, r=compiler-errors rust-lang@0f1da7e682 Rollup merge of rust-lang#117730 - jmillikin:fmt-debug-helper-fns, r=cuviper rust-lang@7096ec3e00 Rollup merge of rust-lang#117039 - scottmcm:clarify-get-unchecked, r=cuviper rust-lang@9dc022dd80 Rollup merge of rust-lang#114191 - rcvalle:rust-exploit-mitigations, r=cuviper rust-lang@82a9f94de5 Closure-consuming helper functions for `fmt::Debug` helpers rust-lang@fdb72795d1 enable unstable feature on `x clean [PATH]` rust-lang@22e1576a12 rustdoc-json: Fix test so it actuall checks things rust-lang@7142c8d83c bump few ICU4X leftover deps rust-lang@5693a34db2 Suggest fix for ; within let-chains rust-lang@b8648216a5 Fix typo in internal.rs rust-lang@7c385f5a03 Update exploit mitigations documentation rust-lang@545175ce87 Fix addition formatting rust-lang@82487a9447 Merge pull request rust-lang#1417 from rust-lang/implement_xgetbv rust-lang@864973135a Implement all vendor intrinsics used by the simd-json crate rust-lang@9f426cef38 Merge pull request rust-lang#1416 from afonso360/aarch64-intrinsics-1 rust-lang@ecf79a304a Implement all vendor intrinsics used by the fimg crate rust-lang@0a35232c85 Implement all vendor intrinsics used by the httparse crate rust-lang@61e38ceea7 Implement all SSE intrinsics used by the jpeg-decoder crate rust-lang@438194980b Implement all avx2 intrinsics used by the image crate rust-lang@6a53acefd8 Implement _mm256_permute2f128_ps and _mm256_permute2f128_pd intrinsics rust-lang@81af5b5031 update and clarify addr_of docs rust-lang@209476e33a Only import aarch64 intrinsics on aarch64 rust-lang@f824da66c6 Make neon example build in all arches rust-lang@70a6abfd29 Add unsigned saturating add/sub intrinsics for aarch64 rust-lang@88c2e7896b Implement aarch64 addp intrinsics rust-lang@1f09bae6a8 Implement min/max neon intrisics rust-lang@8eca01f4b6 Remove support for compiler plugins. rust-lang@f6a8c3afb5 Add real implementation of _xgetbv() rust-lang@909513ef74 Use Value instead of CValue in CInlineAsmOperand rust-lang@ef3703694f Disable a couple of rustc tests which are broken due to a rustc bug rust-lang@c04ceb4342 Fix workaround for the `int $$0x29` issue to not crash on empty inline asm rust-lang@04f1024ecb Rustup to rustc 1.75.0-nightly (75b064d 2023-11-01) rust-lang@361585e06d Sync from rust 75b064d rust-lang@03c9acdd8f Support enum variants in offset_of! rust-lang@48ca2d9703 Implement llvm.fma.v* intrinsics rust-lang@aed0ed2875 Rollup merge of rust-lang#117317 - RalfJung:track-caller, r=oli-obk rust-lang@9a33f82140 Remove inline asm support from the list of limitations rust-lang@51f6ac7bfc Merge branch 'sync_from_rust' rust-lang@41dcb52153 Merge commit 'dde58803fd6cbb270c7a437f36a8a3a29fbef679' into sync_cg_clif-2023-10-29 rust-lang@c6f5090294 share the track_caller handling within a mir::Body rust-lang@bad4be6e29 interpret: call caller_location logic the same way codegen does, and share some code rust-lang@01ca7a0cb0 Add the missing word rust-lang@2c13ee8970 Clarify UB in `get_unchecked(_mut)` rust-lang@40a83be6eb Format exploit mitigations documentation Co-authored-by: celinval <celinval@users.noreply.github.com>
This PR tries to fix the issue: #115222
As suggested by @estebank , I did the following:
tests/ui/structs/method-chain-expression-failure.rs
compiler/rusct_hir_tycheck/src/method/suggest.rs
walking up the method chain and calling
probe_for_name
with the method name. But the call fails to returnOk
.