about summary refs log tree commit diff
path: root/src/liballoc
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2020-03-05 21:39:00 +0000
committerbors <bors@rust-lang.org>2020-03-05 21:39:00 +0000
commitb818ccc74c993d41286731f67ce1e2bc2a3f1918 (patch)
tree6743244ae1971d5aeab96ba3f6e27eb395787de4 /src/liballoc
parent96bb8b31c81dc2394317f2f083c3acf8087efea1 (diff)
parent80c843431d54a4afb7ec92ceaa37cf4faa0a0653 (diff)
downloadrust-b818ccc74c993d41286731f67ce1e2bc2a3f1918.tar.gz
rust-b818ccc74c993d41286731f67ce1e2bc2a3f1918.zip
Auto merge of #69746 - Dylan-DPC:rollup-wr6dvdk, r=Dylan-DPC
Rollup of 8 pull requests

Successful merges:

 - #69697 (Add explanation for E0380)
 - #69698 (Use associated constants of integer types)
 - #69711 (Update macros.rs: fix documentation typo.)
 - #69713 (more clippy cleanups)
 - #69728 (Make link to `std::str` active)
 - #69732 (Clean E0382 and E0384 explanations)
 - #69736 (even more clippy cleanups)
 - #69742 (Fixed a typo)

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 f5afea15d65..c95f79472fe 100644
--- a/src/liballoc/string.rs
+++ b/src/liballoc/string.rs
@@ -407,7 +407,7 @@ impl String {
     ///
     /// assert_eq!(s.capacity(), cap);
     ///
-    /// // ...but this may make the vector reallocate
+    /// // ...but this may make the string reallocate
     /// s.push('a');
     /// ```
     #[inline]