diff options
author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2020-02-22 00:27:09 +0000 |
---|---|---|
committer | GitHub <[email protected]> | 2020-02-22 00:27:09 +0000 |
commit | baf832d6d903afbc39e3a01c752a1aa5218c020e (patch) | |
tree | f8d3481c6274e032f166e8c342281216dd24ec0e /crates/ra_hir_ty/src/tests | |
parent | d8b09435357462dccf7f026f568b2cd1dc3ec67a (diff) | |
parent | f1f45f9191d60c52dbedec717aee0de4a0580bcc (diff) |
Merge #3262
3262: Fix handling of const patterns r=matklad a=flodiebold
E.g. in `match x { None => ... }`, `None` is a path pattern (resolving to the
option variant), not a binding. To determine this, we need to try to resolve the
name during lowering. This isn't too hard since we already need to resolve names
for macro expansion anyway (though maybe a bit hacky).
Fixes #1618.
Co-authored-by: Florian Diebold <[email protected]>
Diffstat (limited to 'crates/ra_hir_ty/src/tests')
-rw-r--r-- | crates/ra_hir_ty/src/tests/patterns.rs | 46 |
1 files changed, 45 insertions, 1 deletions
diff --git a/crates/ra_hir_ty/src/tests/patterns.rs b/crates/ra_hir_ty/src/tests/patterns.rs index e25d6dbc4..81d00c2af 100644 --- a/crates/ra_hir_ty/src/tests/patterns.rs +++ b/crates/ra_hir_ty/src/tests/patterns.rs | |||
@@ -1,4 +1,4 @@ | |||
1 | use super::infer; | 1 | use super::{infer, infer_with_mismatches}; |
2 | use insta::assert_snapshot; | 2 | use insta::assert_snapshot; |
3 | use test_utils::covers; | 3 | use test_utils::covers; |
4 | 4 | ||
@@ -236,3 +236,47 @@ fn test(a1: A<u32>, o: Option<u64>) { | |||
236 | "### | 236 | "### |
237 | ); | 237 | ); |
238 | } | 238 | } |
239 | |||
240 | #[test] | ||
241 | fn infer_const_pattern() { | ||
242 | assert_snapshot!( | ||
243 | infer_with_mismatches(r#" | ||
244 | enum Option<T> { None } | ||
245 | use Option::None; | ||
246 | struct Foo; | ||
247 | const Bar: usize = 1; | ||
248 | |||
249 | fn test() { | ||
250 | let a: Option<u32> = None; | ||
251 | let b: Option<i64> = match a { | ||
252 | None => None, | ||
253 | }; | ||
254 | let _: () = match () { Foo => Foo }; // Expected mismatch | ||
255 | let _: () = match () { Bar => Bar }; // Expected mismatch | ||
256 | } | ||
257 | "#, true), | ||
258 | @r###" | ||
259 | [74; 75) '1': usize | ||
260 | [88; 310) '{ ...atch }': () | ||
261 | [98; 99) 'a': Option<u32> | ||
262 | [115; 119) 'None': Option<u32> | ||
263 | [129; 130) 'b': Option<i64> | ||
264 | [146; 183) 'match ... }': Option<i64> | ||
265 | [152; 153) 'a': Option<u32> | ||
266 | [164; 168) 'None': Option<u32> | ||
267 | [172; 176) 'None': Option<i64> | ||
268 | [193; 194) '_': () | ||
269 | [201; 224) 'match ... Foo }': Foo | ||
270 | [207; 209) '()': () | ||
271 | [212; 215) 'Foo': Foo | ||
272 | [219; 222) 'Foo': Foo | ||
273 | [255; 256) '_': () | ||
274 | [263; 286) 'match ... Bar }': usize | ||
275 | [269; 271) '()': () | ||
276 | [274; 277) 'Bar': usize | ||
277 | [281; 284) 'Bar': usize | ||
278 | [201; 224): expected (), got Foo | ||
279 | [263; 286): expected (), got usize | ||
280 | "### | ||
281 | ); | ||
282 | } | ||