diff options
author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2021-06-03 10:55:37 +0100 |
---|---|---|
committer | GitHub <[email protected]> | 2021-06-03 10:55:37 +0100 |
commit | 50936397cc4e34712b18cd337facef527fa20b48 (patch) | |
tree | 709dac4e04b492c16829e299bbaf6f2377f0f3a0 /crates/hir_ty | |
parent | e8e14e1b13b76aaa643bc3beffb9c52bc5228d24 (diff) | |
parent | 0a8c30a96fe09047da07a8e2980baa47a334a3d7 (diff) |
Merge #9105
9105: internal: calculate pattern adjustments r=flodiebold a=iDawer
This extends `InferenceResult` with `pub pat_adjustments: FxHashMap<PatId, Vec<Ty>>`.
Fixes #9095
Co-authored-by: Dawer <[email protected]>
Diffstat (limited to 'crates/hir_ty')
-rw-r--r-- | crates/hir_ty/src/diagnostics/expr.rs | 23 | ||||
-rw-r--r-- | crates/hir_ty/src/diagnostics/match_check.rs | 28 | ||||
-rw-r--r-- | crates/hir_ty/src/diagnostics/match_check/usefulness.rs | 5 | ||||
-rw-r--r-- | crates/hir_ty/src/infer.rs | 2 | ||||
-rw-r--r-- | crates/hir_ty/src/infer/pat.rs | 7 |
5 files changed, 50 insertions, 15 deletions
diff --git a/crates/hir_ty/src/diagnostics/expr.rs b/crates/hir_ty/src/diagnostics/expr.rs index 3efbce773..a2a4d61db 100644 --- a/crates/hir_ty/src/diagnostics/expr.rs +++ b/crates/hir_ty/src/diagnostics/expr.rs | |||
@@ -357,17 +357,20 @@ impl<'a, 'b> ExprValidator<'a, 'b> { | |||
357 | infer: &infer, | 357 | infer: &infer, |
358 | db, | 358 | db, |
359 | pattern_arena: &pattern_arena, | 359 | pattern_arena: &pattern_arena, |
360 | eprint_panic_context: &|| { | 360 | panic_context: &|| { |
361 | use syntax::AstNode; | 361 | use syntax::AstNode; |
362 | if let Ok(scrutinee_sptr) = source_map.expr_syntax(match_expr) { | 362 | let match_expr_text = source_map |
363 | let root = scrutinee_sptr.file_syntax(db.upcast()); | 363 | .expr_syntax(match_expr) |
364 | if let Some(match_ast) = scrutinee_sptr.value.to_node(&root).syntax().parent() { | 364 | .ok() |
365 | eprintln!( | 365 | .and_then(|scrutinee_sptr| { |
366 | "Match checking is about to panic on this expression:\n{}", | 366 | let root = scrutinee_sptr.file_syntax(db.upcast()); |
367 | match_ast.to_string(), | 367 | scrutinee_sptr.value.to_node(&root).syntax().parent() |
368 | ); | 368 | }) |
369 | } | 369 | .map(|node| node.to_string()); |
370 | } | 370 | format!( |
371 | "expression:\n{}", | ||
372 | match_expr_text.as_deref().unwrap_or("<synthesized expr>") | ||
373 | ) | ||
371 | }, | 374 | }, |
372 | }; | 375 | }; |
373 | let report = compute_match_usefulness(&cx, &m_arms); | 376 | let report = compute_match_usefulness(&cx, &m_arms); |
diff --git a/crates/hir_ty/src/diagnostics/match_check.rs b/crates/hir_ty/src/diagnostics/match_check.rs index a9a99f57a..c8e1b23de 100644 --- a/crates/hir_ty/src/diagnostics/match_check.rs +++ b/crates/hir_ty/src/diagnostics/match_check.rs | |||
@@ -100,10 +100,19 @@ impl<'a> PatCtxt<'a> { | |||
100 | } | 100 | } |
101 | 101 | ||
102 | pub(crate) fn lower_pattern(&mut self, pat: hir_def::expr::PatId) -> Pat { | 102 | pub(crate) fn lower_pattern(&mut self, pat: hir_def::expr::PatId) -> Pat { |
103 | // FIXME: implement pattern adjustments (implicit pattern dereference; "RFC 2005-match-ergonomics") | 103 | // XXX(iDawer): Collecting pattern adjustments feels imprecise to me. |
104 | // When lowering of & and box patterns are implemented this should be tested | ||
105 | // in a manner of `match_ergonomics_issue_9095` test. | ||
106 | // Pattern adjustment is part of RFC 2005-match-ergonomics. | ||
104 | // More info https://github.com/rust-lang/rust/issues/42640#issuecomment-313535089 | 107 | // More info https://github.com/rust-lang/rust/issues/42640#issuecomment-313535089 |
105 | let unadjusted_pat = self.lower_pattern_unadjusted(pat); | 108 | let unadjusted_pat = self.lower_pattern_unadjusted(pat); |
106 | unadjusted_pat | 109 | self.infer.pat_adjustments.get(&pat).map(|it| &**it).unwrap_or_default().iter().rev().fold( |
110 | unadjusted_pat, | ||
111 | |subpattern, ref_ty| Pat { | ||
112 | ty: ref_ty.clone(), | ||
113 | kind: Box::new(PatKind::Deref { subpattern }), | ||
114 | }, | ||
115 | ) | ||
107 | } | 116 | } |
108 | 117 | ||
109 | fn lower_pattern_unadjusted(&mut self, pat: hir_def::expr::PatId) -> Pat { | 118 | fn lower_pattern_unadjusted(&mut self, pat: hir_def::expr::PatId) -> Pat { |
@@ -1236,6 +1245,21 @@ fn main(f: Foo) { | |||
1236 | ); | 1245 | ); |
1237 | } | 1246 | } |
1238 | 1247 | ||
1248 | #[test] | ||
1249 | fn match_ergonomics_issue_9095() { | ||
1250 | check_diagnostics( | ||
1251 | r#" | ||
1252 | enum Foo<T> { A(T) } | ||
1253 | fn main() { | ||
1254 | match &Foo::A(true) { | ||
1255 | _ => {} | ||
1256 | Foo::A(_) => {} | ||
1257 | } | ||
1258 | } | ||
1259 | "#, | ||
1260 | ); | ||
1261 | } | ||
1262 | |||
1239 | mod false_negatives { | 1263 | mod false_negatives { |
1240 | //! The implementation of match checking here is a work in progress. As we roll this out, we | 1264 | //! The implementation of match checking here is a work in progress. As we roll this out, we |
1241 | //! prefer false negatives to false positives (ideally there would be no false positives). This | 1265 | //! prefer false negatives to false positives (ideally there would be no false positives). This |
diff --git a/crates/hir_ty/src/diagnostics/match_check/usefulness.rs b/crates/hir_ty/src/diagnostics/match_check/usefulness.rs index 83b094a89..bd76a606c 100644 --- a/crates/hir_ty/src/diagnostics/match_check/usefulness.rs +++ b/crates/hir_ty/src/diagnostics/match_check/usefulness.rs | |||
@@ -295,7 +295,7 @@ pub(crate) struct MatchCheckCtx<'a> { | |||
295 | pub(crate) db: &'a dyn HirDatabase, | 295 | pub(crate) db: &'a dyn HirDatabase, |
296 | /// Lowered patterns from arms plus generated by the check. | 296 | /// Lowered patterns from arms plus generated by the check. |
297 | pub(crate) pattern_arena: &'a RefCell<PatternArena>, | 297 | pub(crate) pattern_arena: &'a RefCell<PatternArena>, |
298 | pub(crate) eprint_panic_context: &'a dyn Fn(), | 298 | pub(crate) panic_context: &'a dyn Fn() -> String, |
299 | } | 299 | } |
300 | 300 | ||
301 | impl<'a> MatchCheckCtx<'a> { | 301 | impl<'a> MatchCheckCtx<'a> { |
@@ -331,8 +331,7 @@ impl<'a> MatchCheckCtx<'a> { | |||
331 | 331 | ||
332 | #[track_caller] | 332 | #[track_caller] |
333 | pub(super) fn bug(&self, info: &str) -> ! { | 333 | pub(super) fn bug(&self, info: &str) -> ! { |
334 | (self.eprint_panic_context)(); | 334 | panic!("bug: {}\n{}", info, (self.panic_context)()); |
335 | panic!("bug: {}", info); | ||
336 | } | 335 | } |
337 | } | 336 | } |
338 | 337 | ||
diff --git a/crates/hir_ty/src/infer.rs b/crates/hir_ty/src/infer.rs index 7a4268819..0e9f777da 100644 --- a/crates/hir_ty/src/infer.rs +++ b/crates/hir_ty/src/infer.rs | |||
@@ -150,6 +150,8 @@ pub struct InferenceResult { | |||
150 | type_mismatches: FxHashMap<ExprOrPatId, TypeMismatch>, | 150 | type_mismatches: FxHashMap<ExprOrPatId, TypeMismatch>, |
151 | /// Interned Unknown to return references to. | 151 | /// Interned Unknown to return references to. |
152 | standard_types: InternedStandardTypes, | 152 | standard_types: InternedStandardTypes, |
153 | /// Stores the types which were implicitly dereferenced in pattern binding modes. | ||
154 | pub pat_adjustments: FxHashMap<PatId, Vec<Ty>>, | ||
153 | } | 155 | } |
154 | 156 | ||
155 | impl InferenceResult { | 157 | impl InferenceResult { |
diff --git a/crates/hir_ty/src/infer/pat.rs b/crates/hir_ty/src/infer/pat.rs index c97b49544..25dff7e49 100644 --- a/crates/hir_ty/src/infer/pat.rs +++ b/crates/hir_ty/src/infer/pat.rs | |||
@@ -101,7 +101,9 @@ impl<'a> InferenceContext<'a> { | |||
101 | let mut expected = self.resolve_ty_shallow(expected); | 101 | let mut expected = self.resolve_ty_shallow(expected); |
102 | 102 | ||
103 | if is_non_ref_pat(&body, pat) { | 103 | if is_non_ref_pat(&body, pat) { |
104 | let mut pat_adjustments = Vec::new(); | ||
104 | while let Some((inner, _lifetime, mutability)) = expected.as_reference() { | 105 | while let Some((inner, _lifetime, mutability)) = expected.as_reference() { |
106 | pat_adjustments.push(expected.clone()); | ||
105 | expected = self.resolve_ty_shallow(inner); | 107 | expected = self.resolve_ty_shallow(inner); |
106 | default_bm = match default_bm { | 108 | default_bm = match default_bm { |
107 | BindingMode::Move => BindingMode::Ref(mutability), | 109 | BindingMode::Move => BindingMode::Ref(mutability), |
@@ -109,6 +111,11 @@ impl<'a> InferenceContext<'a> { | |||
109 | BindingMode::Ref(Mutability::Mut) => BindingMode::Ref(mutability), | 111 | BindingMode::Ref(Mutability::Mut) => BindingMode::Ref(mutability), |
110 | } | 112 | } |
111 | } | 113 | } |
114 | |||
115 | if !pat_adjustments.is_empty() { | ||
116 | pat_adjustments.shrink_to_fit(); | ||
117 | self.result.pat_adjustments.insert(pat, pat_adjustments); | ||
118 | } | ||
112 | } else if let Pat::Ref { .. } = &body[pat] { | 119 | } else if let Pat::Ref { .. } = &body[pat] { |
113 | cov_mark::hit!(match_ergonomics_ref); | 120 | cov_mark::hit!(match_ergonomics_ref); |
114 | // When you encounter a `&pat` pattern, reset to Move. | 121 | // When you encounter a `&pat` pattern, reset to Move. |