From 42217738e0b121a8e5d48a9a55cb51ef6c98975f Mon Sep 17 00:00:00 2001 From: Florian Diebold Date: Sun, 14 Mar 2021 17:40:55 +0100 Subject: Don't use Substs for Ref/Raw/Array/Slice --- crates/hir_ty/src/infer/pat.rs | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'crates/hir_ty/src/infer/pat.rs') diff --git a/crates/hir_ty/src/infer/pat.rs b/crates/hir_ty/src/infer/pat.rs index 2e812ab94..9e8ca18ef 100644 --- a/crates/hir_ty/src/infer/pat.rs +++ b/crates/hir_ty/src/infer/pat.rs @@ -163,7 +163,7 @@ impl<'a> InferenceContext<'a> { _ => self.result.standard_types.unknown.clone(), }; let subty = self.infer_pat(*pat, &expectation, default_bm); - TyKind::Ref(mutability, Substs::single(subty)).intern(&Interner) + TyKind::Ref(mutability, subty).intern(&Interner) } Pat::TupleStruct { path: p, args: subpats, ellipsis } => self.infer_tuple_struct_pat( p.as_ref(), @@ -196,7 +196,7 @@ impl<'a> InferenceContext<'a> { let bound_ty = match mode { BindingMode::Ref(mutability) => { - TyKind::Ref(mutability, Substs::single(inner_ty.clone())).intern(&Interner) + TyKind::Ref(mutability, inner_ty.clone()).intern(&Interner) } BindingMode::Move => inner_ty.clone(), }; @@ -206,8 +206,8 @@ impl<'a> InferenceContext<'a> { } Pat::Slice { prefix, slice, suffix } => { let (container_ty, elem_ty): (fn(_) -> _, _) = match expected.interned(&Interner) { - TyKind::Array(st) => (TyKind::Array, st.as_single().clone()), - TyKind::Slice(st) => (TyKind::Slice, st.as_single().clone()), + TyKind::Array(st) => (TyKind::Array, st.clone()), + TyKind::Slice(st) => (TyKind::Slice, st.clone()), _ => (TyKind::Slice, self.err_ty()), }; @@ -215,7 +215,7 @@ impl<'a> InferenceContext<'a> { self.infer_pat(*pat_id, &elem_ty, default_bm); } - let pat_ty = container_ty(Substs::single(elem_ty)).intern(&Interner); + let pat_ty = container_ty(elem_ty).intern(&Interner); if let Some(slice_pat_id) = slice { self.infer_pat(*slice_pat_id, &pat_ty, default_bm); } -- cgit v1.2.3