Use slice and unify

Author: h-michael

crates/ra_hir/src/ty.rs

@@ -216,9 +216,6 @@ pub enum Ty {
     /// A tuple type.  For example, `(i32, bool)`.
     Tuple(Arc<[Ty]>),
 
-    /// A array type.  For example, `[i32]`.
-    Array(Arc<[Ty]>),
-
     // The projection of an associated type.  For example,
     // `<T as Trait<..>>::N`.pub
     // Projection(ProjectionTy),
@@ -411,16 +408,6 @@ impl fmt::Display for Ty {
                         .to_fmt(f)
                 }
             }
-            Ty::Array(ts) => {
-                if ts.len() == 1 {
-                    write!(f, "[{},]", ts[0])
-                } else {
-                    join(ts.iter())
-                        .surround_with("[", "]")
-                        .separator(", ")
-                        .to_fmt(f)
-                }
-            }
             Ty::FnPtr(sig) => {
                 join(sig.input.iter())
                     .surround_with("fn(", ")")
@@ -1055,19 +1042,23 @@ impl<'a, D: HirDatabase> InferenceContext<'a, D> {
             },
             Expr::Tuple { exprs } => {
                 let mut ty_vec = Vec::with_capacity(exprs.len());
-                for arg in exprs.iter() {
-                    ty_vec.push(self.infer_expr(*arg, &Expectation::none())?);
+                for expr in exprs.iter() {
+                    ty_vec.push(self.infer_expr(*expr, &Expectation::none())?);
                 }
 
                 Ty::Tuple(Arc::from(ty_vec))
             }
             Expr::Array { exprs } => {
-                let mut ty_vec = Vec::with_capacity(exprs.len());
-                for arg in exprs.iter() {
-                    ty_vec.push(self.infer_expr(*arg, &Expectation::none())?);
+                let mut ty = Ty::Unknown;
+                for expr in exprs.iter() {
+                    let infered = self.infer_expr(*expr, &Expectation::none())?;
+                    match infered {
+                        Ty::Unknown => (),
+                        _ => ty = infered,
+                    }
                 }
 
-                Ty::Array(Arc::from(ty_vec))
+                Ty::Slice(Arc::new(ty))
             }
         };
         // use a new type variable if we got Ty::Unknown here