Skip to content

Commit c9ba458

Browse files
Rollup merge of rust-lang#119003 - matthiaskrgr:nein_clone, r=Nadrieril
NFC: do not clone types that are copy
2 parents 30231d9 + 74d81d1 commit c9ba458

File tree

5 files changed

+6
-6
lines changed

5 files changed

+6
-6
lines changed

compiler/rustc_codegen_llvm/src/builder.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -353,7 +353,7 @@ impl<'a, 'll, 'tcx> BuilderMethods<'a, 'tcx> for Builder<'a, 'll, 'tcx> {
353353
let new_kind = match ty.kind() {
354354
Int(t @ Isize) => Int(t.normalize(self.tcx.sess.target.pointer_width)),
355355
Uint(t @ Usize) => Uint(t.normalize(self.tcx.sess.target.pointer_width)),
356-
t @ (Uint(_) | Int(_)) => t.clone(),
356+
t @ (Uint(_) | Int(_)) => *t,
357357
_ => panic!("tried to get overflow intrinsic for op applied to non-int type"),
358358
};
359359

compiler/rustc_middle/src/infer/canonical.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -341,13 +341,13 @@ impl<'tcx> CanonicalParamEnvCache<'tcx> {
341341
Entry::Occupied(e) => {
342342
let (canonical, var_values) = e.get();
343343
state.var_values.extend_from_slice(var_values);
344-
canonical.clone()
344+
*canonical
345345
}
346346
Entry::Vacant(e) => {
347347
let canonical = canonicalize_op(tcx, key, state);
348348
let OriginalQueryValues { var_values, universe_map } = state;
349349
assert_eq!(universe_map.len(), 1);
350-
e.insert((canonical.clone(), tcx.arena.alloc_slice(var_values)));
350+
e.insert((canonical, tcx.arena.alloc_slice(var_values)));
351351
canonical
352352
}
353353
}

compiler/rustc_middle/src/ty/consts.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ impl<'tcx> Const<'tcx> {
5959

6060
#[inline]
6161
pub fn kind(self) -> ConstKind<'tcx> {
62-
self.0.kind.clone()
62+
self.0.kind
6363
}
6464

6565
#[inline]

compiler/rustc_middle/src/ty/mod.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -473,7 +473,7 @@ impl<'tcx> IntoKind for Ty<'tcx> {
473473
type Kind = TyKind<'tcx>;
474474

475475
fn kind(self) -> TyKind<'tcx> {
476-
self.kind().clone()
476+
*self.kind()
477477
}
478478
}
479479

compiler/rustc_pattern_analysis/src/constructor.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -923,7 +923,7 @@ impl ConstructorSet {
923923
}
924924
ConstructorSet::Integers { range_1, range_2 } => {
925925
let seen_ranges: Vec<_> =
926-
seen.iter().map(|ctor| ctor.as_int_range().unwrap().clone()).collect();
926+
seen.iter().map(|ctor| *ctor.as_int_range().unwrap()).collect();
927927
for (seen, splitted_range) in range_1.split(seen_ranges.iter().cloned()) {
928928
match seen {
929929
Presence::Unseen => missing.push(IntRange(splitted_range)),

0 commit comments

Comments
 (0)