syntax: Change syntax extensions to expand to std::foo instead of core::foo

Author: pcwalton

src/libextra/std.rc

@@ -125,6 +125,12 @@ pub mod serialize;
 pub mod std {
     pub use serialize;
     pub use test;
+
+    // For bootstrapping.
+    pub use core::clone;
+    pub use core::condition;
+    pub use core::cmp;
+    pub use core::sys;
 }
 #[doc(hidden)] // FIXME #3538
 pub mod extra {

src/librustc/rustc.rc

@@ -29,7 +29,10 @@ extern mod extra(name = "extra");
 extern mod syntax;
 
 // For deriving(Encodable) purposes...
+#[cfg(stage0)]
 extern mod std(name = "extra", vers = "0.7-pre");
+#[cfg(not(stage0))]
+extern mod std(name = "std", vers = "0.7-pre");
 
 use core::prelude::*;
 

src/libstd/core.rc

@@ -225,4 +225,14 @@ mod core {
     pub use sys;
     pub use pipes;
 }
+#[doc(hidden)]
+mod std {
+    pub use clone;
+    pub use cmp;
+    pub use condition;
+    pub use option;
+    pub use kinds;
+    pub use sys;
+    pub use pipes;
+}
 

src/libsyntax/ext/deriving/clone.rs

@@ -22,7 +22,7 @@ pub fn expand_deriving_clone(cx: @ExtCtxt,
                              in_items: ~[@item])
                           -> ~[@item] {
     let trait_def = TraitDef {
-        path: Path::new(~["core", "clone", "Clone"]),
+        path: Path::new(~["std", "clone", "Clone"]),
         additional_bounds: ~[],
         generics: LifetimeBounds::empty(),
         methods: ~[
@@ -49,7 +49,7 @@ pub fn expand_deriving_deep_clone(cx: @ExtCtxt,
                                  in_items: ~[@item])
     -> ~[@item] {
     let trait_def = TraitDef {
-        path: Path::new(~["core", "clone", "DeepClone"]),
+        path: Path::new(~["std", "clone", "DeepClone"]),
         additional_bounds: ~[],
         generics: LifetimeBounds::empty(),
         methods: ~[

src/libsyntax/ext/deriving/cmp/eq.rs

@@ -46,7 +46,7 @@ pub fn expand_deriving_eq(cx: @ExtCtxt,
     );
 
     let trait_def = TraitDef {
-        path: Path::new(~["core", "cmp", "Eq"]),
+        path: Path::new(~["std", "cmp", "Eq"]),
         additional_bounds: ~[],
         generics: LifetimeBounds::empty(),
         methods: ~[

src/libsyntax/ext/deriving/cmp/ord.rs

@@ -38,9 +38,9 @@ pub fn expand_deriving_ord(cx: @ExtCtxt,
 
 
     let trait_def = TraitDef {
-        path: Path::new(~["core", "cmp", "Ord"]),
+        path: Path::new(~["std", "cmp", "Ord"]),
         // XXX: Ord doesn't imply Eq yet
-        additional_bounds: ~[Literal(Path::new(~["core", "cmp", "Eq"]))],
+        additional_bounds: ~[Literal(Path::new(~["std", "cmp", "Eq"]))],
         generics: LifetimeBounds::empty(),
         methods: ~[
             md!("lt", true,  false),

src/libsyntax/ext/deriving/cmp/totaleq.rs

@@ -27,7 +27,7 @@ pub fn expand_deriving_totaleq(cx: @ExtCtxt,
     }
 
     let trait_def = TraitDef {
-        path: Path::new(~["core", "cmp", "TotalEq"]),
+        path: Path::new(~["std", "cmp", "TotalEq"]),
         additional_bounds: ~[],
         generics: LifetimeBounds::empty(),
         methods: ~[

src/libsyntax/ext/deriving/cmp/totalord.rs

@@ -22,7 +22,7 @@ pub fn expand_deriving_totalord(cx: @ExtCtxt,
                                 mitem: @meta_item,
                                 in_items: ~[@item]) -> ~[@item] {
     let trait_def = TraitDef {
-        path: Path::new(~["core", "cmp", "TotalOrd"]),
+        path: Path::new(~["std", "cmp", "TotalOrd"]),
         additional_bounds: ~[],
         generics: LifetimeBounds::empty(),
         methods: ~[
@@ -31,7 +31,7 @@ pub fn expand_deriving_totalord(cx: @ExtCtxt,
                 generics: LifetimeBounds::empty(),
                 explicit_self: borrowed_explicit_self(),
                 args: ~[borrowed_self()],
-                ret_ty: Literal(Path::new(~["core", "cmp", "Ordering"])),
+                ret_ty: Literal(Path::new(~["std", "cmp", "Ordering"])),
                 const_nonmatching: false,
                 combine_substructure: cs_cmp
             }
@@ -51,7 +51,7 @@ pub fn ordering_const(cx: @ExtCtxt, span: span, cnst: Ordering) -> @expr {
     };
     cx.expr_path(
         cx.path_global(span,
-                       ~[cx.ident_of("core"),
+                       ~[cx.ident_of("std"),
                          cx.ident_of("cmp"),
                          cx.ident_of(cnst)]))
 }
@@ -64,7 +64,7 @@ pub fn cs_cmp(cx: @ExtCtxt, span: span,
         false,
         |cx, span, old, new| {
             cx.expr_call_global(span,
-                                ~[cx.ident_of("core"),
+                                ~[cx.ident_of("std"),
                                   cx.ident_of("cmp"),
                                   cx.ident_of("lexical_ordering")],
                                 ~[old, new])

src/libsyntax/ext/deriving/iter_bytes.rs

@@ -21,7 +21,7 @@ pub fn expand_deriving_iter_bytes(cx: @ExtCtxt,
                                   mitem: @meta_item,
                                   in_items: ~[@item]) -> ~[@item] {
     let trait_def = TraitDef {
-        path: Path::new(~["core", "to_bytes", "IterBytes"]),
+        path: Path::new(~["std", "to_bytes", "IterBytes"]),
         additional_bounds: ~[],
         generics: LifetimeBounds::empty(),
         methods: ~[
@@ -31,7 +31,7 @@ pub fn expand_deriving_iter_bytes(cx: @ExtCtxt,
                 explicit_self: borrowed_explicit_self(),
                 args: ~[
                     Literal(Path::new(~["bool"])),
-                    Literal(Path::new(~["core", "to_bytes", "Cb"]))
+                    Literal(Path::new(~["std", "to_bytes", "Cb"]))
                 ],
                 ret_ty: Literal(Path::new(~["bool"])),
                 const_nonmatching: false,

src/libsyntax/ext/deriving/mod.rs

@@ -13,7 +13,7 @@ The compiler code necessary to implement the #[deriving] extensions.
 
 
 FIXME (#2810)--Hygiene. Search for "__" strings (in other files too).
-We also assume "extra" is the standard library, and "core" is the core
+We also assume "extra" is the standard library, and "std" is the core
 library.
 
 */