From be2fa2b31b9e6b01ed96f41061a231ea45a54216 Mon Sep 17 00:00:00 2001 From: Ryo Yoshida Date: Sun, 29 May 2022 16:20:44 +0900 Subject: [PATCH] fix overflow during tuple struct type inference --- crates/hir-ty/src/infer/pat.rs | 2 +- crates/hir-ty/src/tests/regression.rs | 27 +++++++++++++++++++++++++++ 2 files changed, 28 insertions(+), 1 deletion(-) diff --git a/crates/hir-ty/src/infer/pat.rs b/crates/hir-ty/src/infer/pat.rs index dbce0f7cd4f..c06d262f5e3 100644 --- a/crates/hir-ty/src/infer/pat.rs +++ b/crates/hir-ty/src/infer/pat.rs @@ -42,7 +42,7 @@ fn infer_tuple_struct_pat( Some(idx) => subpats.split_at(idx), None => (subpats, &[][..]), }; - let post_idx_offset = field_tys.iter().count() - post.len(); + let post_idx_offset = field_tys.iter().count().saturating_sub(post.len()); let pre_iter = pre.iter().enumerate(); let post_iter = (post_idx_offset..).zip(post.iter()); diff --git a/crates/hir-ty/src/tests/regression.rs b/crates/hir-ty/src/tests/regression.rs index ef27667ffa5..93f765f703c 100644 --- a/crates/hir-ty/src/tests/regression.rs +++ b/crates/hir-ty/src/tests/regression.rs @@ -1620,3 +1620,30 @@ pub trait Destruct {} "#, ); } + +#[test] +fn tuple_struct_pattern_with_unmatched_args_crash() { + check_infer( + r#" +struct S(usize); +fn main() { + let S(.., a, b) = S(1); + let (.., a, b) = (1,); +} + "#, + expect![[r#" + 27..85 '{ ...1,); }': () + 37..48 'S(.., a, b)': S + 43..44 'a': usize + 46..47 'b': {unknown} + 51..52 'S': S(usize) -> S + 51..55 'S(1)': S + 53..54 '1': usize + 65..75 '(.., a, b)': (i32, {unknown}) + 70..71 'a': i32 + 73..74 'b': {unknown} + 78..82 '(1,)': (i32,) + 79..80 '1': i32 + "#]], + ); +}