Skip to content

Commit a45feda

Browse files
committed
Auto merge of rust-lang#11445 - cuishuang:master, r=Centri3
fix some comments Thank you for making Clippy better! We're collecting our changelog from pull request descriptions. If your PR only includes internal changes, you can just write `changelog: none`. Otherwise, please write a short comment explaining your change. It's also helpful for us that the lint name is put within backticks (`` ` ` ``), and then encapsulated by square brackets (`[]`), for example: ``` changelog: [`lint_name`]: your change ``` If your PR fixes an issue, you can add `fixes #issue_number` into this PR description. This way the issue will be automatically closed when your PR is merged. If you added a new lint, here's a checklist for things that will be checked during review or continuous integration. - \[x] Followed [lint naming conventions][lint_naming] - \[x] Added passing UI tests (including committed `.stderr` file) - \[x] `cargo test` passes locally - \[x] Executed `cargo dev update_lints` - \[x] Added lint documentation - \[x] Run `cargo dev fmt` [lint_naming]: https://rust-lang.github.io/rfcs/0344-conventions-galore.html#lints Note that you can skip the above if you are just opening a WIP PR in order to get feedback. Delete this line and everything above before opening your PR. --- *Please write a short comment explaining your change (or "none" for internal only changes)* changelog: none
2 parents 3cf1087 + b0eaa84 commit a45feda

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

clippy_utils/src/source.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -362,7 +362,7 @@ pub fn snippet_block_with_context<'a>(
362362
}
363363

364364
/// Same as `snippet_with_applicability`, but first walks the span up to the given context. This
365-
/// will result in the macro call, rather then the expansion, if the span is from a child context.
365+
/// will result in the macro call, rather than the expansion, if the span is from a child context.
366366
/// If the span is not from a child context, it will be used directly instead.
367367
///
368368
/// e.g. Given the expression `&vec![]`, getting a snippet from the span for `vec![]` as a HIR node

clippy_utils/src/sugg.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ impl<'a> Sugg<'a> {
8888
}
8989

9090
/// Same as `hir`, but first walks the span up to the given context. This will result in the
91-
/// macro call, rather then the expansion, if the span is from a child context. If the span is
91+
/// macro call, rather than the expansion, if the span is from a child context. If the span is
9292
/// not from a child context, it will be used directly instead.
9393
///
9494
/// e.g. Given the expression `&vec![]`, getting a snippet from the span for `vec![]` as a HIR

clippy_utils/src/ty/type_certainty/mod.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,7 @@ fn generic_args_certainty(cx: &LateContext<'_>, args: &GenericArgs<'_>) -> Certa
150150
}
151151

152152
/// Tries to tell whether a `QPath` resolves to something certain, e.g., whether all of its path
153-
/// segments generic arguments are are instantiated.
153+
/// segments generic arguments are instantiated.
154154
///
155155
/// `qpath` could refer to either a type or a value. The heuristic never needs the `DefId` of a
156156
/// value. So `DefId`s are retained only when `resolves_to_type` is true.

0 commit comments

Comments
 (0)