libsyntax: Fix more merge fallout.

src/libextra/flate.rs

@@ -14,6 +14,8 @@ Simple compression
 
 */
 
+use core::prelude::*;
+
 use core::libc::{c_void, size_t, c_int};
 use core::libc;
 use core::vec;

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"),

src/libuv

@@ -1 +1 @@
-Subproject commit 218ab86721eefd7b7e97fa6d9f95a80a1fa8686c
+Subproject commit dfae9c3e958dc086d9c0ab068cd76d196c95a433

src/test/run-pass/core-rt-smoke.rs

@@ -14,7 +14,7 @@
 
 #[start]
 fn start(argc: int, argv: **u8, crate_map: *u8) -> int {
-    do core::rt::start(argc, argv, crate_map) {
+    do std::rt::start(argc, argv, crate_map) {
         debug!("creating my own runtime is joy");
     }
-}
+}