From f5efa17515a543c1405ecad2caf93ed25052500e Mon Sep 17 00:00:00 2001 From: Josh Mcguigan Date: Sun, 1 Mar 2020 14:02:32 -0800 Subject: handle array pattern matching type inference --- crates/ra_hir_ty/src/infer/pat.rs | 24 ++++++++++++++---------- 1 file changed, 14 insertions(+), 10 deletions(-) (limited to 'crates/ra_hir_ty/src/infer') diff --git a/crates/ra_hir_ty/src/infer/pat.rs b/crates/ra_hir_ty/src/infer/pat.rs index 06b09af82..623e52599 100644 --- a/crates/ra_hir_ty/src/infer/pat.rs +++ b/crates/ra_hir_ty/src/infer/pat.rs @@ -12,7 +12,7 @@ use hir_expand::name::Name; use test_utils::tested_by; use super::{BindingMode, InferenceContext}; -use crate::{db::HirDatabase, utils::variant_data, Substs, Ty, TypeCtor, ApplicationTy}; +use crate::{db::HirDatabase, utils::variant_data, Substs, Ty, TypeCtor}; impl<'a, D: HirDatabase> InferenceContext<'a, D> { fn infer_tuple_struct_pat( @@ -186,17 +186,21 @@ impl<'a, D: HirDatabase> InferenceContext<'a, D> { return inner_ty; } Pat::Slice { prefix, slice: _slice, suffix } => { - let ty = if let Ty::Apply(ApplicationTy { ctor: TypeCtor::Slice, parameters }) = expected { - for pat_id in prefix.iter().chain(suffix) { - self.infer_pat(*pat_id, parameters.as_single(), default_bm); - } - - parameters.as_single().clone() - } else { - Ty::Unknown + let (container_ty, elem_ty) = match &expected { + ty_app!(TypeCtor::Array, st) => { + (TypeCtor::Array, st.as_single().clone()) + }, + ty_app!(TypeCtor::Slice, st) => { + (TypeCtor::Slice, st.as_single().clone()) + }, + _ => (TypeCtor::Slice, Ty::Unknown), }; - Ty::apply_one(TypeCtor::Slice, ty) + for pat_id in prefix.iter().chain(suffix) { + self.infer_pat(*pat_id, &elem_ty, default_bm); + } + + Ty::apply_one(container_ty, elem_ty) } _ => Ty::Unknown, }; -- cgit v1.2.3