language-servers/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-10-01 06:11:35 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

rename flavor to kind

Browse source
This commit is contained in:
Aleksey Kladov 2019-04-02 12:48:14 +03:00
parent cb5001c0a5
commit 0e1e40676a
6 changed files with 53 additions and 53 deletions
Download patch file Download diff file Expand all files Collapse all files

18
crates/ra_hir/src/expr.rs
View file

@ -6,7 +6,7 @@ use rustc_hash::FxHashMap;
use ra_arena::{Arena, RawId, impl_arena_id, map::ArenaMap};
use ra_syntax::{
SyntaxNodePtr, AstPtr, AstNode,
ast::{self, LoopBodyOwner, ArgListOwner, NameOwner, LiteralFlavor, TypeAscriptionOwner}
ast::{self, LoopBodyOwner, ArgListOwner, NameOwner, LiteralKind, TypeAscriptionOwner}
};
use crate::{
@ -726,8 +726,8 @@ impl ExprCollector {
self.alloc_expr(Expr::Array { exprs }, syntax_ptr)
}
ast::ExprKind::Literal(e) => {
let lit = match e.flavor() {
LiteralFlavor::IntNumber { suffix } => {
let lit = match e.kind() {
LiteralKind::IntNumber { suffix } => {
let known_name = suffix
.and_then(|it| IntTy::from_suffix(&it).map(UncertainIntTy::Known));
@ -736,7 +736,7 @@ impl ExprCollector {
known_name.unwrap_or(UncertainIntTy::Unknown),
)
}
LiteralFlavor::FloatNumber { suffix } => {
LiteralKind::FloatNumber { suffix } => {
let known_name = suffix
.and_then(|it| FloatTy::from_suffix(&it).map(UncertainFloatTy::Known));
@ -745,13 +745,13 @@ impl ExprCollector {
known_name.unwrap_or(UncertainFloatTy::Unknown),
)
}
LiteralFlavor::ByteString => Literal::ByteString(Default::default()),
LiteralFlavor::String => Literal::String(Default::default()),
LiteralFlavor::Byte => {
LiteralKind::ByteString => Literal::ByteString(Default::default()),
LiteralKind::String => Literal::String(Default::default()),
LiteralKind::Byte => {
Literal::Int(Default::default(), UncertainIntTy::Known(IntTy::u8()))
}
LiteralFlavor::Bool => Literal::Bool(Default::default()),
LiteralFlavor::Char => Literal::Char(Default::default()),
LiteralKind::Bool => Literal::Bool(Default::default()),
LiteralKind::Char => Literal::Char(Default::default()),
};
self.alloc_expr(Expr::Literal(lit), syntax_ptr)
}