summary refs log tree commit diff
path: root/src/libsyntax/ext
diff options
context:
space:
mode:
authorJeffrey Seyfried <jeffrey.seyfried@gmail.com>2016-09-28 22:28:19 +0000
committerJeffrey Seyfried <jeffrey.seyfried@gmail.com>2016-10-07 21:54:01 +0000
commit2df25adbed10c4f12e3a0b2d092c6d06c3746454 (patch)
tree49413850e202cb77f9db8b07d114efb91c0bf020 /src/libsyntax/ext
parent75c155b834e3bd667ca50187741c1b7abbf9e3df (diff)
downloadrust-2df25adbed10c4f12e3a0b2d092c6d06c3746454.tar.gz
rust-2df25adbed10c4f12e3a0b2d092c6d06c3746454.zip
Combine `std_inject::{no_core, no_std}` into `std_inject::injected_crate_name`.
Diffstat (limited to 'src/libsyntax/ext')
-rw-r--r--src/libsyntax/ext/base.rs8
1 files changed, 1 insertions, 7 deletions
diff --git a/src/libsyntax/ext/base.rs b/src/libsyntax/ext/base.rs
index b56018e1e9d..ece4f057b34 100644
--- a/src/libsyntax/ext/base.rs
+++ b/src/libsyntax/ext/base.rs
@@ -739,13 +739,7 @@ impl<'a> ExtCtxt<'a> {
     }
 
     pub fn initialize(&mut self, user_exts: Vec<NamedSyntaxExtension>, krate: &ast::Crate) {
-        if std_inject::no_core(&krate) {
-            self.crate_root = None;
-        } else if std_inject::no_std(&krate) {
-            self.crate_root = Some("core");
-        } else {
-            self.crate_root = Some("std");
-        }
+        self.crate_root = std_inject::injected_crate_name(krate);
 
         for (name, extension) in user_exts {
             let ident = ast::Ident::with_empty_ctxt(name);