Skip to content

Commit 7dca815

Browse files
committed
Auto merge of rust-lang#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
2 parents 4632375 + 8de0a1b commit 7dca815

File tree

4 files changed

+5
-5
lines changed

4 files changed

+5
-5
lines changed

clippy_lints/src/legacy_numeric_constants.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ declare_clippy_lint! {
1717
/// `std::<float>::EPSILON`, etc.
1818
///
1919
/// ### Why is this bad?
20-
/// All of these have been superceded by the associated constants on their respective types,
20+
/// All of these have been superseded by the associated constants on their respective types,
2121
/// such as `i128::MAX`. These legacy items may be deprecated in a future version of rust.
2222
///
2323
/// ### Example

clippy_lints/src/transmute/transmute_int_to_non_zero.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ pub(super) fn check<'tcx>(
2727
};
2828

2929
// FIXME: This can be simplified once `NonZero<T>` is stable.
30-
let coercable_types = [
30+
let coercible_types = [
3131
("NonZeroU8", tcx.types.u8),
3232
("NonZeroU16", tcx.types.u16),
3333
("NonZeroU32", tcx.types.u32),
@@ -44,7 +44,7 @@ pub(super) fn check<'tcx>(
4444

4545
let int_type = substs.type_at(0);
4646

47-
let Some(nonzero_alias) = coercable_types.iter().find_map(|(nonzero_alias, t)| {
47+
let Some(nonzero_alias) = coercible_types.iter().find_map(|(nonzero_alias, t)| {
4848
if *t == int_type && *t == from_ty {
4949
Some(nonzero_alias)
5050
} else {

clippy_utils/src/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3285,7 +3285,7 @@ fn maybe_get_relative_path(from: &DefPath, to: &DefPath, max_super: usize) -> St
32853285
Right(r) => Right(r.data),
32863286
});
32873287

3288-
// 2. for the remaning segments, construct relative path using only mod names and `super`
3288+
// 2. for the remaining segments, construct relative path using only mod names and `super`
32893289
let mut go_up_by = 0;
32903290
let mut path = Vec::new();
32913291
for el in unique_parts {

tests/ui/unconditional_recursion.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -266,7 +266,7 @@ struct S13 {
266266

267267
impl S13 {
268268
fn new() -> Self {
269-
// Shoud not warn!
269+
// Should not warn!
270270
Self::default()
271271
}
272272
}

0 commit comments

Comments
 (0)