Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/librustc/middle/trans/base.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
7 changes: 7 additions & 0 deletions src/libstd/std.rs
Original file line number Diff line number Diff line change
@@ -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;
}
Loading