Merge remote-tracking branch 'erickt/time'

Conflicts:
	src/libstd/time.rs

Author: brson

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;

src/libstd/std.rc

@@ -96,6 +96,14 @@ mod unicode;
 pub mod test;
 pub mod serialization;
 
+// 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;
+}
+
 // Local Variables:
 // mode: rust;
 // fill-column: 78;