Skip to content

Commit

Permalink
Auto merge of rust-lang#36618 - jseyfried:crate_root_attr_invoc, r=nrc
Browse files Browse the repository at this point in the history
macros: allow attribute invocations at the crate root

Fixes rust-lang#36617.
r? @nrc
  • Loading branch information
bors committed Sep 22, 2016
2 parents b2627b0 + f4fa62f commit a09cb57
Show file tree
Hide file tree
Showing 2 changed files with 25 additions and 7 deletions.
21 changes: 14 additions & 7 deletions src/libsyntax/ext/expand.rs
Expand Up @@ -184,13 +184,20 @@ impl<'a, 'b> MacroExpander<'a, 'b> {
fn expand_crate(&mut self, mut krate: ast::Crate) -> ast::Crate {
let err_count = self.cx.parse_sess.span_diagnostic.err_count();

let mut krate_item = placeholder(ExpansionKind::Items, ast::DUMMY_NODE_ID)
.make_items().pop().unwrap().unwrap();
krate_item.node = ast::ItemKind::Mod(krate.module);
let krate_item = Expansion::Items(SmallVector::one(P(krate_item)));

krate.module = match self.expand(krate_item).make_items().pop().unwrap().unwrap().node {
ast::ItemKind::Mod(module) => module,
let krate_item = Expansion::Items(SmallVector::one(P(ast::Item {
attrs: krate.attrs,
span: krate.span,
node: ast::ItemKind::Mod(krate.module),
ident: keywords::Invalid.ident(),
id: ast::DUMMY_NODE_ID,
vis: ast::Visibility::Public,
})));

match self.expand(krate_item).make_items().pop().unwrap().unwrap() {
ast::Item { attrs, node: ast::ItemKind::Mod(module), .. } => {
krate.attrs = attrs;
krate.module = module;
},
_ => unreachable!(),
};
krate.exported_macros = mem::replace(&mut self.cx.exported_macros, Vec::new());
Expand Down
11 changes: 11 additions & 0 deletions src/test/compile-fail/issue-36617.rs
@@ -0,0 +1,11 @@
// Copyright 2016 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.

#![derive(Copy)] //~ ERROR `derive` may only be applied to structs, enums and unions

0 comments on commit a09cb57

Please sign in to comment.