diff options
| author | bors <bors@rust-lang.org> | 2024-04-11 14:55:44 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2024-04-11 14:55:44 +0000 |
| commit | 7dca8152cf968fba6eab89e4f9af02b4958fb920 (patch) | |
| tree | 016b445d800faf536ce8d10034c6cd7dd7611501 | |
| parent | 46323751ade53f3048a42309d0a13252745b5294 (diff) | |
| parent | 8de0a1bdbd0d35640acaa4cf0d677b1cc7dcf50e (diff) | |
| download | rust-7dca8152cf968fba6eab89e4f9af02b4958fb920.tar.gz rust-7dca8152cf968fba6eab89e4f9af02b4958fb920.zip | |
Auto merge of #12660 - jqnatividad:fix-various-typos, r=Alexendoo
Fix various typos *Please write a short comment explaining your change (or "none" for internal only changes)* changelog: fix several typos
| -rw-r--r-- | clippy_lints/src/legacy_numeric_constants.rs | 2 | ||||
| -rw-r--r-- | clippy_lints/src/transmute/transmute_int_to_non_zero.rs | 4 | ||||
| -rw-r--r-- | clippy_utils/src/lib.rs | 2 | ||||
| -rw-r--r-- | tests/ui/unconditional_recursion.rs | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/clippy_lints/src/legacy_numeric_constants.rs b/clippy_lints/src/legacy_numeric_constants.rs index c5f1afe68c3..00124dcdd91 100644 --- a/clippy_lints/src/legacy_numeric_constants.rs +++ b/clippy_lints/src/legacy_numeric_constants.rs @@ -17,7 +17,7 @@ declare_clippy_lint! { /// `std::<float>::EPSILON`, etc. /// /// ### Why is this bad? - /// All of these have been superceded by the associated constants on their respective types, + /// All of these have been superseded by the associated constants on their respective types, /// such as `i128::MAX`. These legacy items may be deprecated in a future version of rust. /// /// ### Example diff --git a/clippy_lints/src/transmute/transmute_int_to_non_zero.rs b/clippy_lints/src/transmute/transmute_int_to_non_zero.rs index 234021f0f47..2bea3be3d60 100644 --- a/clippy_lints/src/transmute/transmute_int_to_non_zero.rs +++ b/clippy_lints/src/transmute/transmute_int_to_non_zero.rs @@ -27,7 +27,7 @@ pub(super) fn check<'tcx>( }; // FIXME: This can be simplified once `NonZero<T>` is stable. - let coercable_types = [ + let coercible_types = [ ("NonZeroU8", tcx.types.u8), ("NonZeroU16", tcx.types.u16), ("NonZeroU32", tcx.types.u32), @@ -44,7 +44,7 @@ pub(super) fn check<'tcx>( let int_type = substs.type_at(0); - let Some(nonzero_alias) = coercable_types.iter().find_map(|(nonzero_alias, t)| { + let Some(nonzero_alias) = coercible_types.iter().find_map(|(nonzero_alias, t)| { if *t == int_type && *t == from_ty { Some(nonzero_alias) } else { diff --git a/clippy_utils/src/lib.rs b/clippy_utils/src/lib.rs index 37c12dd850c..a13885b022f 100644 --- a/clippy_utils/src/lib.rs +++ b/clippy_utils/src/lib.rs @@ -3285,7 +3285,7 @@ fn maybe_get_relative_path(from: &DefPath, to: &DefPath, max_super: usize) -> St Right(r) => Right(r.data), }); - // 2. for the remaning segments, construct relative path using only mod names and `super` + // 2. for the remaining segments, construct relative path using only mod names and `super` let mut go_up_by = 0; let mut path = Vec::new(); for el in unique_parts { diff --git a/tests/ui/unconditional_recursion.rs b/tests/ui/unconditional_recursion.rs index 70b390b00e2..a51fc567f50 100644 --- a/tests/ui/unconditional_recursion.rs +++ b/tests/ui/unconditional_recursion.rs @@ -266,7 +266,7 @@ struct S13 { impl S13 { fn new() -> Self { - // Shoud not warn! + // Should not warn! Self::default() } } |
