bjoernager/rust
bjoernager/rust
1
Fork 0
Code Issues Pull requests Activity

Auto merge of #31534 - jseyfried:restrict_noninline_mod, r=nikomatsakis

Browse source 
This PR disallows non-inline modules without path annotations that are either in a block or in an inline module whose containing file is not a directory owner (fixes #29765).
This is a [breaking-change].
r? @nikomatsakis
This commit is contained in:
bors 2016-02-16 19:34:57 +00:00
commit 9658645407
3 changed files with 34 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

24
src/libsyntax/parse/parser.rs
View file

@ -72,6 +72,7 @@ bitflags! {
flags Restrictions: u8 {
const RESTRICTION_STMT_EXPR = 1 << 0,
const RESTRICTION_NO_STRUCT_LITERAL = 1 << 1,
const NO_NONINLINE_MOD = 1 << 2,
}
}
@ -3301,8 +3302,8 @@ impl<'a> Parser<'a> {
/// Evaluate the closure with restrictions in place.
///
/// After the closure is evaluated, restrictions are reset.
pub fn with_res<F>(&mut self, r: Restrictions, f: F) -> PResult<'a, P<Expr>>
where F: FnOnce(&mut Self) -> PResult<'a, P<Expr>>
pub fn with_res<F, T>(&mut self, r: Restrictions, f: F) -> T
where F: FnOnce(&mut Self) -> T
{
let old = self.restrictions;
self.restrictions = r;
@ -3926,7 +3927,9 @@ impl<'a> Parser<'a> {
}
} else {
// FIXME: Bad copy of attrs
match try!(self.parse_item_(attrs.clone(), false, true)) {
let restrictions = self.restrictions | Restrictions::NO_NONINLINE_MOD;
match try!(self.with_res(restrictions,
|this| this.parse_item_(attrs.clone(), false, true))) {
Some(i) => {
let hi = i.span.hi;
let decl = P(spanned(lo, hi, DeclKind::Item(i)));
@ -5257,11 +5260,8 @@ impl<'a> Parser<'a> {
self.push_mod_path(id, outer_attrs);
try!(self.expect(&token::OpenDelim(token::Brace)));
let mod_inner_lo = self.span.lo;
let old_owns_directory = self.owns_directory;
self.owns_directory = true;
let attrs = try!(self.parse_inner_attributes());
let m = try!(self.parse_mod_items(&token::CloseDelim(token::Brace), mod_inner_lo));
self.owns_directory = old_owns_directory;
self.pop_mod_path();
Ok((id, ItemKind::Mod(m), Some(attrs)))
}
@ -5338,7 +5338,17 @@ impl<'a> Parser<'a> {
let paths = Parser::default_submod_path(id, &dir_path, self.sess.codemap());
if !self.owns_directory {
if self.restrictions.contains(Restrictions::NO_NONINLINE_MOD) {
let msg =
"Cannot declare a non-inline module inside a block unless it has a path attribute";
let mut err = self.diagnostic().struct_span_err(id_sp, msg);
if paths.path_exists {
let msg = format!("Maybe `use` the module `{}` instead of redeclaring it",
paths.name);
err.span_note(id_sp, &msg);
}
return Err(err);
} else if !self.owns_directory {
let mut err = self.diagnostic().struct_span_err(id_sp,
"cannot declare a new module at this location");
let this_module = match self.mod_path_stack.last() {