Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Ensure that generic arguments don't end up in attribute paths. #43948

Merged
merged 2 commits into from
Aug 23, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion src/libsyntax/parse/parser.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1776,7 +1776,13 @@ impl<'a> Parser<'a> {

pub fn parse_path_common(&mut self, style: PathStyle, enable_warning: bool)
-> PResult<'a, ast::Path> {
maybe_whole!(self, NtPath, |x| x);
maybe_whole!(self, NtPath, |path| {
if style == PathStyle::Mod &&
path.segments.iter().any(|segment| segment.parameters.is_some()) {
self.diagnostic().span_err(path.span, "unexpected generic arguments in path");
}
path
});

let lo = self.meta_var_span.unwrap_or(self.span);
let mut segments = Vec::new();
Expand Down
22 changes: 22 additions & 0 deletions src/test/compile-fail/issue-43424.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
// Copyright 2017 The Rust Project Developers. See the COPYRIGHT
// file at the top-level directory of this distribution and at
// http://rust-lang.org/COPYRIGHT.
//
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
// option. This file may not be copied, modified, or distributed
// except according to those terms.

#![allow(unused)]

macro_rules! m {
($attr_path: path) => {
#[$attr_path]
fn f() {}
}
}

m!(inline<u8>); //~ ERROR: unexpected generic arguments in path

fn main() {}
4 changes: 2 additions & 2 deletions src/test/ui/span/import-ty-params.rs
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,10 @@ macro_rules! import {
}

fn f1() {
import! { a::b::c::S<u8> } //~ ERROR generic arguments in import path
import! { a::b::c::S<u8> } //~ ERROR unexpected generic arguments in path
}
fn f2() {
import! { a::b::c::S<> } //~ ERROR generic arguments in import path
import! { a::b::c::S<> } //~ ERROR unexpected generic arguments in path
}

fn main() {}
16 changes: 8 additions & 8 deletions src/test/ui/span/import-ty-params.stderr
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
error: generic arguments in import path
--> $DIR/import-ty-params.rs:24:25
error: unexpected generic arguments in path
--> $DIR/import-ty-params.rs:24:15
|
24 | import! { a::b::c::S<u8> } //~ ERROR generic arguments in import path
| ^^^^
24 | import! { a::b::c::S<u8> } //~ ERROR unexpected generic arguments in path
| ^^^^^^^^^^^^^^

error: generic arguments in import path
--> $DIR/import-ty-params.rs:27:25
error: unexpected generic arguments in path
--> $DIR/import-ty-params.rs:27:15
|
27 | import! { a::b::c::S<> } //~ ERROR generic arguments in import path
| ^^
27 | import! { a::b::c::S<> } //~ ERROR unexpected generic arguments in path
| ^^^^^^^^^^^^

error: aborting due to 2 previous errors

10 changes: 0 additions & 10 deletions src/test/ui/span/macro-ty-params.rs
Original file line number Diff line number Diff line change
Expand Up @@ -16,16 +16,6 @@ macro_rules! m {

fn main() {
foo::<T>!();
//~^ ERROR generic arguments in macro path
//~| ERROR generic arguments in macro path
//~| ERROR generic arguments in macro path
foo::<>!();
//~^ ERROR generic arguments in macro path
//~| ERROR generic arguments in macro path
//~| ERROR generic arguments in macro path
m!(MyTrait<>);
//~^ ERROR generic arguments in macro path
//~| ERROR generic arguments in macro path
//~| ERROR generic arguments in macro path
//~| ERROR generic arguments in macro path
}
22 changes: 17 additions & 5 deletions src/test/ui/span/macro-ty-params.stderr
Original file line number Diff line number Diff line change
@@ -1,20 +1,32 @@
error: unexpected generic arguments in path
--> $DIR/macro-ty-params.rs:20:8
|
20 | m!(MyTrait<>);
| ^^^^^^^^^

error: unexpected generic arguments in path
--> $DIR/macro-ty-params.rs:20:8
|
20 | m!(MyTrait<>);
| ^^^^^^^^^

error: generic arguments in macro path
--> $DIR/macro-ty-params.rs:18:8
|
18 | foo::<T>!();
| ^^^^^

error: generic arguments in macro path
--> $DIR/macro-ty-params.rs:22:8
--> $DIR/macro-ty-params.rs:19:8
|
22 | foo::<>!();
19 | foo::<>!();
| ^^^^

error: generic arguments in macro path
--> $DIR/macro-ty-params.rs:26:15
--> $DIR/macro-ty-params.rs:20:15
|
26 | m!(MyTrait<>);
20 | m!(MyTrait<>);
| ^^

error: aborting due to 3 previous errors
error: aborting due to 5 previous errors

4 changes: 2 additions & 2 deletions src/test/ui/span/visibility-ty-params.rs
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,11 @@ macro_rules! m {
}

struct S<T>(T);
m!{ S<u8> } //~ ERROR generic arguments in visibility path
m!{ S<u8> } //~ ERROR unexpected generic arguments in path
//~^ ERROR expected module, found struct `S`

mod m {
m!{ m<> } //~ ERROR generic arguments in visibility path
m!{ m<> } //~ ERROR unexpected generic arguments in path
}

fn main() {}
26 changes: 9 additions & 17 deletions src/test/ui/span/visibility-ty-params.stderr
Original file line number Diff line number Diff line change
@@ -1,22 +1,14 @@
error: generic arguments in visibility path
--> $DIR/visibility-ty-params.rs:16:6
|
16 | m!{ S<u8> } //~ ERROR generic arguments in visibility path
| ^^^^

error: generic arguments in visibility path
--> $DIR/visibility-ty-params.rs:20:10
error: unexpected generic arguments in path
--> $DIR/visibility-ty-params.rs:16:5
|
20 | m!{ m<> } //~ ERROR generic arguments in visibility path
| ^^
16 | m!{ S<u8> } //~ ERROR unexpected generic arguments in path
| ^^^^^

error[E0577]: expected module, found struct `S`
--> $DIR/visibility-ty-params.rs:16:5
error: unexpected generic arguments in path
--> $DIR/visibility-ty-params.rs:20:9
|
16 | m!{ S<u8> } //~ ERROR generic arguments in visibility path
| -^^^^
| |
| did you mean `m`?
20 | m!{ m<> } //~ ERROR unexpected generic arguments in path
| ^^^

error: aborting due to 3 previous errors
error: aborting due to 2 previous errors