Skip to content

Commit

Permalink
Use vec![x; n] instead of iter::repeat(x).take(n).collect()
Browse files Browse the repository at this point in the history
  • Loading branch information
ljedrz committed Oct 30, 2018
1 parent b1ca390 commit d1e74a3
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 9 deletions.
6 changes: 2 additions & 4 deletions src/librustc/mir/interpret/mod.rs
Expand Up @@ -295,12 +295,10 @@ impl AllocDecodingState {
}

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

AllocDecodingState {
decoding_state: decoding_state,
decoding_state,
data_offsets,
}
}
Expand Down
6 changes: 1 addition & 5 deletions src/librustc/traits/error_reporting.rs
Expand Up @@ -34,7 +34,6 @@ use hir::def_id::DefId;
use infer::{self, InferCtxt};
use infer::type_variable::TypeVariableOrigin;
use std::fmt;
use std::iter;
use syntax::ast;
use session::DiagnosticMessageId;
use ty::{self, AdtKind, ToPredicate, ToPolyTraitRef, Ty, TyCtxt, TypeFoldable};
Expand Down Expand Up @@ -1095,10 +1094,7 @@ impl<'a, 'gcx, 'tcx> InferCtxt<'a, 'gcx, 'tcx> {
// found arguments is empty (assume the user just wants to ignore args in this case).
// For example, if `expected_args_length` is 2, suggest `|_, _|`.
if found_args.is_empty() && is_closure {
let underscores = iter::repeat("_")
.take(expected_args.len())
.collect::<Vec<_>>()
.join(", ");
let underscores = vec!["_"; expected_args.len()].join(", ");
err.span_suggestion_with_applicability(
found_span,
&format!(
Expand Down

0 comments on commit d1e74a3

Please sign in to comment.