diff options
Diffstat (limited to 'src/libstd')
| -rw-r--r-- | src/libstd/logging.rs | 9 | ||||
| -rw-r--r-- | src/libstd/rt/crate_map.rs | 12 | ||||
| -rw-r--r-- | src/libstd/sys.rs | 29 |
3 files changed, 0 insertions, 50 deletions
diff --git a/src/libstd/logging.rs b/src/libstd/logging.rs index 342d0828f82..27a2af95a2a 100644 --- a/src/libstd/logging.rs +++ b/src/libstd/logging.rs @@ -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; diff --git a/src/libstd/rt/crate_map.rs b/src/libstd/rt/crate_map.rs index 94d37f67ba1..e7876cf6571 100644 --- a/src/libstd/rt/crate_map.rs +++ b/src/libstd/rt/crate_map.rs @@ -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, diff --git a/src/libstd/sys.rs b/src/libstd/sys.rs index c38f3525867..66ec0ae3417 100644 --- a/src/libstd/sys.rs +++ b/src/libstd/sys.rs @@ -125,36 +125,7 @@ impl FailWithCause for &'static str { } } -// 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; |
