nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2025-01-21 04:03:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge #9529

Browse Source 
9529: fix: Don't unify arrays with their elements r=flodiebold a=lnicola

Addresses https://github.com/rust-analyzer/rust-analyzer/pull/9526#issuecomment-876206100.

Co-authored-by: Laurențiu Nicola <lnicola@dend.ro>
This commit is contained in:
bors[bot] 2021-07-08 09:55:27 +00:00 committed by GitHub
commit e44c56b616
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 21 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
crates/hir_ty/src/infer/expr.rs
View File

@ -735,10 +735,11 @@ impl<'a> InferenceContext<'a> {
_ => self.table.new_type_var(),
};
let expected = Expectation::has_type(elem_ty.clone());
let len = match array {
Array::ElementList(items) => {
for expr in items.iter() {
let cur_elem_ty = self.infer_expr_inner(*expr, expected);
let cur_elem_ty = self.infer_expr_inner(*expr, &expected);
elem_ty = self.coerce_merge_branch(Some(*expr), &elem_ty, &cur_elem_ty);
}
Some(items.len() as u64)

27
crates/hir_ty/src/tests/regression.rs
View File

@ -117,23 +117,34 @@ fn recursive_vars_2() {
"#,
expect![[r#"
10..79 '{ ...x)]; }': ()
20..21 'x': {unknown}
24..31 'unknown': {unknown}
20..21 'x': &{unknown}
24..31 'unknown': &{unknown}
41..42 'y': {unknown}
45..52 'unknown': {unknown}
58..76 '[(x, y..., &x)]': [({unknown}, {unknown}); 2]
59..65 '(x, y)': ({unknown}, {unknown})
60..61 'x': {unknown}
58..76 '[(x, y..., &x)]': [(&{unknown}, {unknown}); 2]
59..65 '(x, y)': (&{unknown}, {unknown})
60..61 'x': &{unknown}
63..64 'y': {unknown}
67..75 '(&y, &x)': (&{unknown}, &{unknown})
67..75 '(&y, &x)': (&{unknown}, {unknown})
68..70 '&y': &{unknown}
69..70 'y': {unknown}
72..74 '&x': &{unknown}
73..74 'x': {unknown}
72..74 '&x': &&{unknown}
73..74 'x': &{unknown}
"#]],
);
}
#[test]
fn array_elements_expected_type() {
check_no_mismatches(
r#"
fn test() {
let x: [[u32; 2]; 2] = [[1, 2], [3, 4]];
}
"#,
);
}
#[test]
fn infer_std_crash_1() {
// caused stack overflow, taken from std