summary refs log tree commit diff
path: root/src/liballoc
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2018-05-26 12:03:28 +0000
committerbors <bors@rust-lang.org>2018-05-26 12:03:28 +0000
commit7a0e6a837fd597bfc9b7765c53f1c62a12b57779 (patch)
tree3fea0488e6ce74f438c160e8c3aac1aad7380870 /src/liballoc
parentb4247d45a555ccdf567e5b70f929d35198841951 (diff)
parent84b2e14b9d00d6d50e87d113bdf819e9eb18b3c8 (diff)
downloadrust-7a0e6a837fd597bfc9b7765c53f1c62a12b57779.tar.gz
rust-7a0e6a837fd597bfc9b7765c53f1c62a12b57779.zip
Auto merge of #51082 - kennytm:rollup, r=kennytm
Rollup of 11 pull requests

Successful merges:

 - #50987 (Underline multiple suggested replacements in the same line)
 - #51014 (Add documentation about env! second argument)
 - #51034 (Remove unused lowering field and method)
 - #51047 (Use AllFacts from polonius-engine)
 - #51048 (Add more missing examples for Formatter)
 - #51056 (Mention and use `Once::new` instead of `ONCE_INIT`)
 - #51059 (What does an expression look like, that consists only of special characters?)
 - #51065 (Update nomicon link in transmute docs)
 - #51067 (Add inner links in documentation)
 - #51070 (Fail typecheck if we encounter a bogus break)
 - #51073 (Rename TokenStream::empty to TokenStream::new)

Failed merges:
Diffstat (limited to 'src/liballoc')
-rw-r--r--src/liballoc/fmt.rs6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/liballoc/fmt.rs b/src/liballoc/fmt.rs
index b2c4582e840..a4e5373d907 100644
--- a/src/liballoc/fmt.rs
+++ b/src/liballoc/fmt.rs
@@ -340,7 +340,8 @@
 //!
 //! ## Fill/Alignment
 //!
-//! The fill character is provided normally in conjunction with the `width`
+//! The fill character is provided normally in conjunction with the
+//! [`width`](#width)
 //! parameter. This indicates that if the value being formatted is smaller than
 //! `width` some extra characters will be printed around it. The extra
 //! characters are specified by `fill`, and the alignment can be one of the
@@ -388,7 +389,8 @@
 //! padding specified by fill/alignment will be used to take up the required
 //! space.
 //!
-//! The default fill/alignment for non-numerics is a space and left-aligned. The
+//! The default [fill/alignment](#fillalignment) for non-numerics is a space and
+//! left-aligned. The
 //! defaults for numeric formatters is also a space but with right-alignment. If
 //! the `0` flag is specified for numerics, then the implicit fill character is
 //! `0`.