aboutsummaryrefslogtreecommitdiff
path: root/crates/ra_hir/src/expr.rs
diff options
context:
space:
mode:
Diffstat (limited to 'crates/ra_hir/src/expr.rs')
-rw-r--r--crates/ra_hir/src/expr.rs20
1 files changed, 13 insertions, 7 deletions
diff --git a/crates/ra_hir/src/expr.rs b/crates/ra_hir/src/expr.rs
index b1973d19d..d5b4ba6b6 100644
--- a/crates/ra_hir/src/expr.rs
+++ b/crates/ra_hir/src/expr.rs
@@ -3,19 +3,25 @@ use std::sync::Arc;
3 3
4use rustc_hash::FxHashMap; 4use rustc_hash::FxHashMap;
5 5
6use ra_arena::{Arena, RawId, impl_arena_id, map::ArenaMap}; 6use ra_arena::{impl_arena_id, map::ArenaMap, Arena, RawId};
7use ra_syntax::{ 7use ra_syntax::{
8 SyntaxNodePtr, AstPtr, AstNode, 8 ast::{
9 ast::{self, TryBlockBodyOwner, LoopBodyOwner, ArgListOwner, NameOwner, LiteralKind,ArrayExprKind, TypeAscriptionOwner}, 9 self, ArgListOwner, ArrayExprKind, LiteralKind, LoopBodyOwner, NameOwner,
10 TryBlockBodyOwner, TypeAscriptionOwner,
11 },
12 AstNode, AstPtr, SyntaxNodePtr,
10}; 13};
11 14
12use crate::{ 15use crate::{
13 Path, Name, HirDatabase, Resolver,DefWithBody, Either, HirFileId, MacroCallLoc, MacroFileKind,
14 HasSource,
15 name::AsName, 16 name::AsName,
16 type_ref::{Mutability, TypeRef}, 17 type_ref::{Mutability, TypeRef},
18 DefWithBody, Either, HasSource, HirDatabase, HirFileId, MacroCallLoc, MacroFileKind, Name,
19 Path, Resolver,
20};
21use crate::{
22 path::GenericArgs,
23 ty::primitive::{FloatTy, IntTy, UncertainFloatTy, UncertainIntTy},
17}; 24};
18use crate::{path::GenericArgs, ty::primitive::{IntTy, UncertainIntTy, FloatTy, UncertainFloatTy}};
19 25
20pub use self::scope::ExprScopes; 26pub use self::scope::ExprScopes;
21 27
@@ -249,8 +255,8 @@ pub enum Expr {
249 Literal(Literal), 255 Literal(Literal),
250} 256}
251 257
252pub use ra_syntax::ast::PrefixOp as UnaryOp;
253pub use ra_syntax::ast::BinOp as BinaryOp; 258pub use ra_syntax::ast::BinOp as BinaryOp;
259pub use ra_syntax::ast::PrefixOp as UnaryOp;
254#[derive(Debug, Clone, Eq, PartialEq)] 260#[derive(Debug, Clone, Eq, PartialEq)]
255pub enum Array { 261pub enum Array {
256 ElementList(Vec<ExprId>), 262 ElementList(Vec<ExprId>),