Skip to content

Commit b2a7371

Browse files
committed
Auto merge of rust-lang#12705 - forcedebug:master, r=Manishearth
chore: fix some typos in comments *Please write a short comment explaining your change (or "none" for internal only changes)* changelog: none
2 parents 7fcaa60 + d55e5b4 commit b2a7371

7 files changed

+7
-7
lines changed

clippy_lints/src/implied_bounds_in_impls.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ declare_clippy_lint! {
2424
///
2525
/// ### Limitations
2626
/// This lint does not check for implied bounds transitively. Meaning that
27-
/// it does't check for implied bounds from supertraits of supertraits
27+
/// it doesn't check for implied bounds from supertraits of supertraits
2828
/// (e.g. `trait A {} trait B: A {} trait C: B {}`, then having an `fn() -> impl A + C`)
2929
///
3030
/// ### Example

clippy_lints/src/methods/unused_enumerate_index.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ pub(super) fn check(cx: &LateContext<'_>, call_expr: &Expr<'_>, recv: &Expr<'_>,
7878
&& match_def_path(cx, enumerate_defid, &CORE_ITER_ENUMERATE_METHOD)
7979
{
8080
// Check if the tuple type was explicit. It may be the type system _needs_ the type of the element
81-
// that would be explicited in the closure.
81+
// that would be explicitly in the closure.
8282
let new_closure_param = match find_elem_explicit_type_span(closure.fn_decl) {
8383
// We have an explicit type. Get its snippet, that of the binding name, and do `binding: ty`.
8484
// Fallback to `..` if we fail getting either snippet.

clippy_lints/src/size_of_ref.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ declare_clippy_lint! {
2828
/// fn size(&self) -> usize {
2929
/// // Note that `&self` as an argument is a `&&Foo`: Because `self`
3030
/// // is already a reference, `&self` is a double-reference.
31-
/// // The return value of `size_of_val()` therefor is the
31+
/// // The return value of `size_of_val()` therefore is the
3232
/// // size of the reference-type, not the size of `self`.
3333
/// std::mem::size_of_val(&self)
3434
/// }

tests/ui/mistyped_literal_suffix.fixed

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ fn main() {
3232
// testing that the suggestion actually fits in its type
3333
let fail30 = 127_i8; // should be i8
3434
let fail31 = 240_u8; // should be u8
35-
let ok32 = 360_8; // doesnt fit in either, should be ignored
35+
let ok32 = 360_8; // doesn't fit in either, should be ignored
3636
let fail33 = 0x1234_i16;
3737
let fail34 = 0xABCD_u16;
3838
let ok35 = 0x12345_16;

tests/ui/mistyped_literal_suffix.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ fn main() {
3232
// testing that the suggestion actually fits in its type
3333
let fail30 = 127_8; // should be i8
3434
let fail31 = 240_8; // should be u8
35-
let ok32 = 360_8; // doesnt fit in either, should be ignored
35+
let ok32 = 360_8; // doesn't fit in either, should be ignored
3636
let fail33 = 0x1234_16;
3737
let fail34 = 0xABCD_16;
3838
let ok35 = 0x12345_16;

tests/ui/type_id_on_box_unfixable.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ where
1919
impl<T> NormalTrait for T {}
2020

2121
fn main() {
22-
// (currently we don't look deeper than one level into the supertrait hierachy, but we probably
22+
// (currently we don't look deeper than one level into the supertrait hierarchy, but we probably
2323
// could)
2424
let b: Box<dyn AnySubSubTrait> = Box::new(1);
2525
let _ = b.type_id();

util/gh-pages/script.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -415,7 +415,7 @@
415415
let terms = searchStr.split(" ");
416416
let docsLowerCase = lint.docs.toLowerCase();
417417
for (index = 0; index < terms.length; index++) {
418-
// This is more likely and will therefor be checked first
418+
// This is more likely and will therefore be checked first
419419
if (docsLowerCase.indexOf(terms[index]) !== -1) {
420420
continue;
421421
}

0 commit comments

Comments
 (0)