提交 46aaf512 编写于 作者: A Alex Crichton

Register new snapshots

上级 1434b4bf
......@@ -37,16 +37,7 @@ pub fn console_off() {
rt::logging::console_off();
}
#[cfg(stage0)]
#[doc(hidden)]
pub fn log(_level: u32, s: ~str) {
// this is a terrible approximation, but it gets the job done (for stage0 at
// least)
::io::println(s);
}
#[allow(missing_doc)]
#[cfg(not(stage0))]
pub fn log(_level: u32, args: &fmt::Arguments) {
use rt::task::Task;
use rt::local::Local;
......
......@@ -10,7 +10,6 @@
use libc::c_char;
#[cfg(stage0)] use libc::c_void;
use ptr;
use ptr::RawPtr;
use vec;
......@@ -40,17 +39,6 @@ struct CrateMapV0 {
children: [*CrateMap, ..1]
}
#[cfg(stage0)]
struct CrateMap {
version: i32,
annihilate_fn: *c_void,
entries: *ModEntry,
/// a dynamically sized struct, where all pointers to children are listed adjacent
/// to the struct, terminated with NULL
children: [*CrateMap, ..1]
}
#[cfg(not(stage0))]
struct CrateMap {
version: i32,
entries: *ModEntry,
......
......@@ -125,36 +125,7 @@ fn fail_with(cause: &'static str, file: &'static str, line: uint) -> ! {
}
}
// This stage0 version is incredibly wrong.
#[cfg(stage0)]
pub fn begin_unwind_(msg: *c_char, file: *c_char, line: size_t) -> ! {
use option::{Some, None};
use rt::in_green_task_context;
use rt::task::Task;
use rt::local::Local;
use rt::logging::Logger;
use str::Str;
unsafe {
let msg = str::raw::from_c_str(msg);
let file = str::raw::from_c_str(file);
if in_green_task_context() {
rterrln!("task failed at '%s', %s:%i", msg, file, line as int);
} else {
rterrln!("failed in non-task context at '%s', %s:%i",
msg, file, line as int);
}
let task: *mut Task = Local::unsafe_borrow();
if (*task).unwinder.unwinding {
rtabort!("unwinding again");
}
(*task).unwinder.begin_unwind();
}
}
// FIXME #4427: Temporary until rt::rt_fail_ goes away
#[cfg(not(stage0))]
pub fn begin_unwind_(msg: *c_char, file: *c_char, line: size_t) -> ! {
use rt::in_green_task_context;
use rt::task::Task;
......
S 2013-09-26 1434b4b
freebsd-x86_64 e0493c3b79e71487452dfb2155d6c972ca6c5822
linux-i386 9b38e3773c097656549a109b01589e057abf23a7
linux-x86_64 26c54870b6ea586c37435e319c8861f7f9539c82
macos-i386 ceb98f65e53668cde984160582ab2a47ed909c16
macos-x86_64 834efd21b948971dc0ddacd96972d1a354fdbbc3
winnt-i386 b2be7e7b15c0bfce01812787e69d277c9e5e5803
S 2013-09-23 348d844
freebsd-x86_64 8b99ec197e441f013c5ba0788f8bcfa689bfc75e
linux-i386 9a237fcbe4d29986a360b1dc8984da3b946463e6
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册