Remove a bunch of redundant args from report_method_error
#125906
Merged
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
compiler-errors
changed the title
report_method_error
compiler-errors
commented
Jun 3, 2024
| expected: Expectation<'tcx>, | ||
| trait_missing_method: bool, | ||
| ) -> Option<Diag<'_>> { | ||
| let (span, sugg_span, source, item_name, args) = match self.tcx.hir_node(call_id) { |
There was a problem hiding this comment.
Don't ask me what the difference is between span and sugg_span, because it's incredibly nasty how both of those spans are being passed around below and I don't particularly want to simplify it.
compiler-errors
commented
Jun 3, 2024
| @@ -52,7 +52,7 @@ error[E0599]: no function or associated item named `bitor` found for trait objec | |||
| LL | let g = BitXor::bitor; | |||
| | ^^^^^ function or associated item not found in `dyn BitXor<_>` | |||
| | | |||
| help: there is a method `bitxor` with a similar name, but with different arguments | |||
| help: there is a method `bitxor` with a similar name | |||
There was a problem hiding this comment.
We were previously passing Some([]) for the args for all raw path exprs, I believe. This lead to the diagnostics code to treat it as if it had no methods.
This expression has no arguments, so "but with different arguments" was spurious.
| @@ -15,13 +15,6 @@ LL | Box::z | |||
| LL | mac!(); | |||
| | ------ in this macro invocation | |||
| | | |||
| note: if you're trying to build a new `Box<_, _>` consider using one of the following associated functions: | |||
There was a problem hiding this comment.
See above. We don't suggest builder methods for non-calls.
| help: trait `B` which provides `B` is implemented but not in scope; perhaps you want to import it | ||
| | | ||
| LL + use assoc_const::B; | ||
| | | ||
| help: there is a method `b` with a similar name | ||
| | | ||
| LL | S::b; |
There was a problem hiding this comment.
See above, we don't do an identifier suggestion if it's not a method.
|
☔ The latest upstream changes (presumably #125397) made this pull request unmergeable. Please resolve the merge conflicts. |
compiler-errors
force-pushed
the
simplify-method-error-args
branch
from
bb97add
to
e9957b9
Compare
|
@bors r+ rollup |
bors
added
S-waiting-on-bors
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Jun 5, 2024
…kingjubilee Rollup of 12 pull requests Successful merges: - rust-lang#123168 (Add `size_of` and `size_of_val` and `align_of` and `align_of_val` to the prelude) - rust-lang#125273 (bootstrap: implement new feature `bootstrap-self-test`) - rust-lang#125683 (Rewrite `suspicious-library`, `resolve-rename` and `incr-prev-body-beyond-eof` `run-make` tests in `rmake.rs` format) - rust-lang#125815 (`rustc_parse` top-level cleanups) - rust-lang#125903 (rustc_span: Inline some hot functions) - rust-lang#125906 (Remove a bunch of redundant args from `report_method_error`) - rust-lang#125920 (Allow static mut definitions with #[linkage]) - rust-lang#125982 (Make deleting on LinkedList aware of the allocator) - rust-lang#125995 (Use inline const blocks to create arrays of `MaybeUninit`.) - rust-lang#125996 (Closures are recursively reachable) - rust-lang#126003 (Add a co-maintainer for the two ARMv4T targets) - rust-lang#126004 (Add another test for hidden types capturing lifetimes that outlive but arent mentioned in substs) r? `@ghost` `@rustbot` modify labels: rollup
rust-timer
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Jun 5, 2024
Rollup merge of rust-lang#125906 - compiler-errors:simplify-method-error-args, r=fmease Remove a bunch of redundant args from `report_method_error` Rebased on top of rust-lang#125397 because I had originally asked there (rust-lang#125397 (comment)) for this change to be made, but I just chose to do it myself. r? fmease
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.
Rebased on top of #125397 because I had originally asked there (#125397 (comment)) for this change to be made, but I just chose to do it myself.
r? fmease