From 9d0d72345df8e9b2b27899f70f0d7b7222524948 Mon Sep 17 00:00:00 2001 From: Flavio Percoco Date: Wed, 25 Feb 2015 13:48:53 +0100 Subject: [PATCH] register snapshot 880fb89 --- src/libcore/fmt/mod.rs | 15 --------------- src/libcore/fmt/rt/v1.rs | 4 ---- src/libcore/macros.rs | 6 ------ src/libcore/panicking.rs | 29 ----------------------------- src/liblog/macros.rs | 7 ------- src/snapshots.txt | 9 +++++++++ 6 files changed, 9 insertions(+), 61 deletions(-) diff --git a/src/libcore/fmt/mod.rs b/src/libcore/fmt/mod.rs index 0bf44dd77aa..117b829fdff 100644 --- a/src/libcore/fmt/mod.rs +++ b/src/libcore/fmt/mod.rs @@ -110,10 +110,7 @@ pub trait Write { /// traits. #[stable(feature = "rust1", since = "1.0.0")] pub struct Formatter<'a> { - #[cfg(not(stage0))] flags: u32, - #[cfg(stage0)] - flags: usize, fill: char, align: rt::v1::Alignment, width: Option, @@ -159,13 +156,6 @@ impl<'a> ArgumentV1<'a> { } } - #[cfg(stage0)] - #[doc(hidden)] - #[stable(feature = "rust1", since = "1.0.0")] - pub fn from_uint(x: &uint) -> ArgumentV1 { - ArgumentV1::new(x, ArgumentV1::show_usize) - } - #[cfg(not(stage0))] #[doc(hidden)] #[stable(feature = "rust1", since = "1.0.0")] pub fn from_usize(x: &usize) -> ArgumentV1 { @@ -605,14 +595,9 @@ impl<'a> Formatter<'a> { write(self.buf, fmt) } - #[cfg(not(stage0))] /// Flags for formatting (packed version of rt::Flag) #[stable(feature = "rust1", since = "1.0.0")] pub fn flags(&self) -> u32 { self.flags } - #[cfg(stage0)] - /// Flags for formatting (packed version of rt::Flag) - #[stable(feature = "rust1", since = "1.0.0")] - pub fn flags(&self) -> usize { self.flags } /// Character used as 'fill' whenever there is alignment #[unstable(feature = "core", reason = "method was just created")] diff --git a/src/libcore/fmt/rt/v1.rs b/src/libcore/fmt/rt/v1.rs index c35611acb81..7f6dea905da 100644 --- a/src/libcore/fmt/rt/v1.rs +++ b/src/libcore/fmt/rt/v1.rs @@ -32,10 +32,6 @@ pub struct FormatSpec { pub fill: char, #[stable(feature = "rust1", since = "1.0.0")] pub align: Alignment, - #[cfg(stage0)] - #[stable(feature = "rust1", since = "1.0.0")] - pub flags: usize, - #[cfg(not(stage0))] #[stable(feature = "rust1", since = "1.0.0")] pub flags: u32, #[stable(feature = "rust1", since = "1.0.0")] diff --git a/src/libcore/macros.rs b/src/libcore/macros.rs index 92d50821592..94ca9ec37b4 100644 --- a/src/libcore/macros.rs +++ b/src/libcore/macros.rs @@ -15,9 +15,6 @@ macro_rules! panic { panic!("explicit panic") ); ($msg:expr) => ({ - #[cfg(stage0)] - static _MSG_FILE_LINE: (&'static str, &'static str, usize) = ($msg, file!(), line!()); - #[cfg(not(stage0))] static _MSG_FILE_LINE: (&'static str, &'static str, u32) = ($msg, file!(), line!()); ::core::panicking::panic(&_MSG_FILE_LINE) }); @@ -26,9 +23,6 @@ macro_rules! panic { // used inside a dead function. Just `#[allow(dead_code)]` is // insufficient, since the user may have // `#[forbid(dead_code)]` and which cannot be overridden. - #[cfg(stage0)] - static _FILE_LINE: (&'static str, usize) = (file!(), line!()); - #[cfg(not(stage0))] static _FILE_LINE: (&'static str, u32) = (file!(), line!()); ::core::panicking::panic_fmt(format_args!($fmt, $($arg)*), &_FILE_LINE) }); diff --git a/src/libcore/panicking.rs b/src/libcore/panicking.rs index 168dcf4978c..c1c8ac9cc1f 100644 --- a/src/libcore/panicking.rs +++ b/src/libcore/panicking.rs @@ -34,14 +34,6 @@ use fmt; #[cold] #[inline(never)] // this is the slow path, always #[lang="panic"] -#[cfg(stage0)] -pub fn panic(expr_file_line: &(&'static str, &'static str, usize)) -> ! { - let (expr, file, line) = *expr_file_line; - panic_fmt(format_args!("{}", expr), &(file, line)) -} -#[cold] #[inline(never)] // this is the slow path, always -#[lang="panic"] -#[cfg(not(stage0))] pub fn panic(expr_file_line: &(&'static str, &'static str, u32)) -> ! { let (expr, file, line) = *expr_file_line; panic_fmt(format_args!("{}", expr), &(file, line)) @@ -49,15 +41,6 @@ pub fn panic(expr_file_line: &(&'static str, &'static str, u32)) -> ! { #[cold] #[inline(never)] #[lang="panic_bounds_check"] -#[cfg(stage0)] -fn panic_bounds_check(file_line: &(&'static str, usize), - index: usize, len: usize) -> ! { - panic_fmt(format_args!("index out of bounds: the len is {} but the index is {}", - len, index), file_line) -} -#[cold] #[inline(never)] -#[lang="panic_bounds_check"] -#[cfg(not(stage0))] fn panic_bounds_check(file_line: &(&'static str, u32), index: usize, len: usize) -> ! { panic_fmt(format_args!("index out of bounds: the len is {} but the index is {}", @@ -65,18 +48,6 @@ fn panic_bounds_check(file_line: &(&'static str, u32), } #[cold] #[inline(never)] -#[cfg(stage0)] -pub fn panic_fmt(fmt: fmt::Arguments, file_line: &(&'static str, usize)) -> ! { - #[allow(improper_ctypes)] - extern { - #[lang = "panic_fmt"] - fn panic_impl(fmt: fmt::Arguments, file: &'static str, line: uint) -> !; - } - let (file, line) = *file_line; - unsafe { panic_impl(fmt, file, line as uint) } -} -#[cold] #[inline(never)] -#[cfg(not(stage0))] pub fn panic_fmt(fmt: fmt::Arguments, file_line: &(&'static str, u32)) -> ! { #[allow(improper_ctypes)] extern { diff --git a/src/liblog/macros.rs b/src/liblog/macros.rs index b1d292ebaa8..4a9a9bd4060 100644 --- a/src/liblog/macros.rs +++ b/src/liblog/macros.rs @@ -50,13 +50,6 @@ #[macro_export] macro_rules! log { ($lvl:expr, $($arg:tt)+) => ({ - #[cfg(stage0)] - static LOC: ::log::LogLocation = ::log::LogLocation { - line: line!() as u32, - file: file!(), - module_path: module_path!(), - }; - #[cfg(not(stage0))] static LOC: ::log::LogLocation = ::log::LogLocation { line: line!(), file: file!(), diff --git a/src/snapshots.txt b/src/snapshots.txt index 46a942b6eeb..318f66b9465 100644 --- a/src/snapshots.txt +++ b/src/snapshots.txt @@ -1,3 +1,12 @@ +S 2015-02-25 880fb89 + freebsd-x86_64 f4cbe4227739de986444211f8ee8d74745ab8f7f + linux-i386 3278ebbce8cb269acc0614dac5ddac07eab6a99c + linux-x86_64 72287d0d88de3e5a53bae78ac0d958e1a7637d73 + macos-i386 33b366b5287427a340a0aa6ed886d5ff4edf6a76 + macos-x86_64 914bf9baa32081a9d5633f1d06f4d382cd71504e + winnt-i386 d58b415b9d8629cb6c4952f1f6611a526a38323f + winnt-x86_64 2cb1dcc563d2ac6deada054de15748f5dd599c7e + S 2015-02-19 522d09d freebsd-x86_64 7ea14ef85a25bca70a310a2cd660b356cf61abc7 linux-i386 26e3caa1ce1c482b9941a6bdc64b3e65d036c200