Skip to content

Commit 539866b

Browse files
committed
Replace map(|x| (*x).clone()) with cloned().
This resolves #22243, at least for one-letter variable names.
1 parent 1c7cb8b commit 539866b

File tree

10 files changed

+10
-12
lines changed

10 files changed

+10
-12
lines changed

src/libcollections/dlist.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1013,7 +1013,7 @@ mod tests {
10131013

10141014
#[cfg(test)]
10151015
fn list_from<T: Clone>(v: &[T]) -> DList<T> {
1016-
v.iter().map(|x| (*x).clone()).collect()
1016+
v.iter().cloned().collect()
10171017
}
10181018

10191019
#[test]

src/librustc/middle/resolve_lifetime.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -562,7 +562,7 @@ pub fn early_bound_lifetimes<'a>(generics: &'a ast::Generics) -> Vec<ast::Lifeti
562562

563563
generics.lifetimes.iter()
564564
.filter(|l| referenced_idents.iter().any(|&i| i == l.lifetime.name))
565-
.map(|l| (*l).clone())
565+
.cloned()
566566
.collect()
567567
}
568568

src/librustc/middle/traits/select.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -738,7 +738,7 @@ impl<'cx, 'tcx> SelectionContext<'cx, 'tcx> {
738738
{
739739
let cache = self.pick_candidate_cache();
740740
let hashmap = cache.hashmap.borrow();
741-
hashmap.get(&cache_fresh_trait_pred.0.trait_ref).map(|c| (*c).clone())
741+
hashmap.get(&cache_fresh_trait_pred.0.trait_ref).cloned()
742742
}
743743

744744
fn insert_candidate_cache(&mut self,

src/librustc_trans/trans/expr.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1153,7 +1153,7 @@ fn trans_rvalue_dps_unadjusted<'blk, 'tcx>(bcx: Block<'blk, 'tcx>,
11531153
let trait_ref =
11541154
bcx.tcx().object_cast_map.borrow()
11551155
.get(&expr.id)
1156-
.map(|t| (*t).clone())
1156+
.cloned()
11571157
.unwrap();
11581158
let trait_ref = bcx.monomorphize(&trait_ref);
11591159
let datum = unpack_datum!(bcx, trans(bcx, &**val));

src/librustc_trans/trans/type_of.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ pub fn untuple_arguments_if_necessary<'a, 'tcx>(ccx: &CrateContext<'a, 'tcx>,
6767
abi: abi::Abi)
6868
-> Vec<Ty<'tcx>> {
6969
if abi != abi::RustCall {
70-
return inputs.iter().map(|x| (*x).clone()).collect()
70+
return inputs.iter().cloned().collect()
7171
}
7272

7373
if inputs.len() == 0 {

src/librustdoc/visit_ast.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -333,7 +333,7 @@ impl<'a, 'tcx> RustdocVisitor<'a, 'tcx> {
333333
name: name,
334334
items: items.clone(),
335335
generics: gen.clone(),
336-
bounds: b.iter().map(|x| (*x).clone()).collect(),
336+
bounds: b.iter().cloned().collect(),
337337
id: item.id,
338338
attrs: item.attrs.clone(),
339339
whence: item.span,

src/libsyntax/ext/deriving/generic/mod.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -410,7 +410,7 @@ impl<'a> TraitDef<'a> {
410410
let mut ty_params = ty_params.into_vec();
411411

412412
// Copy the lifetimes
413-
lifetimes.extend(generics.lifetimes.iter().map(|l| (*l).clone()));
413+
lifetimes.extend(generics.lifetimes.iter().cloned());
414414

415415
// Create the type parameters.
416416
ty_params.extend(generics.ty_params.iter().map(|ty_param| {

src/libsyntax/ext/tt/macro_parser.rs

+1-3
Original file line numberDiff line numberDiff line change
@@ -282,9 +282,7 @@ pub fn parse(sess: &ParseSess,
282282
ms: &[TokenTree])
283283
-> ParseResult {
284284
let mut cur_eis = Vec::new();
285-
cur_eis.push(initial_matcher_pos(Rc::new(ms.iter()
286-
.map(|x| (*x).clone())
287-
.collect()),
285+
cur_eis.push(initial_matcher_pos(Rc::new(ms.iter().cloned().collect()),
288286
None,
289287
rdr.peek().sp.lo));
290288

src/libsyntax/ext/tt/macro_rules.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,7 @@ fn generic_extension<'cx>(cx: &'cx ExtCtxt,
160160
None,
161161
None,
162162
arg.iter()
163-
.map(|x| (*x).clone())
163+
.cloned()
164164
.collect(),
165165
true);
166166
match parse(cx.parse_sess(), cx.cfg(), arg_rdr, lhs_tt) {

src/libsyntax/parse/lexer/comments.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ pub fn strip_doc_comment_decoration(comment: &str) -> String {
8282
while j > i && lines[j - 1].trim().is_empty() {
8383
j -= 1;
8484
}
85-
return lines[i..j].iter().map(|x| (*x).clone()).collect();
85+
return lines[i..j].iter().cloned().collect();
8686
}
8787

8888
/// remove a "[ \t]*\*" block from each line, if possible

0 commit comments

Comments
 (0)