about summary refs log tree commit diff
path: root/tests
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2022-07-13 14:48:32 +0000
committerbors <bors@rust-lang.org>2022-07-13 14:48:32 +0000
commit0db928078396da36c1d2a0601126b3d455750eb8 (patch)
tree58c6f8f36aa20c0f3538dc33c7688ac3004f2323 /tests
parent44be2d4b0e460e1ca7d9e337a7cb378a74aaa52e (diff)
parent0930ac91b9109e9ebc31ebe70620a2ec0fe08b57 (diff)
downloadrust-0db928078396da36c1d2a0601126b3d455750eb8.tar.gz
rust-0db928078396da36c1d2a0601126b3d455750eb8.zip
Auto merge of #9159 - alex-semenyuk:fix_typos, r=dswij
Fix typos

changelog: none
Diffstat (limited to 'tests')
-rw-r--r--tests/ui/if_let_mutex.rs2
-rw-r--r--tests/ui/inconsistent_struct_constructor.fixed2
-rw-r--r--tests/ui/inconsistent_struct_constructor.rs2
-rw-r--r--tests/ui/map_flatten_fixable.fixed2
-rw-r--r--tests/ui/map_flatten_fixable.rs2
-rw-r--r--tests/ui/map_flatten_fixable.stderr4
-rw-r--r--tests/ui/same_name_method.rs2
-rw-r--r--tests/ui/transmutes_expressible_as_ptr_casts.fixed2
-rw-r--r--tests/ui/transmutes_expressible_as_ptr_casts.rs2
-rw-r--r--tests/ui/wildcard_imports.fixed2
-rw-r--r--tests/ui/wildcard_imports.rs2
11 files changed, 12 insertions, 12 deletions
diff --git a/tests/ui/if_let_mutex.rs b/tests/ui/if_let_mutex.rs
index 58feae422a3..6cbfafbb38b 100644
--- a/tests/ui/if_let_mutex.rs
+++ b/tests/ui/if_let_mutex.rs
@@ -27,7 +27,7 @@ fn if_let_option() {
     };
 }
 
