From f8d4cdc170bead42db3ffa647318ecf2bd6430e7 Mon Sep 17 00:00:00 2001
From: Shotaro Yamada <sinkuu@sinkuu.xyz>
Date: Mon, 14 Oct 2019 12:56:18 +0900
Subject: Avoid cloning `Arc<[T]>` into a vec if possible

---
 crates/ra_hir/src/ty/infer/unify.rs | 23 +++++++++++++++--------
 crates/ra_hir/src/ty/lower.rs       |  7 +++----
 2 files changed, 18 insertions(+), 12 deletions(-)

(limited to 'crates/ra_hir/src/ty')

diff --git a/crates/ra_hir/src/ty/infer/unify.rs b/crates/ra_hir/src/ty/infer/unify.rs
index d161aa6b3..5e86ed260 100644
--- a/crates/ra_hir/src/ty/infer/unify.rs
+++ b/crates/ra_hir/src/ty/infer/unify.rs
@@ -6,6 +6,7 @@ use crate::ty::{
     Canonical, InEnvironment, InferTy, ProjectionPredicate, ProjectionTy, Substs, TraitRef, Ty,
     TypeWalk,
 };
+use crate::util::make_mut_arc_slice;
 
 impl<'a, D: HirDatabase> InferenceContext<'a, D> {
     pub(super) fn canonicalizer<'b>(&'b mut self) -> Canonicalizer<'a, 'b, D>
@@ -74,10 +75,13 @@ where
         })
     }
 
-    fn do_canonicalize_trait_ref(&mut self, trait_ref: TraitRef) -> TraitRef {
-        let substs =
-            trait_ref.substs.iter().map(|ty| self.do_canonicalize_ty(ty.clone())).collect();
-        TraitRef { trait_: trait_ref.trait_, substs: Substs(substs) }
+    fn do_canonicalize_trait_ref(&mut self, mut trait_ref: TraitRef) -> TraitRef {
+        make_mut_arc_slice(&mut trait_ref.substs.0, |tys| {
+            for ty in tys {
+                *ty = self.do_canonicalize_ty(ty.clone());
+            }
+        });
+        trait_ref
     }
 
     fn into_canonicalized<T>(self, result: T) -> Canonicalized<T> {
@@ -87,10 +91,13 @@ where
         }
     }
 
-    fn do_canonicalize_projection_ty(&mut self, projection_ty: ProjectionTy) -> ProjectionTy {
-        let params =
-            projection_ty.parameters.iter().map(|ty| self.do_canonicalize_ty(ty.clone())).collect();
-        ProjectionTy { associated_ty: projection_ty.associated_ty, parameters: Substs(params) }
+    fn do_canonicalize_projection_ty(&mut self, mut projection_ty: ProjectionTy) -> ProjectionTy {
+        make_mut_arc_slice(&mut projection_ty.parameters.0, |params| {
+            for ty in params {
+                *ty = self.do_canonicalize_ty(ty.clone());
+            }
+        });
+        projection_ty
     }
 
     fn do_canonicalize_projection_predicate(
diff --git a/crates/ra_hir/src/ty/lower.rs b/crates/ra_hir/src/ty/lower.rs
index a604c02e2..003aa9bab 100644
--- a/crates/ra_hir/src/ty/lower.rs
+++ b/crates/ra_hir/src/ty/lower.rs
@@ -392,10 +392,9 @@ impl TraitRef {
     ) -> Self {
         let mut substs = TraitRef::substs_from_path(db, resolver, segment, resolved);
         if let Some(self_ty) = explicit_self_ty {
-            // FIXME this could be nicer
-            let mut substs_vec = substs.0.to_vec();
-            substs_vec[0] = self_ty;
-            substs.0 = substs_vec.into();
+            crate::util::make_mut_arc_slice(&mut substs.0, |substs| {
+                substs[0] = self_ty;
+            });
         }
         TraitRef { trait_: resolved, substs }
     }
-- 
cgit v1.2.3