summary refs log tree commit diff
path: root/src/libsyntax
diff options
context:
space:
mode:
authorPatrick Walton <pcwalton@mimiga.net>2013-05-22 11:02:40 -0700
committerPatrick Walton <pcwalton@mimiga.net>2013-05-22 21:57:11 -0700
commit3a66d732bb3d4b90796d39a5bc58921cea955c60 (patch)
tree9c99947ce507022939cdcb084a273e87482c2cc0 /src/libsyntax
parent18df18c817b5e109710c58f512a2cc5ad14fa8b2 (diff)
downloadrust-3a66d732bb3d4b90796d39a5bc58921cea955c60.tar.gz
rust-3a66d732bb3d4b90796d39a5bc58921cea955c60.zip
libsyntax: Fix more merge fallout.
Diffstat (limited to 'src/libsyntax')
-rw-r--r--src/libsyntax/ext/build.rs4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/libsyntax/ext/build.rs b/src/libsyntax/ext/build.rs
index 58ea03ffcee..7be8742d1c2 100644
--- a/src/libsyntax/ext/build.rs
+++ b/src/libsyntax/ext/build.rs
@@ -299,7 +299,7 @@ impl AstBuilder for @ExtCtxt {
             self.path_all(dummy_sp(),
                           true,
                           ~[
-                              self.ident_of("core"),
+                              self.ident_of("std"),
                               self.ident_of("option"),
                               self.ident_of("Option")
                           ],
@@ -537,7 +537,7 @@ impl AstBuilder for @ExtCtxt {
         self.expr_call_global(
             span,
             ~[
-                self.ident_of("core"),
+                self.ident_of("std"),
                 self.ident_of("sys"),
                 self.ident_of("FailWithCause"),
                 self.ident_of("fail_with"),