Skip to content

Commit 298f38c

Browse files
committed
Auto merge of rust-lang#125294 - matthiaskrgr:rollup-w42c829, r=matthiaskrgr
Rollup of 4 pull requests Successful merges: - rust-lang#124948 (chore: Remove repeated words (extension of rust-lang#124924)) - rust-lang#124992 (Add example to IsTerminal::is_terminal) - rust-lang#125279 (make `Debug` impl for `Term` simpler) - rust-lang#125286 (Miri subtree update) r? `@ghost` `@rustbot` modify labels: rollup
2 parents 23e8b03 + 647f222 commit 298f38c

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

clippy_lints/src/methods/needless_collect.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ pub(super) fn check<'tcx>(
127127
}
128128
}
129129

130-
/// checks for for collecting into a (generic) method or function argument
130+
/// checks for collecting into a (generic) method or function argument
131131
/// taking an `IntoIterator`
132132
fn check_collect_into_intoiterator<'tcx>(
133133
cx: &LateContext<'tcx>,

tests/ui/ptr_arg.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -282,7 +282,7 @@ mod issue_9218 {
282282
todo!()
283283
}
284284

285-
// These two's return types don't use use 'a so it's not okay
285+
// These two's return types don't use 'a so it's not okay
286286
fn cow_bad_ret_ty_1<'a>(input: &'a Cow<'a, str>) -> &'static str {
287287
//~^ ERROR: using a reference to `Cow` is not recommended
288288
todo!()

0 commit comments

Comments
 (0)