about summary refs log tree commit diff
path: root/src/liballoc
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2018-03-20 10:18:34 +0000
committerbors <bors@rust-lang.org>2018-03-20 10:18:34 +0000
commit75af15ee6ca0c12b699a17984b033363cd25e9c3 (patch)
tree02642ba3cf3431e3bfd86a75287965ffa6603048 /src/liballoc
parentb99172311c640c33f70676df7f75a899a999711c (diff)
parent57b821112eccebaa2a00bfa1193da55f5b677dc5 (diff)
downloadrust-75af15ee6ca0c12b699a17984b033363cd25e9c3.tar.gz
rust-75af15ee6ca0c12b699a17984b033363cd25e9c3.zip
Auto merge of #49190 - kennytm:rollup, r=kennytm
Rollup of 17 pull requests

- Successful merges: #46518, #48810, #48834, #48902, #49004, #49092, #49096, #49099, #49104, #49125, #49139, #49152, #49157, #49161, #49166, #49176, #49184
- Failed merges:
Diffstat (limited to 'src/liballoc')
-rw-r--r--src/liballoc/fmt.rs2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/liballoc/fmt.rs b/src/liballoc/fmt.rs
index 2c4cdef03b0..90043e1c716 100644
--- a/src/liballoc/fmt.rs
+++ b/src/liballoc/fmt.rs
@@ -114,7 +114,7 @@
 //! * *nothing* ⇒ [`Display`]
 //! * `?` ⇒ [`Debug`]
 //! * `x?` ⇒ [`Debug`] with lower-case hexadecimal integers
-//! * `X?` ⇒ [`Debug`] with lower-case hexadecimal integers
+//! * `X?` ⇒ [`Debug`] with upper-case hexadecimal integers
 //! * `o` ⇒ [`Octal`](trait.Octal.html)
 //! * `x` ⇒ [`LowerHex`](trait.LowerHex.html)
 //! * `X` ⇒ [`UpperHex`](trait.UpperHex.html)