Skip to content

Commit acfef3b

Browse files
committed
Auto merge of #116492 - matthiaskrgr:rollup-xzfhmq1, r=matthiaskrgr
Rollup of 7 pull requests Successful merges: - #114564 (Attempt to describe the intent behind the `From` trait further) - #116297 (add some docs to hooks/mod.rs) - #116423 (Fix typo in attrs.rs) - #116466 (`rustc_transmute` cleanups) - #116474 (Assorted small cleanups) - #116481 (Reuse existing `Some`s in `Option::(x)or`) - #116484 (Minor doc clarification in Once::call_once) r? `@ghost` `@rustbot` modify labels: rollup
2 parents 45c0f27 + 393e056 commit acfef3b

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

clippy_lints/src/attrs.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -183,7 +183,7 @@ declare_clippy_lint! {
183183

184184
declare_clippy_lint! {
185185
/// ### What it does
186-
/// Checks for empty lines after documenation comments.
186+
/// Checks for empty lines after documentation comments.
187187
///
188188
/// ### Why is this bad?
189189
/// The documentation comment was most likely meant to be an inner attribute or regular comment.
@@ -795,7 +795,7 @@ impl EarlyLintPass for EarlyAttributes {
795795

796796
/// Check for empty lines after outer attributes.
797797
///
798-
/// Attributes and documenation comments are both considered outer attributes
798+
/// Attributes and documentation comments are both considered outer attributes
799799
/// by the AST. However, the average user likely considers them to be different.
800800
/// Checking for empty lines after each of these attributes is split into two different
801801
/// lints but can share the same logic.

0 commit comments

Comments
 (0)