bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Rollup merge of #22916 - rprichard:fmt-num-cleanup, r=alexcrichton

Browse source 
* Make num::UpperHex private.  I was unable to determine why this struct
   is public.  The num module itself is not public, and the UpperHex struct
   is not referenced anywhere in the core::fmt module.  (Only the UpperHex
   trait is reference.)  num::LowerHex is not public.

 * Remove the suffix parameters from the macros that generate integral
   display traits.

   The code to print the Debug::fmt suffixes was removed when Show was
   renamed to Debug.  It was an intentional change.  From RFC 0565:

    * Focus on the *runtime* aspects of a type; repeating information such
      as suffixes for integer literals is not generally useful since that
      data is readily available from the type definition.

 * Because Show was renamed to Debug, rename show! to debug!.
This commit is contained in:
Manish Goregaokar 2015-03-03 14:12:05 +05:30
commit 63a91c21d3
1 changed files with 9 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

21
src/libcore/fmt/num.rs
View file

@ -84,7 +84,7 @@ struct LowerHex;
/// A hexadecimal (base 16) radix, formatted with upper-case characters /// A hexadecimal (base 16) radix, formatted with upper-case characters
#[derive(Clone, PartialEq)] #[derive(Clone, PartialEq)]
pub struct UpperHex; struct UpperHex;
macro_rules! radix { macro_rules! radix {
($T:ident, $base:expr, $prefix:expr, $($x:pat => $conv:expr),+) => { ($T:ident, $base:expr, $prefix:expr, $($x:pat => $conv:expr),+) => {
@ -156,7 +156,7 @@ pub fn radix<T>(x: T, base: u8) -> RadixFmt<T, Radix> {
} }
macro_rules! radix_fmt { macro_rules! radix_fmt {
($T:ty as $U:ty, $fmt:ident, $S:expr) => { ($T:ty as $U:ty, $fmt:ident) => {
#[stable(feature = "rust1", since = "1.0.0")] #[stable(feature = "rust1", since = "1.0.0")]
impl fmt::Debug for RadixFmt<$T, Radix> { impl fmt::Debug for RadixFmt<$T, Radix> {
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
@ -182,8 +182,8 @@ macro_rules! int_base {
} }
} }
macro_rules! show { macro_rules! debug {
($T:ident with $S:expr) => { ($T:ident) => {
#[stable(feature = "rust1", since = "1.0.0")] #[stable(feature = "rust1", since = "1.0.0")]
impl fmt::Debug for $T { impl fmt::Debug for $T {
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
@ -194,27 +194,24 @@ macro_rules! show {
} }
macro_rules! integer { macro_rules! integer {
($Int:ident, $Uint:ident) => { ($Int:ident, $Uint:ident) => {
integer! { $Int, $Uint, stringify!($Int), stringify!($Uint) }
};
($Int:ident, $Uint:ident, $SI:expr, $SU:expr) => {
int_base! { Display for $Int as $Int -> Decimal } int_base! { Display for $Int as $Int -> Decimal }
int_base! { Binary for $Int as $Uint -> Binary } int_base! { Binary for $Int as $Uint -> Binary }
int_base! { Octal for $Int as $Uint -> Octal } int_base! { Octal for $Int as $Uint -> Octal }
int_base! { LowerHex for $Int as $Uint -> LowerHex } int_base! { LowerHex for $Int as $Uint -> LowerHex }
int_base! { UpperHex for $Int as $Uint -> UpperHex } int_base! { UpperHex for $Int as $Uint -> UpperHex }
radix_fmt! { $Int as $Int, fmt_int, $SI } radix_fmt! { $Int as $Int, fmt_int }
show! { $Int with $SI } debug! { $Int }
int_base! { Display for $Uint as $Uint -> Decimal } int_base! { Display for $Uint as $Uint -> Decimal }
int_base! { Binary for $Uint as $Uint -> Binary } int_base! { Binary for $Uint as $Uint -> Binary }
int_base! { Octal for $Uint as $Uint -> Octal } int_base! { Octal for $Uint as $Uint -> Octal }
int_base! { LowerHex for $Uint as $Uint -> LowerHex } int_base! { LowerHex for $Uint as $Uint -> LowerHex }
int_base! { UpperHex for $Uint as $Uint -> UpperHex } int_base! { UpperHex for $Uint as $Uint -> UpperHex }
radix_fmt! { $Uint as $Uint, fmt_int, $SU } radix_fmt! { $Uint as $Uint, fmt_int }
show! { $Uint with $SU } debug! { $Uint }
} }
} }
integer! { isize, usize, "i", "u" } integer! { isize, usize }
integer! { i8, u8 } integer! { i8, u8 }
integer! { i16, u16 } integer! { i16, u16 }
integer! { i32, u32 } integer! { i32, u32 }