about summary refs log tree commit diff
path: root/src/liballoc
diff options
context:
space:
mode:
authorMartin Lindhe <martin-commit@ubique.se>2017-11-21 15:33:45 +0100
committerMartin Lindhe <martin-commit@ubique.se>2017-11-21 15:33:45 +0100
commitece9a57d1b6e10ef2ad1dffd19fd6033cdc760ee (patch)
tree9c6d182d6229e4c1fd08fc5064a17e63bad89d89 /src/liballoc
parentebda7662dbb79ab0a9feb79d367d0818c23ff1dc (diff)
downloadrust-ece9a57d1b6e10ef2ad1dffd19fd6033cdc760ee.tar.gz
rust-ece9a57d1b6e10ef2ad1dffd19fd6033cdc760ee.zip
fix some typos
Diffstat (limited to 'src/liballoc')
-rw-r--r--src/liballoc/fmt.rs2
-rw-r--r--src/liballoc/macros.rs2
-rw-r--r--src/liballoc/rc.rs2
-rw-r--r--src/liballoc/string.rs2
-rw-r--r--src/liballoc/tests/str.rs6
-rw-r--r--src/liballoc/vec.rs2
6 files changed, 8 insertions, 8 deletions
diff --git a/src/liballoc/fmt.rs b/src/liballoc/fmt.rs
index 77f65412bd3..7148a1143fd 100644
--- a/src/liballoc/fmt.rs
+++ b/src/liballoc/fmt.rs
@@ -536,7 +536,7 @@ use string;
 /// assert_eq!(s, "Hello, world!");
 /// ```
 ///
-/// Please note that using [`format!`] might be preferrable.
+/// Please note that using [`format!`] might be preferable.
 /// Example:
 ///
 /// ```
diff --git a/src/liballoc/macros.rs b/src/liballoc/macros.rs
index c2a3019515f..472eef77d79 100644
--- a/src/liballoc/macros.rs
+++ b/src/liballoc/macros.rs
@@ -72,7 +72,7 @@ macro_rules! vec {
 
 /// Creates a `String` using interpolation of runtime expressions.
 ///
-/// The first argument `format!` recieves is a format string.  This must be a string
+/// The first argument `format!` receives is a format string.  This must be a string
 /// literal.  The power of the formatting string is in the `{}`s contained.
 ///
 /// Additional parameters passed to `format!` replace the `{}`s within the
diff --git a/src/liballoc/rc.rs b/src/liballoc/rc.rs
index 72b9fa0eb47..58f08fd8bc1 100644
--- a/src/liballoc/rc.rs
+++ b/src/liballoc/rc.rs
@@ -346,7 +346,7 @@ impl<T> Rc<T> {
             unsafe {
                 let val = ptr::read(&*this); // copy the contained object
 
-                // Indicate to Weaks that they can't be promoted by decrememting
+                // Indicate to Weaks that they can't be promoted by decrementing
                 // the strong count, and then remove the implicit "strong weak"
                 // pointer while also handling drop logic by just crafting a
                 // fake Weak.
diff --git a/src/liballoc/string.rs b/src/liballoc/string.rs
index 25fcc1ccdab..cd0f4a22e9c 100644
--- a/src/liballoc/string.rs
+++ b/src/liballoc/string.rs
@@ -596,7 +596,7 @@ impl String {
     /// Decode a UTF-16 encoded vector `v` into a `String`, returning [`Err`]
     /// if `v` contains any invalid data.
     ///
-    /// [`Err`]: ../../std/result/enum.Result.htlm#variant.Err
+    /// [`Err`]: ../../std/result/enum.Result.html#variant.Err
     ///
     /// # Examples
     ///
diff --git a/src/liballoc/tests/str.rs b/src/liballoc/tests/str.rs
index 6b075e7ac0e..a14a5d32738 100644
--- a/src/liballoc/tests/str.rs
+++ b/src/liballoc/tests/str.rs
@@ -1427,12 +1427,12 @@ mod pattern {
         Reject(6, 7),
         Match (7, 7),
     ]);
-    make_test!(str_searcher_mulibyte_haystack, " ", "├──", [
+    make_test!(str_searcher_multibyte_haystack, " ", "├──", [
         Reject(0, 3),
         Reject(3, 6),
         Reject(6, 9),
     ]);
-    make_test!(str_searcher_empty_needle_mulibyte_haystack, "", "├──", [
+    make_test!(str_searcher_empty_needle_multibyte_haystack, "", "├──", [
         Match (0, 0),
         Reject(0, 3),
         Match (3, 3),
@@ -1455,7 +1455,7 @@ mod pattern {
         Match (5, 6),
         Reject(6, 7),
     ]);
-    make_test!(char_searcher_mulibyte_haystack, ' ', "├──", [
+    make_test!(char_searcher_multibyte_haystack, ' ', "├──", [
         Reject(0, 3),
         Reject(3, 6),
         Reject(6, 9),
diff --git a/src/liballoc/vec.rs b/src/liballoc/vec.rs
index 5aca199cf40..c29449a241e 100644
--- a/src/liballoc/vec.rs
+++ b/src/liballoc/vec.rs
@@ -1089,7 +1089,7 @@ impl<T> Vec<T> {
         // Memory safety
         //
         // When the Drain is first created, it shortens the length of
-        // the source vector to make sure no uninitalized or moved-from elements
+        // the source vector to make sure no uninitialized or moved-from elements
         // are accessible at all if the Drain's destructor never gets to run.
         //
         // Drain will ptr::read out the values to remove.