diff options
| author | bors <bors@rust-lang.org> | 2024-05-19 21:30:43 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2024-05-19 21:30:43 +0000 |
| commit | 298f38c06e0cd55feca7739e08cfefeb90c5a12b (patch) | |
| tree | 8845c2f74db6f0805c7692a2a5c8434142ac00b6 | |
| parent | 23e8b03f00289643c790bfb618509944f13d6432 (diff) | |
| parent | 647f222885545f6cd41faec587e59d25d31fa8aa (diff) | |
| download | rust-298f38c06e0cd55feca7739e08cfefeb90c5a12b.tar.gz rust-298f38c06e0cd55feca7739e08cfefeb90c5a12b.zip | |
Auto merge of #125294 - matthiaskrgr:rollup-w42c829, r=matthiaskrgr
Rollup of 4 pull requests Successful merges: - #124948 (chore: Remove repeated words (extension of #124924)) - #124992 (Add example to IsTerminal::is_terminal) - #125279 (make `Debug` impl for `Term` simpler) - #125286 (Miri subtree update) r? `@ghost` `@rustbot` modify labels: rollup
| -rw-r--r-- | clippy_lints/src/methods/needless_collect.rs | 2 | ||||
| -rw-r--r-- | tests/ui/ptr_arg.rs | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/clippy_lints/src/methods/needless_collect.rs b/clippy_lints/src/methods/needless_collect.rs index 1c695655536..f26f164fa54 100644 --- a/clippy_lints/src/methods/needless_collect.rs +++ b/clippy_lints/src/methods/needless_collect.rs @@ -127,7 +127,7 @@ pub(super) fn check<'tcx>( } } -/// checks for for collecting into a (generic) method or function argument +/// checks for collecting into a (generic) method or function argument /// taking an `IntoIterator` fn check_collect_into_intoiterator<'tcx>( cx: &LateContext<'tcx>, diff --git a/tests/ui/ptr_arg.rs b/tests/ui/ptr_arg.rs index fcd716f4144..5d6e488972c 100644 --- a/tests/ui/ptr_arg.rs +++ b/tests/ui/ptr_arg.rs @@ -282,7 +282,7 @@ mod issue_9218 { todo!() } - // These two's return types don't use use 'a so it's not okay + // These two's return types don't use 'a so it's not okay fn cow_bad_ret_ty_1<'a>(input: &'a Cow<'a, str>) -> &'static str { //~^ ERROR: using a reference to `Cow` is not recommended todo!() |