mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Attempt to address review comments via github web...

Browse Source
This commit is contained in:
Shrey Sudhir 2022-12-01 14:12:33 +00:00 committed by SpanishPear
parent 5287004aa4
commit 655beb4ece
7 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
compiler/rustc_parse/src/parser/diagnostics.rs
View File

@ -352,13 +352,12 @@ impl<'a> Parser<'a> {
// if there is a `<` after the fn name, then don't show a suggestion, show help // if there is a `<` after the fn name, then don't show a suggestion, show help
if !self.look_ahead(1, |t| *t == token::Lt) && if !self.look_ahead(1, |t| *t == token::Lt) &&
let Ok(snippet) = self.sess.source_map().span_to_snippet(generic.span) && let Ok(snippet) = self.sess.source_map().span_to_snippet(generic.span) {
let Ok(ident) = self.sess.source_map().span_to_snippet(self.token.span) {
err.span_suggestion_verbose( err.span_suggestion_verbose(
self.token.span.shrink_to_hi(), self.token.span.shrink_to_hi(),
format!("place the generic parameter name after the {ident_name} name"), format!("place the generic parameter name after the {ident_name} name"),
snippet, snippet,
Applicability::MachineApplicable, Applicability::MaybeIncorrect,
); );
} else { } else {
err.help(format!( err.help(format!(

2
src/test/ui/parser/suggest_misplaced_generics/enum.stderr
View File

@ -7,7 +7,7 @@ LL | enum<T> Foo { Variant(T) }
help: place the generic parameter name after the enum name help: place the generic parameter name after the enum name
| |
LL | enum Foo<T> { Variant(T) } LL | enum Foo<T> { Variant(T) }
| ~~~~~~ | ~~~
error: aborting due to previous error error: aborting due to previous error

2
src/test/ui/parser/suggest_misplaced_generics/fn-complex-generics.stderr
View File

@ -7,7 +7,7 @@ LL | fn<'a, B: 'a + std::ops::Add<Output = u32>> f(_x: B) { }
help: place the generic parameter name after the fn name help: place the generic parameter name after the fn name
| |
LL | fn f<'a, B: 'a + std::ops::Add<Output = u32>>(_x: B) { } LL | fn f<'a, B: 'a + std::ops::Add<Output = u32>>(_x: B) { }
| ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ | ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
error: aborting due to previous error error: aborting due to previous error

2
src/test/ui/parser/suggest_misplaced_generics/fn-simple.stderr
View File

@ -7,7 +7,7 @@ LL | fn<T> id(x: T) -> T { x }
help: place the generic parameter name after the fn name help: place the generic parameter name after the fn name
| |
LL | fn id<T>(x: T) -> T { x } LL | fn id<T>(x: T) -> T { x }
| ~~~~~ | ~~~
error: aborting due to previous error error: aborting due to previous error

2
src/test/ui/parser/suggest_misplaced_generics/struct.stderr
View File

@ -7,7 +7,7 @@ LL | struct<T> Foo { x: T }
help: place the generic parameter name after the struct name help: place the generic parameter name after the struct name
| |
LL | struct Foo<T> { x: T } LL | struct Foo<T> { x: T }
| ~~~~~~ | ~~~
error: aborting due to previous error error: aborting due to previous error

2
src/test/ui/parser/suggest_misplaced_generics/trait.stderr
View File

@ -7,7 +7,7 @@ LL | trait<T> Foo {
help: place the generic parameter name after the trait name help: place the generic parameter name after the trait name
| |
LL | trait Foo<T> { LL | trait Foo<T> {
| ~~~~~~ | ~~~
error: aborting due to previous error error: aborting due to previous error

2
src/test/ui/parser/suggest_misplaced_generics/type.stderr
View File

@ -7,7 +7,7 @@ LL | type<T> Foo = T;
help: place the generic parameter name after the type name help: place the generic parameter name after the type name
| |
LL | type Foo<T> = T; LL | type Foo<T> = T;
| ~~~~~~ | ~~~
error: aborting due to previous error error: aborting due to previous error