Skip to content

Commit

Permalink
Rollup merge of rust-lang#45042 - brennie:brennie/fmt-trait-summaries…
Browse files Browse the repository at this point in the history
…, r=steveklabnik

Update trait summaries for std::fmt

This patch is part of rust-lang#29355.

r? @steveklabnik
  • Loading branch information
kennytm authored Oct 8, 2017
2 parents 92a35d9 + 276bebe commit 4090e81
Showing 1 changed file with 8 additions and 8 deletions.
16 changes: 8 additions & 8 deletions src/libcore/fmt/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -427,7 +427,7 @@ impl<'a> Display for Arguments<'a> {
}
}

/// Format trait for the `?` character.
/// `?` formatting.
///
/// `Debug` should format the output in a programmer-facing, debugging context.
///
Expand Down Expand Up @@ -593,7 +593,7 @@ pub trait Display {
fn fmt(&self, f: &mut Formatter) -> Result;
}

/// Format trait for the `o` character.
/// `o` formatting.
///
/// The `Octal` trait should format its output as a number in base-8.
///
Expand Down Expand Up @@ -640,7 +640,7 @@ pub trait Octal {
fn fmt(&self, f: &mut Formatter) -> Result;
}

/// Format trait for the `b` character.
/// `b` formatting.
///
/// The `Binary` trait should format its output as a number in binary.
///
Expand Down Expand Up @@ -687,7 +687,7 @@ pub trait Binary {
fn fmt(&self, f: &mut Formatter) -> Result;
}

/// Format trait for the `x` character.
/// `x` formatting.
///
/// The `LowerHex` trait should format its output as a number in hexadecimal, with `a` through `f`
/// in lower case.
Expand Down Expand Up @@ -735,7 +735,7 @@ pub trait LowerHex {
fn fmt(&self, f: &mut Formatter) -> Result;
}

/// Format trait for the `X` character.
/// `X` formatting.
///
/// The `UpperHex` trait should format its output as a number in hexadecimal, with `A` through `F`
/// in upper case.
Expand Down Expand Up @@ -783,7 +783,7 @@ pub trait UpperHex {
fn fmt(&self, f: &mut Formatter) -> Result;
}

/// Format trait for the `p` character.
/// `p` formatting.
///
/// The `Pointer` trait should format its output as a memory location. This is commonly presented
/// as hexadecimal.
Expand Down Expand Up @@ -828,7 +828,7 @@ pub trait Pointer {
fn fmt(&self, f: &mut Formatter) -> Result;
}

/// Format trait for the `e` character.
/// `e` formatting.
///
/// The `LowerExp` trait should format its output in scientific notation with a lower-case `e`.
///
Expand Down Expand Up @@ -871,7 +871,7 @@ pub trait LowerExp {
fn fmt(&self, f: &mut Formatter) -> Result;
}

/// Format trait for the `E` character.
/// `E` formatting.
///
/// The `UpperExp` trait should format its output in scientific notation with an upper-case `E`.
///
Expand Down

0 comments on commit 4090e81

Please sign in to comment.