Skip to content

Commit a40958a

Browse files
committed
Auto merge of #11730 - cuishuang:master, r=dswij
Fix some typos changelog: none
2 parents 5852ca8 + 2030c58 commit a40958a

File tree

6 files changed

+8
-8
lines changed

6 files changed

+8
-8
lines changed

clippy_lints/src/attrs.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -409,7 +409,7 @@ declare_clippy_lint! {
409409
///
410410
/// ### Why is this bad?
411411
/// Misspelling `feature` as `features` can be sometimes hard to spot. It
412-
/// may cause conditional compilation not work quitely.
412+
/// may cause conditional compilation not work quietly.
413413
///
414414
/// ### Example
415415
/// ```no_run

clippy_lints/src/from_over_into.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -110,12 +110,12 @@ impl<'tcx> LateLintPass<'tcx> for FromOverInto {
110110
extract_msrv_attr!(LateContext);
111111
}
112112

113-
/// Finds the occurences of `Self` and `self`
113+
/// Finds the occurrences of `Self` and `self`
114114
struct SelfFinder<'a, 'tcx> {
115115
cx: &'a LateContext<'tcx>,
116-
/// Occurences of `Self`
116+
/// Occurrences of `Self`
117117
upper: Vec<Span>,
118-
/// Occurences of `self`
118+
/// Occurrences of `self`
119119
lower: Vec<Span>,
120120
/// If any of the `self`/`Self` usages were from an expansion, or the body contained a binding
121121
/// already named `val`

clippy_lints/src/matches/single_match.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ pub(crate) fn check(cx: &LateContext<'_>, ex: &Expr<'_>, arms: &[Arm<'_>], expr:
5151
// block with 2+ statements or 1 expr and 1+ statement
5252
Some(els)
5353
} else {
54-
// not a block or an emtpy block w/ comments, don't lint
54+
// not a block or an empty block w/ comments, don't lint
5555
return;
5656
};
5757

clippy_lints/src/reserve_after_initialization.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ declare_clippy_lint! {
2929
#[clippy::version = "1.73.0"]
3030
pub RESERVE_AFTER_INITIALIZATION,
3131
complexity,
32-
"`reserve` called immediatly after `Vec` creation"
32+
"`reserve` called immediately after `Vec` creation"
3333
}
3434
impl_lint_pass!(ReserveAfterInitialization => [RESERVE_AFTER_INITIALIZATION]);
3535

clippy_lints/src/unnecessary_map_on_constructor.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ use rustc_span::sym;
99

1010
declare_clippy_lint! {
1111
/// ### What it does
12-
/// Suggest removing the use of a may (or map_err) method when an Option or Result is being construted.
12+
/// Suggest removing the use of a may (or map_err) method when an Option or Result is being constructed.
1313
///
1414
/// ### Why is this bad?
1515
/// It introduces unnecessary complexity. In this case the function can be used directly and

clippy_lints/src/utils/internal_lints/almost_standard_lint_formulation.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ declare_clippy_lint! {
1111
/// Checks if lint formulations have a standardized format.
1212
///
1313
/// ### Why is this bad?
14-
/// It's not neccessarily bad, but we try to enforce a standard in Clippy.
14+
/// It's not necessarily bad, but we try to enforce a standard in Clippy.
1515
///
1616
/// ### Example
1717
/// `Checks for use...` can be written as `Checks for usage...` .

0 commit comments

Comments
 (0)