Skip to content

Commit 0aedd4f

Browse files
committed
Add Ty::Array to walk_mut
1 parent f66ca1b commit 0aedd4f

File tree

2 files changed

+35
-35
lines changed

2 files changed

+35
-35
lines changed

crates/ra_hir/src/ty.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -356,7 +356,7 @@ impl Ty {
356356
fn walk_mut(&mut self, f: &mut impl FnMut(&mut Ty)) {
357357
f(self);
358358
match self {
359-
Ty::Slice(t) => Arc::make_mut(t).walk_mut(f),
359+
Ty::Slice(t) | Ty::Array(t) => Arc::make_mut(t).walk_mut(f),
360360
Ty::RawPtr(t, _) => Arc::make_mut(t).walk_mut(f),
361361
Ty::Ref(t, _) => Arc::make_mut(t).walk_mut(f),
362362
Ty::Tuple(ts) => {
@@ -1105,7 +1105,7 @@ impl<'a, D: HirDatabase> InferenceContext<'a, D> {
11051105
}
11061106

11071107
Ty::Tuple(Arc::from(ty_vec))
1108-
},
1108+
}
11091109
Expr::Array { exprs } => {
11101110
let elem_ty = match &expected.ty {
11111111
Ty::Slice(inner) | Ty::Array(inner) => Ty::clone(&inner),
@@ -1117,7 +1117,7 @@ impl<'a, D: HirDatabase> InferenceContext<'a, D> {
11171117
}
11181118

11191119
Ty::Array(Arc::new(elem_ty))
1120-
},
1120+
}
11211121
Expr::Literal(lit) => match lit {
11221122
Literal::Bool(..) => Ty::Bool,
11231123
Literal::String(..) => Ty::Ref(Arc::new(Ty::Str), Mutability::Shared),
Lines changed: 32 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -1,52 +1,52 @@
11
[9; 10) 'x': &str
22
[18; 19) 'y': isize
33
[28; 293) '{ ... []; }': ()
4-
[38; 39) 'a': [_]
5-
[42; 45) '[x]': [_]
4+
[38; 39) 'a': [&str]
5+
[42; 45) '[x]': [&str]
66
[43; 44) 'x': &str
7-
[55; 56) 'b': [_]
8-
[59; 65) '[a, a]': [_]
9-
[60; 61) 'a': [_]
10-
[63; 64) 'a': [_]
11-
[75; 76) 'c': [_]
12-
[79; 85) '[b, b]': [_]
13-
[80; 81) 'b': [_]
14-
[83; 84) 'b': [_]
15-
[96; 97) 'd': [_]
16-
[100; 112) '[y, 1, 2, 3]': [_]
7+
[55; 56) 'b': [[&str]]
8+
[59; 65) '[a, a]': [[&str]]
9+
[60; 61) 'a': [&str]
10+
[63; 64) 'a': [&str]
11+
[75; 76) 'c': [[[&str]]]
12+
[79; 85) '[b, b]': [[[&str]]]
13+
[80; 81) 'b': [[&str]]
14+
[83; 84) 'b': [[&str]]
15+
[96; 97) 'd': [isize]
16+
[100; 112) '[y, 1, 2, 3]': [isize]
1717
[101; 102) 'y': isize
1818
[104; 105) '1': isize
1919
[107; 108) '2': isize
2020
[110; 111) '3': isize
21-
[122; 123) 'd': [_]
22-
[126; 138) '[1, y, 2, 3]': [_]
21+
[122; 123) 'd': [isize]
22+
[126; 138) '[1, y, 2, 3]': [isize]
2323
[127; 128) '1': isize
2424
[130; 131) 'y': isize
2525
[133; 134) '2': isize
2626
[136; 137) '3': isize
27-
[148; 149) 'e': [_]
28-
[152; 155) '[y]': [_]
27+
[148; 149) 'e': [isize]
28+
[152; 155) '[y]': [isize]
2929
[153; 154) 'y': isize
30-
[165; 166) 'f': [_]
31-
[169; 175) '[d, d]': [_]
32-
[170; 171) 'd': [_]
33-
[173; 174) 'd': [_]
34-
[185; 186) 'g': [_]
35-
[189; 195) '[e, e]': [_]
36-
[190; 191) 'e': [_]
37-
[193; 194) 'e': [_]
38-
[206; 207) 'h': [_]
39-
[210; 216) '[1, 2]': [_]
30+
[165; 166) 'f': [[isize]]
31+
[169; 175) '[d, d]': [[isize]]
32+
[170; 171) 'd': [isize]
33+
[173; 174) 'd': [isize]
34+
[185; 186) 'g': [[isize]]
35+
[189; 195) '[e, e]': [[isize]]
36+
[190; 191) 'e': [isize]
37+
[193; 194) 'e': [isize]
38+
[206; 207) 'h': [i32]
39+
[210; 216) '[1, 2]': [i32]
4040
[211; 212) '1': i32
4141
[214; 215) '2': i32
42-
[226; 227) 'i': [_]
43-
[230; 240) '["a", "b"]': [_]
42+
[226; 227) 'i': [&str]
43+
[230; 240) '["a", "b"]': [&str]
4444
[231; 234) '"a"': &str
4545
[236; 239) '"b"': &str
46-
[251; 252) 'b': [_]
47-
[255; 265) '[a, ["b"]]': [_]
48-
[256; 257) 'a': [_]
49-
[259; 264) '["b"]': [_]
46+
[251; 252) 'b': [[&str]]
47+
[255; 265) '[a, ["b"]]': [[&str]]
48+
[256; 257) 'a': [&str]
49+
[259; 264) '["b"]': [&str]
5050
[260; 263) '"b"': &str
5151
[275; 276) 'x': [u8]
5252
[288; 290) '[]': [u8]

0 commit comments

Comments
 (0)