---

yaml
---
r: 60642
b: refs/heads/auto
c: 3a66d73
h: refs/heads/master
v: v3

Author: pcwalton

[refs]

@@ -14,6 +14,6 @@ refs/heads/try3: 9387340aab40a73e8424c48fd42f0c521a4875c0
 refs/tags/release-0.3.1: 495bae036dfe5ec6ceafd3312b4dca48741e845b
 refs/tags/release-0.4: e828ea2080499553b97dfe33b3f4d472b4562ad7
 refs/tags/release-0.5: 7e3bcfbf21278251ee936ad53e92e9b719702d73
-refs/heads/auto: 18df18c817b5e109710c58f512a2cc5ad14fa8b2
+refs/heads/auto: 3a66d732bb3d4b90796d39a5bc58921cea955c60
 refs/heads/servo: af82457af293e2a842ba6b7759b70288da276167
 refs/tags/release-0.6: b4ebcfa1812664df5e142f0134a5faea3918544c

branches/auto/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;

branches/auto/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"),

branches/auto/src/libuv

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

branches/auto/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");
     }
-}
+}