diff options
author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2019-09-25 06:27:07 +0100 |
---|---|---|
committer | GitHub <[email protected]> | 2019-09-25 06:27:07 +0100 |
commit | 6bac2d0a637a6d0b3922a6f8fe05fa32d6d43b15 (patch) | |
tree | c3c2af75fa7be376506bf0ffe23fe8cad9c6c402 /crates/ra_hir/src/ty | |
parent | c7420ddaaa76741d1eebe393406b38ba5596e54a (diff) | |
parent | 9c45a9e58632966984a79e18aa5221efb65e0ead (diff) |
Merge #1904
1904: Remove redundant `clone()` r=matklad a=sinkuu
Co-authored-by: Shotaro Yamada <[email protected]>
Diffstat (limited to 'crates/ra_hir/src/ty')
-rw-r--r-- | crates/ra_hir/src/ty/infer.rs | 4 | ||||
-rw-r--r-- | crates/ra_hir/src/ty/method_resolution.rs | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/crates/ra_hir/src/ty/infer.rs b/crates/ra_hir/src/ty/infer.rs index 378d2f829..76b4b6faa 100644 --- a/crates/ra_hir/src/ty/infer.rs +++ b/crates/ra_hir/src/ty/infer.rs | |||
@@ -436,7 +436,7 @@ impl<'a, D: HirDatabase> InferenceContext<'a, D> { | |||
436 | 436 | ||
437 | fn normalize_projection_ty(&mut self, proj_ty: ProjectionTy) -> Ty { | 437 | fn normalize_projection_ty(&mut self, proj_ty: ProjectionTy) -> Ty { |
438 | let var = self.new_type_var(); | 438 | let var = self.new_type_var(); |
439 | let predicate = ProjectionPredicate { projection_ty: proj_ty.clone(), ty: var.clone() }; | 439 | let predicate = ProjectionPredicate { projection_ty: proj_ty, ty: var.clone() }; |
440 | let obligation = Obligation::Projection(predicate); | 440 | let obligation = Obligation::Projection(predicate); |
441 | self.obligations.push(obligation); | 441 | self.obligations.push(obligation); |
442 | var | 442 | var |
@@ -953,7 +953,7 @@ impl<'a, D: HirDatabase> InferenceContext<'a, D> { | |||
953 | arm_tys.push(self.infer_expr_inner(arm.expr, &expected)); | 953 | arm_tys.push(self.infer_expr_inner(arm.expr, &expected)); |
954 | } | 954 | } |
955 | 955 | ||
956 | let lub_ty = calculate_least_upper_bound(expected.ty.clone(), &arm_tys); | 956 | let lub_ty = calculate_least_upper_bound(expected.ty, &arm_tys); |
957 | 957 | ||
958 | for arm_ty in &arm_tys { | 958 | for arm_ty in &arm_tys { |
959 | self.coerce(arm_ty, &lub_ty); | 959 | self.coerce(arm_ty, &lub_ty); |
diff --git a/crates/ra_hir/src/ty/method_resolution.rs b/crates/ra_hir/src/ty/method_resolution.rs index 8b46b11a9..a967d8a7f 100644 --- a/crates/ra_hir/src/ty/method_resolution.rs +++ b/crates/ra_hir/src/ty/method_resolution.rs | |||
@@ -290,7 +290,7 @@ pub(crate) fn implements_trait( | |||
290 | return true; | 290 | return true; |
291 | } | 291 | } |
292 | let env = lower::trait_env(db, resolver); | 292 | let env = lower::trait_env(db, resolver); |
293 | let goal = generic_implements_goal(db, env.clone(), trait_, ty.clone()); | 293 | let goal = generic_implements_goal(db, env, trait_, ty.clone()); |
294 | let solution = db.trait_solve(krate, goal); | 294 | let solution = db.trait_solve(krate, goal); |
295 | 295 | ||
296 | solution.is_some() | 296 | solution.is_some() |