diff options
Diffstat (limited to 'crates/ra_hir/src/expr.rs')
-rw-r--r-- | crates/ra_hir/src/expr.rs | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/crates/ra_hir/src/expr.rs b/crates/ra_hir/src/expr.rs index 946c9faf2..45012827f 100644 --- a/crates/ra_hir/src/expr.rs +++ b/crates/ra_hir/src/expr.rs | |||
@@ -6,7 +6,7 @@ use rustc_hash::FxHashMap; | |||
6 | use ra_arena::{Arena, RawId, impl_arena_id, map::ArenaMap}; | 6 | use ra_arena::{Arena, RawId, impl_arena_id, map::ArenaMap}; |
7 | use ra_syntax::{ | 7 | use ra_syntax::{ |
8 | SyntaxNodePtr, AstPtr, AstNode, | 8 | SyntaxNodePtr, AstPtr, AstNode, |
9 | ast::{self, LoopBodyOwner, ArgListOwner, NameOwner, LiteralFlavor, TypeAscriptionOwner} | 9 | ast::{self, LoopBodyOwner, ArgListOwner, NameOwner, LiteralKind, TypeAscriptionOwner} |
10 | }; | 10 | }; |
11 | 11 | ||
12 | use crate::{ | 12 | use crate::{ |
@@ -516,8 +516,8 @@ impl ExprCollector { | |||
516 | let else_branch = e | 516 | let else_branch = e |
517 | .else_branch() | 517 | .else_branch() |
518 | .map(|b| match b { | 518 | .map(|b| match b { |
519 | ast::ElseBranchFlavor::Block(it) => self.collect_block(it), | 519 | ast::ElseBranch::Block(it) => self.collect_block(it), |
520 | ast::ElseBranchFlavor::IfExpr(elif) => { | 520 | ast::ElseBranch::IfExpr(elif) => { |
521 | let expr: &ast::Expr = ast::Expr::cast(elif.syntax()).unwrap(); | 521 | let expr: &ast::Expr = ast::Expr::cast(elif.syntax()).unwrap(); |
522 | self.collect_expr(expr) | 522 | self.collect_expr(expr) |
523 | } | 523 | } |
@@ -533,8 +533,8 @@ impl ExprCollector { | |||
533 | let condition = self.collect_expr_opt(e.condition().and_then(|c| c.expr())); | 533 | let condition = self.collect_expr_opt(e.condition().and_then(|c| c.expr())); |
534 | let then_branch = self.collect_block_opt(e.then_branch()); | 534 | let then_branch = self.collect_block_opt(e.then_branch()); |
535 | let else_branch = e.else_branch().map(|b| match b { | 535 | let else_branch = e.else_branch().map(|b| match b { |
536 | ast::ElseBranchFlavor::Block(it) => self.collect_block(it), | 536 | ast::ElseBranch::Block(it) => self.collect_block(it), |
537 | ast::ElseBranchFlavor::IfExpr(elif) => { | 537 | ast::ElseBranch::IfExpr(elif) => { |
538 | let expr: &ast::Expr = ast::Expr::cast(elif.syntax()).unwrap(); | 538 | let expr: &ast::Expr = ast::Expr::cast(elif.syntax()).unwrap(); |
539 | self.collect_expr(expr) | 539 | self.collect_expr(expr) |
540 | } | 540 | } |
@@ -726,8 +726,8 @@ impl ExprCollector { | |||
726 | self.alloc_expr(Expr::Array { exprs }, syntax_ptr) | 726 | self.alloc_expr(Expr::Array { exprs }, syntax_ptr) |
727 | } | 727 | } |
728 | ast::ExprKind::Literal(e) => { | 728 | ast::ExprKind::Literal(e) => { |
729 | let lit = match e.flavor() { | 729 | let lit = match e.kind() { |
730 | LiteralFlavor::IntNumber { suffix } => { | 730 | LiteralKind::IntNumber { suffix } => { |
731 | let known_name = suffix | 731 | let known_name = suffix |
732 | .and_then(|it| IntTy::from_suffix(&it).map(UncertainIntTy::Known)); | 732 | .and_then(|it| IntTy::from_suffix(&it).map(UncertainIntTy::Known)); |
733 | 733 | ||
@@ -736,7 +736,7 @@ impl ExprCollector { | |||
736 | known_name.unwrap_or(UncertainIntTy::Unknown), | 736 | known_name.unwrap_or(UncertainIntTy::Unknown), |
737 | ) | 737 | ) |
738 | } | 738 | } |
739 | LiteralFlavor::FloatNumber { suffix } => { | 739 | LiteralKind::FloatNumber { suffix } => { |
740 | let known_name = suffix | 740 | let known_name = suffix |
741 | .and_then(|it| FloatTy::from_suffix(&it).map(UncertainFloatTy::Known)); | 741 | .and_then(|it| FloatTy::from_suffix(&it).map(UncertainFloatTy::Known)); |
742 | 742 | ||
@@ -745,13 +745,13 @@ impl ExprCollector { | |||
745 | known_name.unwrap_or(UncertainFloatTy::Unknown), | 745 | known_name.unwrap_or(UncertainFloatTy::Unknown), |
746 | ) | 746 | ) |
747 | } | 747 | } |
748 | LiteralFlavor::ByteString => Literal::ByteString(Default::default()), | 748 | LiteralKind::ByteString => Literal::ByteString(Default::default()), |
749 | LiteralFlavor::String => Literal::String(Default::default()), | 749 | LiteralKind::String => Literal::String(Default::default()), |
750 | LiteralFlavor::Byte => { | 750 | LiteralKind::Byte => { |
751 | Literal::Int(Default::default(), UncertainIntTy::Known(IntTy::u8())) | 751 | Literal::Int(Default::default(), UncertainIntTy::Known(IntTy::u8())) |
752 | } | 752 | } |
753 | LiteralFlavor::Bool => Literal::Bool(Default::default()), | 753 | LiteralKind::Bool => Literal::Bool(Default::default()), |
754 | LiteralFlavor::Char => Literal::Char(Default::default()), | 754 | LiteralKind::Char => Literal::Char(Default::default()), |
755 | }; | 755 | }; |
756 | self.alloc_expr(Expr::Literal(lit), syntax_ptr) | 756 | self.alloc_expr(Expr::Literal(lit), syntax_ptr) |
757 | } | 757 | } |