-// When mutexs are different don't warn
+// When mutexes are different don't warn
 fn if_let_different_mutex() {
     let m = Mutex::new(Some(0_u8));
     let other = Mutex::new(None::<u8>);
diff --git a/tests/ui/inconsistent_struct_constructor.fixed b/tests/ui/inconsistent_struct_constructor.fixed
index eb66d1afddc..74ba2f1c5e7 100644
--- a/tests/ui/inconsistent_struct_constructor.fixed
+++ b/tests/ui/inconsistent_struct_constructor.fixed
@@ -36,7 +36,7 @@ mod without_base {
         // issue #7069.
         new_foo!();
 
-        // Shoule NOT lint because the order is the same as in the definition.
+        // Should NOT lint because the order is the same as in the definition.
         Foo { x, y, z };
 
         // Should NOT lint because z is not a shorthand init.
diff --git a/tests/ui/inconsistent_struct_constructor.rs b/tests/ui/inconsistent_struct_constructor.rs
index 5caadc7c620..ba96e1e330f 100644
--- a/tests/ui/inconsistent_struct_constructor.rs
+++ b/tests/ui/inconsistent_struct_constructor.rs
@@ -36,7 +36,7 @@ mod without_base {
         // issue #7069.
         new_foo!();
 
-        // Shoule NOT lint because the order is the same as in the definition.
+        // Should NOT lint because the order is the same as in the definition.
         Foo { x, y, z };
 
         // Should NOT lint because z is not a shorthand init.
diff --git a/tests/ui/map_flatten_fixable.fixed b/tests/ui/map_flatten_fixable.fixed
index 9097a6b9967..312819a0a2c 100644
--- a/tests/ui/map_flatten_fixable.fixed
+++ b/tests/ui/map_flatten_fixable.fixed
@@ -58,7 +58,7 @@ fn issue8878() {
         .and_then(|_| {
 // we need some newlines
 // so that the span is big enough
-// for a splitted output of the diagnostic
+// for a split output of the diagnostic
             Some("")
  // whitespace beforehand is important as well
         });
diff --git a/tests/ui/map_flatten_fixable.rs b/tests/ui/map_flatten_fixable.rs
index 3916263404a..3fbf4f9a1b0 100644
--- a/tests/ui/map_flatten_fixable.rs
+++ b/tests/ui/map_flatten_fixable.rs
@@ -59,7 +59,7 @@ fn issue8878() {
         .map(|_| {
 // we need some newlines
 // so that the span is big enough
-// for a splitted output of the diagnostic
+// for a split output of the diagnostic
             Some("")
  // whitespace beforehand is important as well
         })
diff --git a/tests/ui/map_flatten_fixable.stderr b/tests/ui/map_flatten_fixable.stderr
index afaf6af66b2..c91f0b9ae94 100644
--- a/tests/ui/map_flatten_fixable.stderr
+++ b/tests/ui/map_flatten_fixable.stderr
@@ -78,7 +78,7 @@ LL |           .map(|_| {
    |  __________^
 LL | | // we need some newlines
 LL | | // so that the span is big enough
-LL | | // for a splitted output of the diagnostic
+LL | | // for a split output of the diagnostic
 ...  |
 LL | |         })
 LL | |         .flatten();
@@ -89,7 +89,7 @@ help: try replacing `map` with `and_then` and remove the `.flatten()`
 LL ~         .and_then(|_| {
 LL + // we need some newlines
 LL + // so that the span is big enough
-LL + // for a splitted output of the diagnostic
+LL + // for a split output of the diagnostic
 LL +             Some("")
 LL +  // whitespace beforehand is important as well
 LL ~         });
diff --git a/tests/ui/same_name_method.rs b/tests/ui/same_name_method.rs
index 9562b47f0c4..daef95a425c 100644
--- a/tests/ui/same_name_method.rs
+++ b/tests/ui/same_name_method.rs
@@ -62,7 +62,7 @@ mod should_lint {
         impl T1 for S {}
     }
 
-    mod mulitply_conflicit_trait {
+    mod multiply_conflicit_trait {
         use crate::{T1, T2};
 
         struct S;
diff --git a/tests/ui/transmutes_expressible_as_ptr_casts.fixed b/tests/ui/transmutes_expressible_as_ptr_casts.fixed
index b425cdd6cbf..539239fc18f 100644
--- a/tests/ui/transmutes_expressible_as_ptr_casts.fixed
+++ b/tests/ui/transmutes_expressible_as_ptr_casts.fixed
@@ -1,6 +1,6 @@
 // run-rustfix
 #![warn(clippy::transmutes_expressible_as_ptr_casts)]
-// These two warnings currrently cover the cases transmutes_expressible_as_ptr_casts
+// These two warnings currently cover the cases transmutes_expressible_as_ptr_casts
 // would otherwise be responsible for
 #![warn(clippy::useless_transmute)]
 #![warn(clippy::transmute_ptr_to_ptr)]
diff --git a/tests/ui/transmutes_expressible_as_ptr_casts.rs b/tests/ui/transmutes_expressible_as_ptr_casts.rs
index 8fd57c59652..b9e446dc89a 100644
--- a/tests/ui/transmutes_expressible_as_ptr_casts.rs
+++ b/tests/ui/transmutes_expressible_as_ptr_casts.rs
@@ -1,6 +1,6 @@
 // run-rustfix
 #![warn(clippy::transmutes_expressible_as_ptr_casts)]
-// These two warnings currrently cover the cases transmutes_expressible_as_ptr_casts
+// These two warnings currently cover the cases transmutes_expressible_as_ptr_casts
 // would otherwise be responsible for
 #![warn(clippy::useless_transmute)]
 #![warn(clippy::transmute_ptr_to_ptr)]
diff --git a/tests/ui/wildcard_imports.fixed b/tests/ui/wildcard_imports.fixed
index b6f47ae906b..ef55f1c31a8 100644
--- a/tests/ui/wildcard_imports.fixed
+++ b/tests/ui/wildcard_imports.fixed
@@ -199,7 +199,7 @@ mod super_imports {
         }
     }
 
-    mod should_be_replaced_futher_inside {
+    mod should_be_replaced_further_inside {
         fn insidefoo() {}
         mod inner {
             use super::insidefoo;
diff --git a/tests/ui/wildcard_imports.rs b/tests/ui/wildcard_imports.rs
index eb404b7a3de..b8128514206 100644
--- a/tests/ui/wildcard_imports.rs
+++ b/tests/ui/wildcard_imports.rs
@@ -200,7 +200,7 @@ mod super_imports {
         }
     }
 
-    mod should_be_replaced_futher_inside {
+    mod should_be_replaced_further_inside {
         fn insidefoo() {}
         mod inner {
             use super::*;