Skip to content

Use structured suggestion for disambiguating method calls - #67127

Merged
bors merged 2 commits into
rust-lang:masterfrom
estebank:disambiguate-suggestion
Dec 20, 2019
Merged

Use structured suggestion for disambiguating method calls#67127
bors merged 2 commits into
rust-lang:masterfrom
estebank:disambiguate-suggestion

Conversation

@estebank

@estebankestebank commented Dec 7, 2019

Copy link
Copy Markdown
Contributor

Fix#65635.

@rust-highfive

rust-highfive commented Dec 7, 2019

Copy link
Copy Markdown
Contributor

r? @varkor

(rust_highfive has picked a reviewer for you, use r? to override)

@rust-highfiverust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Dec 7, 2019
Centril
Centril reviewed Dec 7, 2019
View reviewed changes
Comment threadsrc/test/ui/error-codes/E0034.stderr Outdated
Centril
Centril reviewed Dec 7, 2019
View reviewed changes
Comment threadsrc/librustc_typeck/check/method/suggest.rs Outdated
Comment threadsrc/librustc_typeck/check/method/suggest.rs Outdated
@estebank
estebankforce-pushed the disambiguate-suggestion branch from 8083dde to d1dc69eCompareDecember 12, 2019 02:20
@estebank
estebankforce-pushed the disambiguate-suggestion branch from d1dc69e to 8c4f1d5CompareDecember 12, 2019 02:22
varkor
varkor reviewed Dec 13, 2019
View reviewed changes
Comment threadsrc/test/ui/issues/issue-18446.stderr
| --^^^--
| | |
| | multiple `foo` found
| help: disambiguate the method call for candidate #2: `T::foo(&x)`

@varkorvarkorDec 13, 2019

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why is there only one disambiguation suggestion here?

@estebankestebankDec 13, 2019•
edited
Loading

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The code for this is


trait T {
fn foo(&self);
}
impl<'a> dyn T + 'a {
fn foo(&self) {}
}
impl T for i32 {
fn foo(&self) {}
}
fn main() {
let x: &dyn T = &0i32;
x.foo(); //~ ERROR multiple applicable items in scope [E0034]
}

I'm not sure what the appropriate syntax would be to call (&dyn T)::foo. Also note that we were already not suggesting it.

@varkorvarkorDec 17, 2019

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Also note that we were already not suggesting it.

I did notice this. I think we ought to open a new issue — if the user can't specify (&dyn T)::foo, we should at least explain this in the diagnostic. But this PR looks good as it is.

@varkor

varkor commented Dec 17, 2019

Copy link
Copy Markdown
Contributor

@bors r+

@bors

bors commented Dec 17, 2019

Copy link
Copy Markdown
Collaborator

📌 Commit 8c4f1d5 has been approved by varkor

@bors

bors commented Dec 17, 2019

Copy link
Copy Markdown
Collaborator

🌲 The tree is currently closed for pull requests below priority 100, this pull request will be tested once the tree is reopened

