about summary refs log tree commit diff
path: root/src/libcore
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2020-05-24 18:40:28 +0000
committerbors <bors@rust-lang.org>2020-05-24 18:40:28 +0000
commit46e85b4328fe18492894093c1092dfe509df4370 (patch)
treed5cac7ea345302d9a89e0531f20a0ddc2ec1c798 /src/libcore
parentff991d60349201a90ca15202dd0323ebdfab8745 (diff)
parent134a165b6c55bd16a0431749da12c3e75477cf63 (diff)
downloadrust-46e85b4328fe18492894093c1092dfe509df4370.tar.gz
rust-46e85b4328fe18492894093c1092dfe509df4370.zip
Auto merge of #72539 - RalfJung:rollup-8yfidi8, r=RalfJung
Rollup of 5 pull requests

Successful merges:

 - #72402 (Remove all uses of `NodeId` in `ResolverOutputs`)
 - #72527 (bootstrap: propagate test-args to miri and clippy test suites)
 - #72530 (Clean up E0602 explanation)
 - #72532 (Use `dyn` trait syntax in more comments and docs)
 - #72535 (Use sort_unstable_by in its own docs)

Failed merges:

r? @ghost
Diffstat (limited to 'src/libcore')
-rw-r--r--src/libcore/raw.rs8
-rw-r--r--src/libcore/slice/mod.rs2
2 files changed, 5 insertions, 5 deletions
diff --git a/src/libcore/raw.rs b/src/libcore/raw.rs
index cb0fb8795e5..741a9dc8797 100644
--- a/src/libcore/raw.rs
+++ b/src/libcore/raw.rs
@@ -9,15 +9,15 @@
 //! Their definition should always match the ABI defined in
 //! `rustc_middle::ty::layout`.
 
-/// The representation of a trait object like `&SomeTrait`.
+/// The representation of a trait object like `&dyn SomeTrait`.
 ///
-/// This struct has the same layout as types like `&SomeTrait` and
+/// This struct has the same layout as types like `&dyn SomeTrait` and
 /// `Box<dyn AnotherTrait>`.
 ///
 /// `TraitObject` is guaranteed to match layouts, but it is not the
 /// type of trait objects (e.g., the fields are not directly accessible
-/// on a `&SomeTrait`) nor does it control that layout (changing the
-/// definition will not change the layout of a `&SomeTrait`). It is
+/// on a `&dyn SomeTrait`) nor does it control that layout (changing the
+/// definition will not change the layout of a `&dyn SomeTrait`). It is
 /// only designed to be used by unsafe code that needs to manipulate
 /// the low-level details.
 ///
diff --git a/src/libcore/slice/mod.rs b/src/libcore/slice/mod.rs
index b5ce165cb43..2361749f166 100644
--- a/src/libcore/slice/mod.rs
+++ b/src/libcore/slice/mod.rs
@@ -1654,7 +1654,7 @@ impl<T> [T] {
     ///
     /// ```
     /// let mut floats = [5f64, 4.0, 1.0, 3.0, 2.0];
-    /// floats.sort_by(|a, b| a.partial_cmp(b).unwrap());
+    /// floats.sort_unstable_by(|a, b| a.partial_cmp(b).unwrap());
     /// assert_eq!(floats, [1.0, 2.0, 3.0, 4.0, 5.0]);
     /// ```
     ///