Rollup merge of #106606 - estebank:bad-nested-turbofish, r=compiler-errors
Do not emit structured suggestion for turbofish with wrong span Fix #79161.
This commit is contained in:
commit
5e8e97f981
@ -1104,7 +1104,11 @@ impl<'a> Parser<'a> {
|
|||||||
return if token::ModSep == self.token.kind {
|
return if token::ModSep == self.token.kind {
|
||||||
// We have some certainty that this was a bad turbofish at this point.
|
// We have some certainty that this was a bad turbofish at this point.
|
||||||
// `foo< bar >::`
|
// `foo< bar >::`
|
||||||
err.suggest_turbofish = Some(op.span.shrink_to_lo());
|
if let ExprKind::Binary(o, ..) = inner_op.kind && o.node == BinOpKind::Lt {
|
||||||
|
err.suggest_turbofish = Some(op.span.shrink_to_lo());
|
||||||
|
} else {
|
||||||
|
err.help_turbofish = Some(());
|
||||||
|
}
|
||||||
|
|
||||||
let snapshot = self.create_snapshot_for_diagnostic();
|
let snapshot = self.create_snapshot_for_diagnostic();
|
||||||
self.bump(); // `::`
|
self.bump(); // `::`
|
||||||
@ -1130,7 +1134,11 @@ impl<'a> Parser<'a> {
|
|||||||
} else if token::OpenDelim(Delimiter::Parenthesis) == self.token.kind {
|
} else if token::OpenDelim(Delimiter::Parenthesis) == self.token.kind {
|
||||||
// We have high certainty that this was a bad turbofish at this point.
|
// We have high certainty that this was a bad turbofish at this point.
|
||||||
// `foo< bar >(`
|
// `foo< bar >(`
|
||||||
err.suggest_turbofish = Some(op.span.shrink_to_lo());
|
if let ExprKind::Binary(o, ..) = inner_op.kind && o.node == BinOpKind::Lt {
|
||||||
|
err.suggest_turbofish = Some(op.span.shrink_to_lo());
|
||||||
|
} else {
|
||||||
|
err.help_turbofish = Some(());
|
||||||
|
}
|
||||||
// Consume the fn call arguments.
|
// Consume the fn call arguments.
|
||||||
match self.consume_fn_args() {
|
match self.consume_fn_args() {
|
||||||
Err(()) => Err(err.into_diagnostic(&self.sess.span_diagnostic)),
|
Err(()) => Err(err.into_diagnostic(&self.sess.span_diagnostic)),
|
||||||
|
3
src/test/ui/parser/nested-bad-turbofish.rs
Normal file
3
src/test/ui/parser/nested-bad-turbofish.rs
Normal file
@ -0,0 +1,3 @@
|
|||||||
|
fn main() {
|
||||||
|
foo<<S as T>::V>(); //~ ERROR
|
||||||
|
}
|
11
src/test/ui/parser/nested-bad-turbofish.stderr
Normal file
11
src/test/ui/parser/nested-bad-turbofish.stderr
Normal file
@ -0,0 +1,11 @@
|
|||||||
|
error: comparison operators cannot be chained
|
||||||
|
--> $DIR/nested-bad-turbofish.rs:2:16
|
||||||
|
|
|
||||||
|
LL | foo<<S as T>::V>();
|
||||||
|
| ^ ^
|
||||||
|
|
|
||||||
|
= help: use `::<...>` instead of `<...>` to specify lifetime, type, or const arguments
|
||||||
|
= help: or use `(...)` if you meant to specify fn arguments
|
||||||
|
|
||||||
|
error: aborting due to previous error
|
||||||
|
|
Loading…
x
Reference in New Issue
Block a user