Skip to content

Commit 26ff471

Browse files
committed
Rollup merge of #26678 - bluss:doc-fmt, r=steveklabnik
fmt: Update docs and mention :#? pretty-printing Expose `:#?` well in the docs for fmt and Debug itself. Also update some out of date information and fix formatting in `std::fmt` docs.
2 parents 65b5c15 + 516941b commit 26ff471

File tree

2 files changed

+27
-23
lines changed

2 files changed

+27
-23
lines changed

src/libcollections/fmt.rs

Lines changed: 23 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -128,15 +128,15 @@
128128
//! This allows multiple actual types to be formatted via `{:x}` (like `i8` as
129129
//! well as `isize`). The current mapping of types to traits is:
130130
//!
131-
//! * *nothing* ⇒ `Display`
132-
//! * `?` ⇒ `Debug`
133-
//! * `o` ⇒ `Octal`
134-
//! * `x` ⇒ `LowerHex`
135-
//! * `X` ⇒ `UpperHex`
136-
//! * `p` ⇒ `Pointer`
137-
//! * `b` ⇒ `Binary`
138-
//! * `e` ⇒ `LowerExp`
139-
//! * `E` ⇒ `UpperExp`
131+
//! * *nothing* ⇒ [`Display`](trait.Display.html)
132+
//! * `?` ⇒ [`Debug`](trait.Debug.html)
133+
//! * `o` ⇒ [`Octal`](trait.Octal.html)
134+
//! * `x` ⇒ [`LowerHex`](trait.LowerHex.html)
135+
//! * `X` ⇒ [`UpperHex`](trait.UpperHex.html)
136+
//! * `p` ⇒ [`Pointer`](trait.Pointer.html)
137+
//! * `b` ⇒ [`Binary`](trait.Binary.html)
138+
//! * `e` ⇒ [`LowerExp`](trait.LowerExp.html)
139+
//! * `E` ⇒ [`UpperExp`](trait.UpperExp.html)
140140
//!
141141
//! What this means is that any type of argument which implements the
142142
//! `fmt::Binary` trait can then be formatted with `{:b}`. Implementations
@@ -367,11 +367,11 @@
367367
//! should always be printed.
368368
//! * '-' - Currently not used
369369
//! * '#' - This flag is indicates that the "alternate" form of printing should
370-
//! be used. For array slices, the alternate form omits the brackets.
371-
//! For the integer formatting traits, the alternate forms are:
370+
//! be used. The alternate forms are:
371+
//! * `#?` - pretty-print the `Debug` formatting
372372
//! * `#x` - precedes the argument with a "0x"
373373
//! * `#X` - precedes the argument with a "0x"
374-
//! * `#t` - precedes the argument with a "0b"
374+
//! * `#b` - precedes the argument with a "0b"
375375
//! * `#o` - precedes the argument with a "0o"
376376
//! * '0' - This is used to indicate for integer formats that the padding should
377377
//! both be done with a `0` character as well as be sign-aware. A format
@@ -408,19 +408,20 @@
408408
//!
409409
//! There are three possible ways to specify the desired `precision`:
410410
//!
411-
//! There are three possible ways to specify the desired `precision`:
412-
//! 1. An integer `.N`,
413-
//! 2. an integer followed by dollar sign `.N$`, or
414-
//! 3. an asterisk `.*`.
411+
//! 1. An integer `.N`:
412+
//!
413+
//! the integer `N` itself is the precision.
414+
//!
415+
//! 2. An integer followed by dollar sign `.N$`:
415416
//!
416-
//! The first specification, `.N`, means the integer `N` itself is the precision.
417+
//! use format *argument* `N` (which must be a `usize`) as the precision.
417418
//!
418-
//! The second, `.N$`, means use format *argument* `N` (which must be a `usize`) as the precision.
419+
//! 3. An asterisk `.*`:
419420
//!
420-
//! Finally, `.*` means that this `{...}` is associated with *two* format inputs rather than one:
421-
//! the first input holds the `usize` precision, and the second holds the value to print. Note
422-
//! that in this case, if one uses the format string `{<arg>:<spec>.*}`, then the `<arg>` part
423-
//! refers to the *value* to print, and the `precision` must come in the input preceding `<arg>`.
421+
//! `.*` means that this `{...}` is associated with *two* format inputs rather than one: the
422+
//! first input holds the `usize` precision, and the second holds the value to print. Note that
423+
//! in this case, if one uses the format string `{<arg>:<spec>.*}`, then the `<arg>` part refers
424+
//! to the *value* to print, and the `precision` must come in the input preceding `<arg>`.
424425
//!
425426
//! For example, these:
426427
//!

src/libcore/fmt/mod.rs

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -267,7 +267,7 @@ impl<'a> Display for Arguments<'a> {
267267
}
268268
}
269269

270-
/// Format trait for the `:?` format. Useful for debugging, all types
270+
/// Format trait for the `?` character. Useful for debugging, all types
271271
/// should implement this.
272272
///
273273
/// Generally speaking, you should just `derive` a `Debug` implementation.
@@ -312,6 +312,9 @@ impl<'a> Display for Arguments<'a> {
312312
/// There are a number of `debug_*` methods on `Formatter` to help you with manual
313313
/// implementations, such as [`debug_struct`][debug_struct].
314314
///
315+
/// `Debug` implementations using either `derive` or the debug builder API
316+
/// on `Formatter` support pretty printing using the alternate flag: `{:#?}`.
317+
///
315318
/// [debug_struct]: ../std/fmt/struct.Formatter.html#method.debug_struct
316319
#[stable(feature = "rust1", since = "1.0.0")]
317320
#[rustc_on_unimplemented = "`{Self}` cannot be formatted using `:?`; if it is \

0 commit comments

Comments
 (0)