nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2024-10-31 14:31:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Point only at generic arguments when they are unexpected

Browse Source
This commit is contained in:
Esteban Küber 2020-12-01 00:40:28 -08:00
parent 7907345e58
commit 2e846d6f61
5 changed files with 29 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
compiler/rustc_parse/src/parser/path.rs
View File

@ -133,7 +133,15 @@ impl<'a> Parser<'a> {
maybe_whole!(self, NtPath, |path| {
if style == PathStyle::Mod && path.segments.iter().any(|segment| segment.args.is_some())
{
self.struct_span_err(path.span, "unexpected generic arguments in path").emit();
self.struct_span_err(
path.segments
.iter()
.filter_map(|segment| segment.args.as_ref())
.map(|arg| arg.span())
.collect::<Vec<_>>(),
"unexpected generic arguments in path",
)
.emit();
}
path
});

4
src/test/ui/issues/issue-43424.stderr
View File

@ -1,8 +1,8 @@
error: unexpected generic arguments in path
--> $DIR/issue-43424.rs:10:4
--> $DIR/issue-43424.rs:10:10
|
LL | m!(inline<u8>);
| ^^^^^^^^^^
| ^^^^
error: aborting due to previous error

3
src/test/ui/span/import-ty-params.rs
View File

@ -16,5 +16,8 @@ fn f1() {
fn f2() {
import! { a::b::c::S<> } //~ ERROR unexpected generic arguments in path
}
fn f3() {
import! { a::b<>::c<u8>::S<> } //~ ERROR unexpected generic arguments in path
}
fn main() {}

16
src/test/ui/span/import-ty-params.stderr
View File

@ -1,14 +1,20 @@
error: unexpected generic arguments in path
--> $DIR/import-ty-params.rs:14:15
--> $DIR/import-ty-params.rs:14:25
|
LL | import! { a::b::c::S<u8> }
| ^^^^^^^^^^^^^^
| ^^^^
error: unexpected generic arguments in path
--> $DIR/import-ty-params.rs:17:15
--> $DIR/import-ty-params.rs:17:25
|
LL | import! { a::b::c::S<> }
| ^^^^^^^^^^^^
| ^^
error: aborting due to 2 previous errors
error: unexpected generic arguments in path
--> $DIR/import-ty-params.rs:20:19
|
LL | import! { a::b<>::c<u8>::S<> }
| ^^ ^^^^ ^^
error: aborting due to 3 previous errors

8
src/test/ui/span/visibility-ty-params.stderr
View File

@ -1,8 +1,8 @@
error: unexpected generic arguments in path
--> $DIR/visibility-ty-params.rs:6:5
--> $DIR/visibility-ty-params.rs:6:6
|
LL | m!{ S<u8> }
| ^^^^^
| ^^^^
error[E0577]: expected module, found struct `S`
--> $DIR/visibility-ty-params.rs:6:5
@ -11,10 +11,10 @@ LL | m!{ S<u8> }
| ^^^^^ not a module
error: unexpected generic arguments in path
--> $DIR/visibility-ty-params.rs:10:9
--> $DIR/visibility-ty-params.rs:10:10
|
LL | m!{ m<> }
| ^^^
| ^^
error: aborting due to 3 previous errors