about summary refs log tree commit diff
path: root/src/liballoc
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2018-12-10 21:42:20 +0000
committerbors <bors@rust-lang.org>2018-12-10 21:42:20 +0000
commitda1527cb06c7245f83ca51903ea2a27631820215 (patch)
tree70ec3fd00841fe2fa1ea298bd5f399ca5a98f602 /src/liballoc
parent1137d29d5e551e377579c5a601fe7c444057d00c (diff)
parenta11de4171c1712a0c42d05207f4f01fb49c40d0d (diff)
downloadrust-da1527cb06c7245f83ca51903ea2a27631820215.tar.gz
rust-da1527cb06c7245f83ca51903ea2a27631820215.zip
Auto merge of #56688 - GuillaumeGomez:rollup, r=GuillaumeGomez
Rollup of 5 pull requests

Successful merges:

 - #56491 (emit error with span for empty asserts)
 - #56633 (Fix right arrow size for crate filter)
 - #56641 (fix span for invalid number of parameters in trait method)
 - #56656 (Fix typo)
 - #56661 (Add regression test for ICE)

Failed merges:

r? @ghost
Diffstat (limited to 'src/liballoc')
-rw-r--r--src/liballoc/string.rs2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/liballoc/string.rs b/src/liballoc/string.rs
index 006c602649b..4652c0e7efa 100644
--- a/src/liballoc/string.rs
+++ b/src/liballoc/string.rs
@@ -2169,7 +2169,7 @@ impl<T: fmt::Display + ?Sized> ToString for T {
         use core::fmt::Write;
         let mut buf = String::new();
         buf.write_fmt(format_args!("{}", self))
-           .expect("a Display implementation return an error unexpectedly");
+           .expect("a Display implementation returned an error unexpectedly");
         buf.shrink_to_fit();
         buf
     }