Fix regression: account for trait methods in arg count mismatch error
Fixed #47706 (https://github.com/rust-lang/rust/issues/47706#issuecomment-
361161495)
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.