bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Auto merge of #51082 - kennytm:rollup, r=kennytm

Browse source 
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:
This commit is contained in:
bors 2018-05-26 12:03:28 +00:00
commit 7a0e6a837f
31 changed files with 514 additions and 297 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/liballoc/fmt.rs
View file

@ -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`.