Fix suggestion when shorthand self has erroneous type
#122161
Conversation
rustbot
added
A-testsuite
rust-cloud-vms
bot
force-pushed
the
shorthand-self
branch
from
532c15e
to
dc9108a
Compare
… r=workingjubilee Bless tidy issues order The order is not right now because of rust-lang#121248 (comment) from rust-lang#122161 (comment) r? `@workingjubilee`
Rollup merge of rust-lang#122175 - chenyukang:yukang-fix-tidy-issues, r=workingjubilee Bless tidy issues order The order is not right now because of rust-lang#121248 (comment) from rust-lang#122161 (comment) r? `@workingjubilee`
…gjubilee Bless tidy issues order The order is not right now because of rust-lang/rust#121248 (comment) from rust-lang/rust#122161 (comment) r? `@workingjubilee`
|
Seems like @estebank is busy, so r? compiler |
|
r? @fmease |
| @@ -2787,6 +2814,7 @@ impl<'a> Parser<'a> { | |||
| let eself_lo = self.token.span; | |||
| let (eself, eself_ident, eself_hi) = match self.token.uninterpolate().kind { | |||
| token::BinOp(token::And) => { | |||
| let lo = self.token.span; | |||
There was a problem hiding this comment.
that's just eself_lo a few lines further up.
| let eself_ident = expect_self_ident(this); | ||
|
|
||
| // Recover `: Type` after a qualified self | ||
| if this.may_recover() && this.check_noexpect(&token::Colon) { |
There was a problem hiding this comment.
you could also eat_noexpect instead of check + manual bump
| @@ -2355,6 +2355,19 @@ pub enum SelfKind { | |||
| Explicit(P<Ty>, Mutability), | |||
| } | |||
|
|
|||
| impl SelfKind { | |||
| pub fn as_suggestion(&self) -> String { | |||
There was a problem hiding this comment.
| pub fn as_suggestion(&self) -> String { | |
| pub fn to_suggestion(&self) -> String { |
Minor style nit: The Rust API guidelines recommend to_ for “expensive” (alloc) borrowed→owned conversions. as_ is for cheap ones.
https://rust-lang.github.io/api-guidelines/naming.html#c-conv
| impl SelfKind { | ||
| pub fn as_suggestion(&self) -> String { | ||
| match self { | ||
| SelfKind::Value(mutbl) => mutbl.prefix_str().to_string(), |
There was a problem hiding this comment.
mutbl == Mutability::Mut is also unreachable here similar to the explicit case
| SelfKind::Region(None, mutbl) => mutbl.ref_prefix_str().to_string(), | ||
| SelfKind::Region(Some(lt), mutbl) => format!("&{lt} {}", mutbl.prefix_str()), | ||
| SelfKind::Explicit(_, _) => { | ||
| unreachable!("if we had an explicit self, we wouldn't be here") |
There was a problem hiding this comment.
It makes sense to mark this as unreachable but I think the method name is a bit too nondescript, ppl might accidentally reach for it not knowing the internal invariants (I know, it's super easy to find out in this case but I hope you get my point). Maybe the method name could be made more specific? 🤔
fmease
added
S-waiting-on-author
|
☔ The latest upstream changes (presumably #124277) made this pull request unmergeable. Please resolve the merge conflicts. |
Fixes #122086
r? estebank