Add macros from plugins in `libsyntax_ext::register_builtins`.

2 files changed, 5 insertions, 14 deletions

diff --git a/src/libsyntax/ext/base.rs b/src/libsyntax/ext/base.rs
index ece4f057b34..ad1d65c8c54 100644
--- a/src/libsyntax/ext/base.rs
+++ b/src/libsyntax/ext/base.rs
@@ -738,14 +738,9 @@ impl<'a> ExtCtxt<'a> {
         token::intern(st)
     }
 
-    pub fn initialize(&mut self, user_exts: Vec<NamedSyntaxExtension>, krate: &ast::Crate) {
+    pub fn initialize(&mut self, krate: &ast::Crate) {
         self.crate_root = std_inject::injected_crate_name(krate);
 
-        for (name, extension) in user_exts {
-            let ident = ast::Ident::with_empty_ctxt(name);
-            self.resolver.add_ext(ident, Rc::new(extension));
-        }
-
         let mut module = ModuleData {
             mod_path: vec![token::str_to_ident(&self.ecfg.crate_name)],
             directory: PathBuf::from(self.parse_sess.codemap().span_to_filename(krate.span)),
diff --git a/src/libsyntax/ext/expand.rs b/src/libsyntax/ext/expand.rs
index b1d828d0e3e..16e53d270f0 100644
--- a/src/libsyntax/ext/expand.rs
+++ b/src/libsyntax/ext/expand.rs
@@ -866,19 +866,15 @@ impl<'feat> ExpansionConfig<'feat> {
     }
 }
 
-pub fn expand_crate(cx: &mut ExtCtxt,
-                    user_exts: Vec<NamedSyntaxExtension>,
-                    c: Crate) -> Crate {
-    cx.initialize(user_exts, &c);
+pub fn expand_crate(cx: &mut ExtCtxt, c: Crate) -> Crate {
+    cx.initialize(&c);
     cx.monotonic_expander().expand_crate(c)
 }
 
 // Expands crate using supplied MacroExpander - allows for
 // non-standard expansion behaviour (e.g. step-wise).
-pub fn expand_crate_with_expander(expander: &mut MacroExpander,
-                                  user_exts: Vec<NamedSyntaxExtension>,
-                                  c: Crate) -> Crate {
-    expander.cx.initialize(user_exts, &c);
+pub fn expand_crate_with_expander(expander: &mut MacroExpander, c: Crate) -> Crate {
+    expander.cx.initialize(&c);
     expander.expand_crate(c)
 }