Fix regression: account for trait methods in arg count mismatch error

[CAD97]

Fixed#47706 (#47706 (comment))

Original PR #47747 missed methods on trait definitions.

This edit was done in GitHub. I think I got the signature of the variant right, going by the ICE debug output and the other cases above.

[rust-highfive]

Thanks for the pull request, and welcome! The Rust team is excited to review your changes, and you should hear from @nikomatsakis (or someone else) soon.

If any changes to this PR are deemed necessary, please add them as extra commits. This ensures that the reviewer can see what has changed since they last reviewed the code. Due to the way GitHub handles out-of-date commits, this should also make it reasonably obvious what issues have or haven't been addressed. Large or tricky changes may require several passes of review and changes.

Please see the contribution instructions for more information.

[CAD97]

cc @estebank

(Complete off-topic: I already made an earlier PR#47083, why did I get the first-time greeting from highfive?)

[CAD97]

I should probably add a test for this. I can do that about 17 hours from now when I hit the machine where I've got the repo checked out and set up already, or someone else is free to add the test case I posted in the linked issue comment.

[pnkfelix]

@CAD97 this looks great!

Please squash the commits you have added when you put up the test case.

r=me once the test case is added.

[estebank]

@CAD97 thank you for following up and adding a fix. I would prefer it if it had a test case in the same commit for easier historical tracking. We can wait another 8 hours for it :)

[CAD97]

Test added and squashed!

r? @pnkfelix

[estebank]

[00:04:11] tidy error: /checkout/src/test/ui/issue-47706-trait.rs:15: line longer than 100 chars
[00:04:12] some tidy checks failed

[CAD97]

Yeah, working on it

[CAD97]

That should fix the tidy issue.

or not >.>

[estebank]

Just remove line 16, line 15 will match the beginning and work as expected.

[CAD97]

Well, I did something wrong I guess (by putting on the tag?) https://travis-ci.org/rust-lang/rust/builds/334956316

[estebank]

Yeah, just remove the [E0593] and it should pass.

[CAD97]

That should be everything.

[CAD97]

Travis passed.

[estebank]

@bors r+ rollup

[bors]

📌 Commit c06c707 has been approved by estebank