---

erickt · erickt · commit 10e4bd7702ef · 2012-11-26T22:22:22.000-08:00
yaml --- r: 33835 b: refs/heads/snap-stage3 c: cd6300e h: refs/heads/master i: 33833: 6b19884 33831: c73a84a v: v3
diff --git a/[refs] b/[refs]
@@ -1,7 +1,7 @@
 ---
 refs/heads/master: cd6f24f9d14ac90d167386a56e7a6ac1f0318195
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
-refs/heads/snap-stage3: a18f0d413c1acea7c94e7e89740f47716f8efc51
+refs/heads/snap-stage3: cd6300e938f24f9ae830cd984b83112af0b2ccdc
 refs/heads/try: d324a424d8f84b1eb049b12cf34182bda91b0024
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
diff --git a/branches/snap-stage3/src/librustc/middle/trans/base.rs b/branches/snap-stage3/src/librustc/middle/trans/base.rs
@@ -1643,7 +1643,7 @@ fn trans_fn(ccx: @crate_ctxt,
             impl_id: Option<ast::def_id>) {
     let do_time = ccx.sess.trans_stats();
     let start = if do_time { time::get_time() }
-                else { {sec: 0i64, nsec: 0i32} };
+                else { time::Timespec::new(0, 0) };
     debug!("trans_fn(ty_self=%?)", ty_self);
     let _icx = ccx.insn_ctxt("trans_fn");
     ccx.stats.n_fns += 1;
diff --git a/branches/snap-stage3/src/libstd/std.rs b/branches/snap-stage3/src/libstd/std.rs
@@ -0,0 +1,7 @@
+// A curious inner-module that's not exported that contains the binding
+// 'std' so that macro-expanded references to std::serialization and such
+// can be resolved within libcore.
+#[doc(hidden)] // FIXME #3538
+mod std {
+    pub use serialization;
+}
diff --git a/branches/snap-stage3/src/libstd/time.rs b/branches/snap-stage3/src/libstd/time.rs
