Auto merge of #36573 - jseyfried:groundwork, r=nrc

resolve: groundwork for building the module graph during expansion

r? @nrc

diff --cc src/librustc_resolve/macros.rs
index 86c4a18343a3f274cba16d2bf059588fd5eb9c07,67b7dc1a69fb0e77df6e6bf0799fbbfa2f912cf2..c9aa7d6a330184577c1342de8aafd24bc4220724
--- 1/src/librustc_resolve/macros.rs
--- 2/src/librustc_resolve/macros.rs
+++ b/src/librustc_resolve/macros.rs
@@@ -71,11 -71,9 +71,11 @@@ impl<'a> base::Resolver for Resolver<'a
      fn find_attr_invoc(&mut self, attrs: &mut Vec<ast::Attribute>) -> Option<ast::Attribute> {
          for i in 0..attrs.len() {
              let name = intern(&attrs[i].name());
-             match self.expansion_data[0].module.macros.borrow().get(&name) {
+             match self.expansion_data[&0].module.macros.borrow().get(&name) {
                  Some(ext) => match **ext {
 -                    MultiModifier(..) | MultiDecorator(..) => return Some(attrs.remove(i)),
 +                    MultiModifier(..) | MultiDecorator(..) | SyntaxExtension::AttrProcMacro(..) => {
 +                        return Some(attrs.remove(i))
 +                    }
                      _ => {}
                  },
                  None => {}

diff --cc src/libsyntax/ext/base.rs
Simple merge

diff --cc src/libsyntax/ext/expand.rs
Simple merge