Skip to content

Commit d1e74a3

Browse files
committed
Use vec![x; n] instead of iter::repeat(x).take(n).collect()
1 parent b1ca390 commit d1e74a3

File tree

2 files changed

+3
-9
lines changed

2 files changed

+3
-9
lines changed

src/librustc/mir/interpret/mod.rs

+2-4
Original file line numberDiff line numberDiff line change
@@ -295,12 +295,10 @@ impl AllocDecodingState {
295295
}
296296

297297
pub fn new(data_offsets: Vec<u32>) -> AllocDecodingState {
298-
let decoding_state: Vec<_> = ::std::iter::repeat(Mutex::new(State::Empty))
299-
.take(data_offsets.len())
300-
.collect();
298+
let decoding_state = vec![Mutex::new(State::Empty); data_offsets.len()];
301299

302300
AllocDecodingState {
303-
decoding_state: decoding_state,
301+
decoding_state,
304302
data_offsets,
305303
}
306304
}

src/librustc/traits/error_reporting.rs

+1-5
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@ use hir::def_id::DefId;
3434
use infer::{self, InferCtxt};
3535
use infer::type_variable::TypeVariableOrigin;
3636
use std::fmt;
37-
use std::iter;
3837
use syntax::ast;
3938
use session::DiagnosticMessageId;
4039
use ty::{self, AdtKind, ToPredicate, ToPolyTraitRef, Ty, TyCtxt, TypeFoldable};
@@ -1095,10 +1094,7 @@ impl<'a, 'gcx, 'tcx> InferCtxt<'a, 'gcx, 'tcx> {
10951094
// found arguments is empty (assume the user just wants to ignore args in this case).
10961095
// For example, if `expected_args_length` is 2, suggest `|_, _|`.
10971096
if found_args.is_empty() && is_closure {
1098-
let underscores = iter::repeat("_")
1099-
.take(expected_args.len())
1100-
.collect::<Vec<_>>()
1101-
.join(", ");
1097+
let underscores = vec!["_"; expected_args.len()].join(", ");
11021098
err.span_suggestion_with_applicability(
11031099
found_span,
11041100
&format!(

0 commit comments

Comments
 (0)