diff options
| author | bors <bors@rust-lang.org> | 2023-10-06 20:51:40 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2023-10-06 20:51:40 +0000 |
| commit | 960754090acc9cdd2a5a57586f244c0fc712d26c (patch) | |
| tree | 36c6fa2b76f91cd9f32ee05e5edde4640b6c232a /src | |
| parent | 94bc9c737ea97d56f9b4076553ac37c05c1e3931 (diff) | |
| parent | 7f0cf8c0e41dd5df27edfa57d42399dbab634320 (diff) | |
| download | rust-960754090acc9cdd2a5a57586f244c0fc712d26c.tar.gz rust-960754090acc9cdd2a5a57586f244c0fc712d26c.zip | |
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
Diffstat (limited to 'src')
| -rw-r--r-- | src/tools/clippy/clippy_lints/src/attrs.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/tools/clippy/clippy_lints/src/attrs.rs b/src/tools/clippy/clippy_lints/src/attrs.rs index 0546807bac4..db01ddbde04 100644 --- a/src/tools/clippy/clippy_lints/src/attrs.rs +++ b/src/tools/clippy/clippy_lints/src/attrs.rs @@ -183,7 +183,7 @@ declare_clippy_lint! { declare_clippy_lint! { /// ### What it does - /// Checks for empty lines after documenation comments. + /// Checks for empty lines after documentation comments. /// /// ### Why is this bad? /// The documentation comment was most likely meant to be an inner attribute or regular comment. @@ -795,7 +795,7 @@ impl EarlyLintPass for EarlyAttributes { /// Check for empty lines after outer attributes. /// -/// Attributes and documenation comments are both considered outer attributes +/// Attributes and documentation comments are both considered outer attributes /// by the AST. However, the average user likely considers them to be different. /// Checking for empty lines after each of these attributes is split into two different /// lints but can share the same logic. |