Skip to content

Commit

Permalink
Auto merge of #12660 - jqnatividad:fix-various-typos, r=Alexendoo
Browse files Browse the repository at this point in the history
Fix various typos

*Please write a short comment explaining your change (or "none" for internal only changes)*

changelog: fix several typos
  • Loading branch information
bors committed Apr 11, 2024
2 parents 4632375 + 8de0a1b commit 7dca815
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion clippy_lints/src/legacy_numeric_constants.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions clippy_lints/src/transmute/transmute_int_to_non_zero.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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),
Expand All @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion clippy_utils/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion tests/ui/unconditional_recursion.rs
Original file line number Diff line number Diff line change
Expand Up @@ -266,7 +266,7 @@ struct S13 {

impl S13 {
fn new() -> Self {
// Shoud not warn!
// Should not warn!
Self::default()
}
}
Expand Down

0 comments on commit 7dca815

Please sign in to comment.