@borsbors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Dec 17, 2019
Mark-Simulacrum added a commit to Mark-Simulacrum/rust that referenced this pull request Dec 18, 2019
@Mark-Simulacrum
Rollup merge ofrust-lang#67127- estebank:disambiguate-suggestion, r…
67d560b
…=varkor
Use structured suggestion for disambiguating method calls
Fixrust-lang#65635.
@Mark-SimulacrumMark-Simulacrum mentioned this pull request Dec 18, 2019
Closed
tmandry added a commit to tmandry/rust that referenced this pull request Dec 18, 2019
@tmandry
Rollup merge ofrust-lang#67127- estebank:disambiguate-suggestion, r…
c012ebb
…=varkor
Use structured suggestion for disambiguating method calls
Fixrust-lang#65635.
@tmandrytmandry mentioned this pull request Dec 18, 2019
Closed
Mark-Simulacrum added a commit to Mark-Simulacrum/rust that referenced this pull request Dec 19, 2019
@Mark-Simulacrum
Rollup merge ofrust-lang#67127- estebank:disambiguate-suggestion, r…
dced4c2
…=varkor
Use structured suggestion for disambiguating method calls
Fixrust-lang#65635.
@Mark-SimulacrumMark-Simulacrum mentioned this pull request Dec 19, 2019
Closed
Centril added a commit to Centril/rust that referenced this pull request Dec 19, 2019
@Centril
Rollup merge ofrust-lang#67127- estebank:disambiguate-suggestion, r…
8c15656
…=varkor
Use structured suggestion for disambiguating method calls
Fixrust-lang#65635.
@CentrilCentril mentioned this pull request Dec 19, 2019
Closed
Centril added a commit to Centril/rust that referenced this pull request Dec 19, 2019
@Centril
Rollup merge ofrust-lang#67426- Centril:rollup-rswp4rf, r=Centril
fbea61a
Rollup of 7 pull requests
Successful merges:
- rust-lang#66670 (Normalize ident)
- rust-lang#66755 (Remove a const-if-hack in RawVec)
- rust-lang#67127 (Use structured suggestion for disambiguating method calls)
- rust-lang#67281 (add string.insert benchmarks)
- rust-lang#67328 (Remove now-redundant range check on u128 -> f32 casts)
- rust-lang#67392 (Fix unresolved type span inside async object)
- rust-lang#67421 (Fix internal documentation typo)
Failed merges:
r? @ghost
Centril added a commit to Centril/rust that referenced this pull request Dec 19, 2019
@Centril
Rollup merge ofrust-lang#67426- Centril:rollup-rswp4rf, r=Centril
edeabe6
Rollup of 7 pull requests
Successful merges:
- rust-lang#66670 (Normalize ident)
- rust-lang#66755 (Remove a const-if-hack in RawVec)
- rust-lang#67127 (Use structured suggestion for disambiguating method calls)
- rust-lang#67281 (add string.insert benchmarks)
- rust-lang#67328 (Remove now-redundant range check on u128 -> f32 casts)
- rust-lang#67392 (Fix unresolved type span inside async object)
- rust-lang#67421 (Fix internal documentation typo)
Failed merges:
r? @ghost
Mark-Simulacrum added a commit to Mark-Simulacrum/rust that referenced this pull request Dec 19, 2019
@Mark-Simulacrum
Rollup merge ofrust-lang#67426- Centril:rollup-rswp4rf, r=Centril
e2c608b
Rollup of 7 pull requests
Successful merges:
- rust-lang#66670 (Normalize ident)
- rust-lang#66755 (Remove a const-if-hack in RawVec)
- rust-lang#67127 (Use structured suggestion for disambiguating method calls)
- rust-lang#67281 (add string.insert benchmarks)
- rust-lang#67328 (Remove now-redundant range check on u128 -> f32 casts)
- rust-lang#67392 (Fix unresolved type span inside async object)
- rust-lang#67421 (Fix internal documentation typo)
Failed merges:
r? @ghost
Centril added a commit to Centril/rust that referenced this pull request Dec 20, 2019
@Centril
Rollup merge ofrust-lang#67127- estebank:disambiguate-suggestion, r…
c9f0481
…=varkor
Use structured suggestion for disambiguating method calls
Fixrust-lang#65635.
@CentrilCentril mentioned this pull request Dec 20, 2019
Closed
Centril added a commit to Centril/rust that referenced this pull request Dec 20, 2019
@Centril
Rollup merge ofrust-lang#67127- estebank:disambiguate-suggestion, r…
f0eb4b4
…=varkor
Use structured suggestion for disambiguating method calls
Fixrust-lang#65635.
@CentrilCentril mentioned this pull request Dec 20, 2019
Merged
bors added a commit that referenced this pull request Dec 20, 2019
@bors
Auto merge of#67449- Centril:rollup-04hvg57, r=Centril
6b561b4
Rollup of 7 pull requests
Successful merges:
- #66755 (Remove a const-if-hack in RawVec)
- #67127 (Use structured suggestion for disambiguating method calls)
- #67219 (Fix up Command Debug output when arg0 is specified.)
- #67285 (Indicate origin of where type parameter for uninferred types )
- #67328 (Remove now-redundant range check on u128 -> f32 casts)
- #67367 (Move command line option definitions into a dedicated file)
- #67442 (Remove `SOCK_CLOEXEC` dummy variable on platforms that don't use it.)
Failed merges:
r? @ghost
@bors
bors merged commit 8c4f1d5 into rust-lang:masterDec 20, 2019
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

2 more reviewers
@CentrilCentrilCentril left review comments
@varkorvarkorvarkor left review comments
Reviewers whose approvals may not affect merge requirements

Assignees

@varkorvarkor

Labels

S-waiting-on-borsStatus: Waiting on bors to run and complete tests. Bors will change the label on completion.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

Incorrect compiler hint for method with (&self) and (&mut self) signature when multiple applicable items are found in scope

5 participants

@estebank@rust-highfive@varkor@bors@Centril