diff options
author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2019-11-21 14:10:14 +0000 |
---|---|---|
committer | GitHub <[email protected]> | 2019-11-21 14:10:14 +0000 |
commit | d0a9ed50da054d74721c6c51124696a20de5843b (patch) | |
tree | 0524bb740f282a4f17a30d18fae9ec85c77fdc0d | |
parent | 8c2eee4edefffbdea3f30383a87d09f062ae1fe8 (diff) | |
parent | a1346bba5c457d1aa0a35f44231bed8b494b7d60 (diff) |
Merge #2340
2340: Fix test mark placement r=matklad a=matklad
Co-authored-by: Aleksey Kladov <[email protected]>
-rw-r--r-- | crates/ra_hir_def/src/body/lower.rs | 2 | ||||
-rw-r--r-- | crates/ra_hir_def/src/body/scope.rs | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/crates/ra_hir_def/src/body/lower.rs b/crates/ra_hir_def/src/body/lower.rs index 77f091288..d8e911aa5 100644 --- a/crates/ra_hir_def/src/body/lower.rs +++ b/crates/ra_hir_def/src/body/lower.rs | |||
@@ -154,7 +154,6 @@ where | |||
154 | None => self.collect_expr_opt(condition.expr()), | 154 | None => self.collect_expr_opt(condition.expr()), |
155 | // if let -- desugar to match | 155 | // if let -- desugar to match |
156 | Some(pat) => { | 156 | Some(pat) => { |
157 | tested_by!(infer_resolve_while_let); | ||
158 | let pat = self.collect_pat(pat); | 157 | let pat = self.collect_pat(pat); |
159 | let match_expr = self.collect_expr_opt(condition.expr()); | 158 | let match_expr = self.collect_expr_opt(condition.expr()); |
160 | let placeholder_pat = self.missing_pat(); | 159 | let placeholder_pat = self.missing_pat(); |
@@ -192,6 +191,7 @@ where | |||
192 | None => self.collect_expr_opt(condition.expr()), | 191 | None => self.collect_expr_opt(condition.expr()), |
193 | // if let -- desugar to match | 192 | // if let -- desugar to match |
194 | Some(pat) => { | 193 | Some(pat) => { |
194 | tested_by!(infer_resolve_while_let); | ||
195 | let pat = self.collect_pat(pat); | 195 | let pat = self.collect_pat(pat); |
196 | let match_expr = self.collect_expr_opt(condition.expr()); | 196 | let match_expr = self.collect_expr_opt(condition.expr()); |
197 | let placeholder_pat = self.missing_pat(); | 197 | let placeholder_pat = self.missing_pat(); |
diff --git a/crates/ra_hir_def/src/body/scope.rs b/crates/ra_hir_def/src/body/scope.rs index 5d7d17231..58740b679 100644 --- a/crates/ra_hir_def/src/body/scope.rs +++ b/crates/ra_hir_def/src/body/scope.rs | |||
@@ -384,7 +384,7 @@ mod tests { | |||
384 | } | 384 | } |
385 | 385 | ||
386 | #[test] | 386 | #[test] |
387 | fn infer_resolve_while_let() { | 387 | fn while_let_desugaring() { |
388 | covers!(infer_resolve_while_let); | 388 | covers!(infer_resolve_while_let); |
389 | do_check_local_name( | 389 | do_check_local_name( |
390 | r#" | 390 | r#" |