Skip to content

Commit 3a14911

Browse files
committed
Auto merge of #12469 - pavedroad:master, r=y21
chore: fix some typos 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] - \[ ] Added passing UI tests (including committed `.stderr` file) - \[ ] `cargo test` passes locally - \[ ] Executed `cargo dev update_lints` - \[ ] 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:
2 parents a8a7371 + f472b50 commit 3a14911

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

clippy_lints/src/methods/mod.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -2848,7 +2848,7 @@ declare_clippy_lint! {
28482848
/// the file is created from scratch, or ensure `truncate` is
28492849
/// called so that the truncation behaviour is explicit. `truncate(true)`
28502850
/// will ensure the file is entirely overwritten with new data, whereas
2851-
/// `truncate(false)` will explicitely keep the default behavior.
2851+
/// `truncate(false)` will explicitly keep the default behavior.
28522852
///
28532853
/// ### Example
28542854
/// ```rust,no_run

clippy_lints/src/wildcard_imports.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -213,7 +213,7 @@ fn is_super_only_import(segments: &[PathSegment<'_>]) -> bool {
213213
// Allow skipping imports containing user configured segments,
214214
// i.e. "...::utils::...::*" if user put `allowed-wildcard-imports = ["utils"]` in `Clippy.toml`
215215
fn is_allowed_via_config(segments: &[PathSegment<'_>], allowed_segments: &FxHashSet<String>) -> bool {
216-
// segment matching need to be exact instead of using 'contains', in case user unintentionaly put
216+
// segment matching need to be exact instead of using 'contains', in case user unintentionally put
217217
// a single character in the config thus skipping most of the warnings.
218218
segments.iter().any(|seg| allowed_segments.contains(seg.ident.as_str()))
219219
}

0 commit comments

Comments
 (0)