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

rollup merge of #21845: Potpourri/import-syntax

Browse Source 
syntax like `use foo::bar::;` and `use foo:: as bar;` should be rejected, see issue #21629
This commit is contained in:
Alex Crichton 2015-02-02 11:01:17 -08:00
commit 3ef2df9e88
3 changed files with 30 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/libsyntax/parse/parser.rs
View File

@ -5917,9 +5917,9 @@ impl<'a> Parser<'a> {
self.bump();
match self.token {
token::Ident(i, _) => {
self.bump();
path.push(i);
token::Ident(..) => {
let ident = self.parse_ident();
path.push(ident);
}
// foo::bar::{a,b,c}
@ -5959,6 +5959,11 @@ impl<'a> Parser<'a> {
return P(spanned(lo, self.span.hi, ViewPathGlob(path)));
}
// fall-through for case foo::bar::;
token::Semi => {
self.span_err(self.span, "expected identifier or `{` or `*`, found `;`");
}
_ => break
}
}

11
src/test/compile-fail/use-as-where-use-ends-with-mod-sep.rs Normal file
View File

@ -0,0 +1,11 @@
// Copyright 2015 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.
use std::any:: as foo; //~ ERROR expected identifier or `{` or `*`, found `as`

11
src/test/compile-fail/use-ends-with-mod-sep.rs Normal file
View File

@ -0,0 +1,11 @@
// Copyright 2015 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.
use std::any::; //~ ERROR expected identifier or `{` or `*`, found `;`