diff options
| author | Tamir Duberstein <tamird@gmail.com> | 2015-04-27 14:10:49 -0700 |
|---|---|---|
| committer | Tamir Duberstein <tamird@gmail.com> | 2015-04-28 17:23:45 -0700 |
| commit | 69abc12b0044d641e714bdd73a299cfa4136b7b8 (patch) | |
| tree | b434c9c4a9b8260632c8a6c20823c95a8f5a02e7 /src/libcore/fmt | |
| parent | 8871c17b76a1e0ab36ce2bb51008b53f596e5b3c (diff) | |
| download | rust-69abc12b0044d641e714bdd73a299cfa4136b7b8.tar.gz rust-69abc12b0044d641e714bdd73a299cfa4136b7b8.zip | |
Register new snapshots
Diffstat (limited to 'src/libcore/fmt')
| -rw-r--r-- | src/libcore/fmt/mod.rs | 18 | ||||
| -rw-r--r-- | src/libcore/fmt/rt/v1.rs | 25 |
2 files changed, 7 insertions, 36 deletions
diff --git a/src/libcore/fmt/mod.rs b/src/libcore/fmt/mod.rs index 0178b321e88..73778bfd038 100644 --- a/src/libcore/fmt/mod.rs +++ b/src/libcore/fmt/mod.rs @@ -34,8 +34,7 @@ mod num; mod float; mod builders; -#[cfg_attr(stage0, stable(feature = "rust1", since = "1.0.0"))] -#[cfg_attr(not(stage0), unstable(feature = "core", reason = "internal to format_args!"))] +#[unstable(feature = "core", reason = "internal to format_args!")] #[doc(hidden)] pub mod rt { pub mod v1; @@ -148,8 +147,7 @@ enum Void {} /// compile time it is ensured that the function and the value have the correct /// types, and then this struct is used to canonicalize arguments to one type. #[derive(Copy)] -#[cfg_attr(stage0, stable(feature = "rust1", since = "1.0.0"))] -#[cfg_attr(not(stage0), unstable(feature = "core", reason = "internal to format_args!"))] +#[unstable(feature = "core", reason = "internal to format_args!")] #[doc(hidden)] pub struct ArgumentV1<'a> { value: &'a Void, @@ -169,8 +167,7 @@ impl<'a> ArgumentV1<'a> { } #[doc(hidden)] - #[cfg_attr(stage0, stable(feature = "rust1", since = "1.0.0"))] - #[cfg_attr(not(stage0), unstable(feature = "core", reason = "internal to format_args!"))] + #[unstable(feature = "core", reason = "internal to format_args!")] pub fn new<'b, T>(x: &'b T, f: fn(&T, &mut Formatter) -> Result) -> ArgumentV1<'b> { unsafe { @@ -182,8 +179,7 @@ impl<'a> ArgumentV1<'a> { } #[doc(hidden)] - #[cfg_attr(stage0, stable(feature = "rust1", since = "1.0.0"))] - #[cfg_attr(not(stage0), unstable(feature = "core", reason = "internal to format_args!"))] + #[unstable(feature = "core", reason = "internal to format_args!")] pub fn from_usize(x: &usize) -> ArgumentV1 { ArgumentV1::new(x, ArgumentV1::show_usize) } @@ -206,8 +202,7 @@ impl<'a> Arguments<'a> { /// When using the format_args!() macro, this function is used to generate the /// Arguments structure. #[doc(hidden)] #[inline] - #[cfg_attr(stage0, stable(feature = "rust1", since = "1.0.0"))] - #[cfg_attr(not(stage0), unstable(feature = "core", reason = "internal to format_args!"))] + #[unstable(feature = "core", reason = "internal to format_args!")] pub fn new_v1(pieces: &'a [&'a str], args: &'a [ArgumentV1<'a>]) -> Arguments<'a> { Arguments { @@ -224,8 +219,7 @@ impl<'a> Arguments<'a> { /// created with `argumentusize`. However, failing to do so doesn't cause /// unsafety, but will ignore invalid . #[doc(hidden)] #[inline] - #[cfg_attr(stage0, stable(feature = "rust1", since = "1.0.0"))] - #[cfg_attr(not(stage0), unstable(feature = "core", reason = "internal to format_args!"))] + #[unstable(feature = "core", reason = "internal to format_args!")] pub fn new_v1_formatted(pieces: &'a [&'a str], args: &'a [ArgumentV1<'a>], fmt: &'a [rt::v1::Argument]) -> Arguments<'a> { diff --git a/src/libcore/fmt/rt/v1.rs b/src/libcore/fmt/rt/v1.rs index 0d851c1e897..2afd8abeb31 100644 --- a/src/libcore/fmt/rt/v1.rs +++ b/src/libcore/fmt/rt/v1.rs @@ -14,69 +14,46 @@ //! These definitions are similar to their `ct` equivalents, but differ in that //! these can be statically allocated and are slightly optimized for the runtime -#![cfg_attr(stage0, stable(feature = "rust1", since = "1.0.0"))] -#![cfg_attr(not(stage0), unstable(feature = "core", reason = "internal to format_args!"))] +#![unstable(feature = "core", reason = "internal to format_args!")] #[derive(Copy, Clone)] -#[cfg_attr(stage0, stable(feature = "rust1", since = "1.0.0"))] pub struct Argument { - #[cfg_attr(stage0, stable(feature = "rust1", since = "1.0.0"))] pub position: Position, - #[cfg_attr(stage0, stable(feature = "rust1", since = "1.0.0"))] pub format: FormatSpec, } #[derive(Copy, Clone)] -#[cfg_attr(stage0, stable(feature = "rust1", since = "1.0.0"))] pub struct FormatSpec { - #[cfg_attr(stage0, stable(feature = "rust1", since = "1.0.0"))] pub fill: char, - #[cfg_attr(stage0, stable(feature = "rust1", since = "1.0.0"))] pub align: Alignment, - #[cfg_attr(stage0, stable(feature = "rust1", since = "1.0.0"))] pub flags: u32, - #[cfg_attr(stage0, stable(feature = "rust1", since = "1.0.0"))] pub precision: Count, - #[cfg_attr(stage0, stable(feature = "rust1", since = "1.0.0"))] pub width: Count, } /// Possible alignments that can be requested as part of a formatting directive. #[derive(Copy, Clone, PartialEq)] -#[cfg_attr(stage0, stable(feature = "rust1", since = "1.0.0"))] pub enum Alignment { /// Indication that contents should be left-aligned. - #[cfg_attr(stage0, stable(feature = "rust1", since = "1.0.0"))] Left, /// Indication that contents should be right-aligned. - #[cfg_attr(stage0, stable(feature = "rust1", since = "1.0.0"))] Right, /// Indication that contents should be center-aligned. - #[cfg_attr(stage0, stable(feature = "rust1", since = "1.0.0"))] Center, /// No alignment was requested. - #[cfg_attr(stage0, stable(feature = "rust1", since = "1.0.0"))] Unknown, } #[derive(Copy, Clone)] -#[cfg_attr(stage0, stable(feature = "rust1", since = "1.0.0"))] pub enum Count { - #[cfg_attr(stage0, stable(feature = "rust1", since = "1.0.0"))] Is(usize), - #[cfg_attr(stage0, stable(feature = "rust1", since = "1.0.0"))] Param(usize), - #[cfg_attr(stage0, stable(feature = "rust1", since = "1.0.0"))] NextParam, - #[cfg_attr(stage0, stable(feature = "rust1", since = "1.0.0"))] Implied, } #[derive(Copy, Clone)] -#[cfg_attr(stage0, stable(feature = "rust1", since = "1.0.0"))] pub enum Position { - #[cfg_attr(stage0, stable(feature = "rust1", since = "1.0.0"))] Next, - #[cfg_attr(stage0, stable(feature = "rust1", since = "1.0.0"))] At(usize) } |
