diff options
author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2019-09-02 20:20:24 +0100 |
---|---|---|
committer | GitHub <[email protected]> | 2019-09-02 20:20:24 +0100 |
commit | 7faec1c30046769d4ae490e15cf5405bcfbdeef8 (patch) | |
tree | 6d268b721027a5350928a6c5a0ec227b5fde8ebc /crates/ra_hir/src/code_model/src.rs | |
parent | a8397deab914240aca8f015fb3736689919c0a5b (diff) | |
parent | e94587e3153b52684fd3f6b82c8e7efc09ff5c8d (diff) |
Merge #1752
1752: Always wrap blocks into block expressions r=flodiebold a=matklad
This way, things like function bodies are expressions, and we don't have to single them out
Co-authored-by: Aleksey Kladov <[email protected]>
Diffstat (limited to 'crates/ra_hir/src/code_model/src.rs')
-rw-r--r-- | crates/ra_hir/src/code_model/src.rs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/crates/ra_hir/src/code_model/src.rs b/crates/ra_hir/src/code_model/src.rs index e5bae16ab..7c9454c0b 100644 --- a/crates/ra_hir/src/code_model/src.rs +++ b/crates/ra_hir/src/code_model/src.rs | |||
@@ -119,10 +119,10 @@ where | |||
119 | expr_id: crate::expr::ExprId, | 119 | expr_id: crate::expr::ExprId, |
120 | ) -> Option<Source<ast::Expr>> { | 120 | ) -> Option<Source<ast::Expr>> { |
121 | let source_map = self.body_source_map(db); | 121 | let source_map = self.body_source_map(db); |
122 | let expr_syntax = source_map.expr_syntax(expr_id)?; | 122 | let expr_syntax = source_map.expr_syntax(expr_id)?.a()?; |
123 | let source = self.source(db); | 123 | let source = self.source(db); |
124 | let node = expr_syntax.to_node(&source.ast.syntax()); | 124 | let ast = expr_syntax.to_node(&source.ast.syntax()); |
125 | ast::Expr::cast(node).map(|ast| Source { file_id: source.file_id, ast }) | 125 | Some(Source { file_id: source.file_id, ast }) |
126 | } | 126 | } |
127 | } | 127 | } |
128 | 128 | ||