10 files changed, 308 insertions, 342 deletions
diff --git a/crates/ra_analysis/src/completion/complete_dot.rs b/crates/ra_analysis/src/completion/complete_dot.rs
index 031d8b98f..ef3f4271b 100644
--- a/crates/ra_analysis/src/completion/complete_dot.rs
+++ b/crates/ra_analysis/src/completion/complete_dot.rs
@@ -1,3 +1,4 @@
+use ra_db::LocalSyntaxPtr;
 use ra_syntax::ast::AstNode;
 use hir::{Ty, Def};
@@ -11,11 +12,14 @@ pub(super) fn complete_dot(acc: &mut Completions, ctx: &CompletionContext) -> Ca
        _ => return Ok(()),
    };
    let infer_result = function.infer(ctx.db)?;
-    let receiver_ty = if let Some(ty) = infer_result.type_of_node(receiver.syntax()) {
+    let syntax_mapping = function.body_syntax_mapping(ctx.db)?;
-        ty
+    let expr =
-    } else {
+        if let Some(expr) = syntax_mapping.syntax_expr(LocalSyntaxPtr::new(receiver.syntax())) {
-        return Ok(());
+            expr
-    };
+        } else {
+            return Ok(());
+        };
+    let receiver_ty = infer_result[expr].clone();
    if !ctx.is_method_call {
        complete_fields(acc, ctx, receiver_ty)?;
    }
diff --git a/crates/ra_analysis/src/hover.rs b/crates/ra_analysis/src/hover.rs
index ba1fb9beb..067e5c12d 100644
--- a/crates/ra_analysis/src/hover.rs
+++ b/crates/ra_analysis/src/hover.rs
@@ -64,7 +64,14 @@ pub(crate) fn type_of(db: &RootDatabase, frange: FileRange) -> Cancelable<Option
        parent_fn
    )?);
    let infer = function.infer(db)?;
-    Ok(infer.type_of_node(node).map(|t| t.to_string()))
+    let syntax_mapping = function.body_syntax_mapping(db)?;
+    if let Some(expr) = syntax_mapping.node_expr(node) {
+        Ok(Some(infer[expr].to_string()))
+    } else if let Some(pat) = syntax_mapping.node_pat(node) {
+        Ok(Some(infer[pat].to_string()))
+    } else {
+        Ok(None)
+    }
 }
 // FIXME: this should not really use navigation target. Rather, approximatelly
diff --git a/crates/ra_hir/src/expr.rs b/crates/ra_hir/src/expr.rs
index 6866fc2ac..c87d76735 100644
--- a/crates/ra_hir/src/expr.rs
+++ b/crates/ra_hir/src/expr.rs
@@ -5,7 +5,7 @@ use rustc_hash::FxHashMap;
 use ra_arena::{Arena, RawId, impl_arena_id};
 use ra_db::{LocalSyntaxPtr, Cancelable};
-use ra_syntax::ast::{self, AstNode, LoopBodyOwner, ArgListOwner, NameOwner};
+use ra_syntax::{SyntaxNodeRef, ast::{self, AstNode, LoopBodyOwner, ArgListOwner, NameOwner}};
 use crate::{Path, type_ref::{Mutability, TypeRef}, Name, HirDatabase, DefId, Def, name::AsName};
@@ -77,12 +77,22 @@ impl BodySyntaxMapping {
    pub fn syntax_expr(&self, ptr: LocalSyntaxPtr) -> Option<ExprId> {
        self.expr_syntax_mapping.get(&ptr).cloned()
    }
+    pub fn node_expr(&self, node: SyntaxNodeRef) -> Option<ExprId> {
+        self.expr_syntax_mapping
+            .get(&LocalSyntaxPtr::new(node))
+            .cloned()
+    }
    pub fn pat_syntax(&self, pat: PatId) -> Option<LocalSyntaxPtr> {
        self.pat_syntax_mapping_back.get(&pat).cloned()
    }
    pub fn syntax_pat(&self, ptr: LocalSyntaxPtr) -> Option<PatId> {
        self.pat_syntax_mapping.get(&ptr).cloned()
    }
+    pub fn node_pat(&self, node: SyntaxNodeRef) -> Option<PatId> {
+        self.pat_syntax_mapping
+            .get(&LocalSyntaxPtr::new(node))
+            .cloned()
+    }
    pub fn body(&self) -> &Arc<Body> {
        &self.body
@@ -159,6 +169,11 @@ pub enum Expr {
        expr: ExprId,
        op: Option<UnaryOp>,
    },
+    BinaryOp {
+        lhs: ExprId,
+        rhs: ExprId,
+        op: Option<BinaryOp>,
+    },
    Lambda {
        args: Vec<PatId>,
        arg_types: Vec<Option<TypeRef>>,
@@ -166,7 +181,8 @@ pub enum Expr {
    },
 }
-pub type UnaryOp = ast::PrefixOp;
+pub use ra_syntax::ast::PrefixOp as UnaryOp;
+pub use ra_syntax::ast::BinOp as BinaryOp;
 #[derive(Debug, Clone, Eq, PartialEq)]
 pub struct MatchArm {
@@ -266,6 +282,10 @@ impl Expr {
            Expr::Lambda { body, .. } => {
                f(*body);
            }
+            Expr::BinaryOp { lhs, rhs, .. } => {
+                f(*lhs);
+                f(*rhs);
+            }
            Expr::Field { expr, .. }
            | Expr::Try { expr }
            | Expr::Cast { expr, .. }
@@ -586,6 +606,12 @@ impl ExprCollector {
                    syntax_ptr,
                )
            }
+            ast::Expr::BinExpr(e) => {
+                let lhs = self.collect_expr_opt(e.lhs());
+                let rhs = self.collect_expr_opt(e.rhs());
+                let op = e.op();
+                self.alloc_expr(Expr::BinaryOp { lhs, rhs, op }, syntax_ptr)
+            }
            // TODO implement HIR for these:
            ast::Expr::Label(_e) => self.alloc_expr(Expr::Missing, syntax_ptr),
@@ -593,7 +619,6 @@ impl ExprCollector {
            ast::Expr::TupleExpr(_e) => self.alloc_expr(Expr::Missing, syntax_ptr),
            ast::Expr::ArrayExpr(_e) => self.alloc_expr(Expr::Missing, syntax_ptr),
            ast::Expr::RangeExpr(_e) => self.alloc_expr(Expr::Missing, syntax_ptr),
-            ast::Expr::BinExpr(_e) => self.alloc_expr(Expr::Missing, syntax_ptr),
            ast::Expr::Literal(_e) => self.alloc_expr(Expr::Missing, syntax_ptr),
        }
    }
diff --git a/crates/ra_hir/src/ty.rs b/crates/ra_hir/src/ty.rs
index b685259d7..6bdfdd7b4 100644
--- a/crates/ra_hir/src/ty.rs
+++ b/crates/ra_hir/src/ty.rs
@@ -17,6 +17,7 @@ mod primitive;
 #[cfg(test)]
 mod tests;
+use std::ops::Index;
 use std::sync::Arc;
 use std::{fmt, mem};
@@ -24,18 +25,15 @@ use log;
 use rustc_hash::FxHashMap;
 use ena::unify::{InPlaceUnificationTable, UnifyKey, UnifyValue, NoError};
-use ra_db::{LocalSyntaxPtr, Cancelable};
+use ra_db::Cancelable;
-use ra_syntax::{
-    ast::{self, AstNode, LoopBodyOwner, ArgListOwner, PrefixOp, BinOp},
-    SyntaxNodeRef
-};
 use crate::{
-    Def, DefId, Module, Function, Struct, Enum, Path, Name, AsName, ImplBlock,
+    Def, DefId, Module, Function, Struct, Enum, Path, Name, ImplBlock,
+    FnSignature, FnScopes,
    db::HirDatabase,
    type_ref::{TypeRef, Mutability},
    name::KnownName,
-    ScopesWithSyntaxMapping,
+    expr::{Body, Expr, ExprId, PatId, UnaryOp, BinaryOp, Statement},
 };
 /// The ID of a type variable.
@@ -82,9 +80,10 @@ impl UnifyValue for TypeVarValue {
        match (value1, value2) {
            // We should never equate two type variables, both of which have
            // known types. Instead, we recursively equate those types.
-            (TypeVarValue::Known(..), TypeVarValue::Known(..)) => {
+            (TypeVarValue::Known(t1), TypeVarValue::Known(t2)) => panic!(
-                panic!("equating two type variables, both of which have known types")
+                "equating two type variables, both of which have known types: {:?} and {:?}",
-            }
+                t1, t2
+            ),
            // If one side is known, prefer that one.
            (TypeVarValue::Known(..), TypeVarValue::Unknown) => Ok(value1.clone()),
@@ -321,26 +320,6 @@ impl Ty {
        Ok(ty)
    }
-    // TODO: These should not be necessary long-term, since everything will work on HIR
-    pub(crate) fn from_ast_opt(
-        db: &impl HirDatabase,
-        module: &Module,
-        impl_block: Option<&ImplBlock>,
-        node: Option<ast::TypeRef>,
-    ) -> Cancelable<Self> {
-        node.map(|n| Ty::from_ast(db, module, impl_block, n))
-            .unwrap_or(Ok(Ty::Unknown))
-    }
-    pub(crate) fn from_ast(
-        db: &impl HirDatabase,
-        module: &Module,
-        impl_block: Option<&ImplBlock>,
-        node: ast::TypeRef,
-    ) -> Cancelable<Self> {
-        Ty::from_hir(db, module, impl_block, &TypeRef::from_ast(node))
-    }
    pub fn unit() -> Self {
        Ty::Tuple(Arc::new([]))
    }
@@ -417,26 +396,18 @@ impl fmt::Display for Ty {
 // Functions returning declared types for items
 /// Compute the declared type of a function. This should not need to look at the
-/// function body (but currently uses the function AST, so does anyway - TODO).
+/// function body.
 fn type_for_fn(db: &impl HirDatabase, f: Function) -> Cancelable<Ty> {
-    let syntax = f.syntax(db);
+    let signature = f.signature(db);
    let module = f.module(db)?;
    let impl_block = f.impl_block(db)?;
-    let node = syntax.borrowed();
    // TODO we ignore type parameters for now
-    let input = node
+    let input = signature
-        .param_list()
+        .args()
-        .map(|pl| {
+        .iter()
-            pl.params()
+        .map(|tr| Ty::from_hir(db, &module, impl_block.as_ref(), tr))
-                .map(|p| Ty::from_ast_opt(db, &module, impl_block.as_ref(), p.type_ref()))
+        .collect::<Cancelable<Vec<_>>>()?;
-                .collect()
+    let output = Ty::from_hir(db, &module, impl_block.as_ref(), signature.ret_type())?;
-        })
-        .unwrap_or_else(|| Ok(Vec::new()))?;
-    let output = if let Some(type_ref) = node.ret_type().and_then(|rt| rt.type_ref()) {
-        Ty::from_ast(db, &module, impl_block.as_ref(), type_ref)?
-    } else {
-        Ty::unit()
-    };
    let sig = FnSig { input, output };
    Ok(Ty::FnPtr(Arc::new(sig)))
 }
@@ -499,16 +470,23 @@ pub(super) fn type_for_field(db: &impl HirDatabase, def_id: DefId, field: Name)
 /// The result of type inference: A mapping from expressions and patterns to types.
 #[derive(Clone, PartialEq, Eq, Debug)]
 pub struct InferenceResult {
-    type_of: FxHashMap<LocalSyntaxPtr, Ty>,
+    type_of_expr: FxHashMap<ExprId, Ty>,
+    type_of_pat: FxHashMap<PatId, Ty>,
 }
-impl InferenceResult {
+impl Index<ExprId> for InferenceResult {
-    /// Returns the type of the given syntax node, if it was inferred. Will
+    type Output = Ty;
-    /// return `None` for syntax nodes not in the inferred function or not
-    /// pointing to an expression/pattern, `Some(Ty::Unknown)` for
+    fn index(&self, expr: ExprId) -> &Ty {
-    /// expressions/patterns that could not be inferred.
+        self.type_of_expr.get(&expr).unwrap_or(&Ty::Unknown)
-    pub fn type_of_node(&self, node: SyntaxNodeRef) -> Option<Ty> {
+    }
-        self.type_of.get(&LocalSyntaxPtr::new(node)).cloned()
+}
+impl Index<PatId> for InferenceResult {
+    type Output = Ty;
+    fn index(&self, pat: PatId) -> &Ty {
+        self.type_of_pat.get(&pat).unwrap_or(&Ty::Unknown)
    }
 }
@@ -516,44 +494,46 @@ impl InferenceResult {
 #[derive(Clone, Debug)]
 struct InferenceContext<'a, D: HirDatabase> {
    db: &'a D,
-    scopes: ScopesWithSyntaxMapping,
+    body: Arc<Body>,
-    /// The self param for the current method, if it exists.
+    scopes: Arc<FnScopes>,
-    self_param: Option<LocalSyntaxPtr>,
    module: Module,
    impl_block: Option<ImplBlock>,
    var_unification_table: InPlaceUnificationTable<TypeVarId>,
-    type_of: FxHashMap<LocalSyntaxPtr, Ty>,
+    type_of_expr: FxHashMap<ExprId, Ty>,
+    type_of_pat: FxHashMap<PatId, Ty>,
    /// The return type of the function being inferred.
    return_ty: Ty,
 }
 // helper function that determines whether a binary operator
 // always returns a boolean
-fn is_boolean_operator(op: BinOp) -> bool {
+fn is_boolean_operator(op: BinaryOp) -> bool {
    match op {
-        BinOp::BooleanOr
+        BinaryOp::BooleanOr
-        | BinOp::BooleanAnd
+        | BinaryOp::BooleanAnd
-        | BinOp::EqualityTest
+        | BinaryOp::EqualityTest
-        | BinOp::LesserEqualTest
+        | BinaryOp::LesserEqualTest
-        | BinOp::GreaterEqualTest
+        | BinaryOp::GreaterEqualTest
-        | BinOp::LesserTest
+        | BinaryOp::LesserTest
-        | BinOp::GreaterTest => true,
+        | BinaryOp::GreaterTest => true,
    }
 }
 impl<'a, D: HirDatabase> InferenceContext<'a, D> {
    fn new(
        db: &'a D,
-        scopes: ScopesWithSyntaxMapping,
+        body: Arc<Body>,
+        scopes: Arc<FnScopes>,
        module: Module,
        impl_block: Option<ImplBlock>,
    ) -> Self {
        InferenceContext {
-            type_of: FxHashMap::default(),
+            type_of_expr: FxHashMap::default(),
+            type_of_pat: FxHashMap::default(),
            var_unification_table: InPlaceUnificationTable::new(),
-            self_param: None,       // set during parameter typing
            return_ty: Ty::Unknown, // set in collect_fn_signature
            db,
+            body,
            scopes,
            module,
            impl_block,
@@ -561,24 +541,32 @@ impl<'a, D: HirDatabase> InferenceContext<'a, D> {
    }
    fn resolve_all(mut self) -> InferenceResult {
-        let mut types = mem::replace(&mut self.type_of, FxHashMap::default());
+        let mut expr_types = mem::replace(&mut self.type_of_expr, FxHashMap::default());
-        for ty in types.values_mut() {
+        for ty in expr_types.values_mut() {
+            let resolved = self.resolve_ty_completely(mem::replace(ty, Ty::Unknown));
+            *ty = resolved;
+        }
+        let mut pat_types = mem::replace(&mut self.type_of_pat, FxHashMap::default());
+        for ty in pat_types.values_mut() {
            let resolved = self.resolve_ty_completely(mem::replace(ty, Ty::Unknown));
            *ty = resolved;
        }
-        InferenceResult { type_of: types }
+        InferenceResult {
+            type_of_expr: expr_types,
+            type_of_pat: pat_types,
+        }
    }
-    fn write_ty(&mut self, node: SyntaxNodeRef, ty: Ty) {
+    fn write_expr_ty(&mut self, expr: ExprId, ty: Ty) {
-        self.type_of.insert(LocalSyntaxPtr::new(node), ty);
+        self.type_of_expr.insert(expr, ty);
    }
-    fn make_ty(&self, type_ref: &TypeRef) -> Cancelable<Ty> {
+    fn write_pat_ty(&mut self, pat: PatId, ty: Ty) {
-        Ty::from_hir(self.db, &self.module, self.impl_block.as_ref(), type_ref)
+        self.type_of_pat.insert(pat, ty);
    }
-    fn make_ty_opt(&self, type_ref: Option<&TypeRef>) -> Cancelable<Ty> {
+    fn make_ty(&self, type_ref: &TypeRef) -> Cancelable<Ty> {
-        Ty::from_hir_opt(self.db, &self.module, self.impl_block.as_ref(), type_ref)
+        Ty::from_hir(self.db, &self.module, self.impl_block.as_ref(), type_ref)
    }
    fn unify(&mut self, ty1: &Ty, ty2: &Ty) -> bool {
@@ -673,23 +661,15 @@ impl<'a, D: HirDatabase> InferenceContext<'a, D> {
        })
    }
-    fn infer_path_expr(&mut self, expr: ast::PathExpr) -> Cancelable<Option<Ty>> {
+    fn infer_path_expr(&mut self, expr: ExprId, path: &Path) -> Cancelable<Option<Ty>> {
-        let ast_path = ctry!(expr.path());
+        if path.is_ident() || path.is_self() {
-        let path = ctry!(Path::from_ast(ast_path));
-        if path.is_ident() {
            // resolve locally
-            let name = ctry!(ast_path.segment().and_then(|s| s.name_ref()));
+            let name = path.as_ident().cloned().unwrap_or_else(Name::self_param);
-            if let Some(scope_entry) = self.scopes.resolve_local_name(name) {
+            if let Some(scope_entry) = self.scopes.resolve_local_name(expr, name) {
-                let ty = ctry!(self.type_of.get(&scope_entry.ptr()));
+                let ty = ctry!(self.type_of_pat.get(&scope_entry.pat()));
                let ty = self.resolve_ty_as_possible(ty.clone());
                return Ok(Some(ty));
            };
-        } else if path.is_self() {
-            // resolve `self` param
-            let self_param = ctry!(self.self_param);
-            let ty = ctry!(self.type_of.get(&self_param));
-            let ty = self.resolve_ty_as_possible(ty.clone());
-            return Ok(Some(ty));
        };
        // resolve in module
@@ -699,8 +679,8 @@ impl<'a, D: HirDatabase> InferenceContext<'a, D> {
        Ok(Some(ty))
    }
-    fn resolve_variant(&self, path: Option<ast::Path>) -> Cancelable<(Ty, Option<DefId>)> {
+    fn resolve_variant(&self, path: Option<&Path>) -> Cancelable<(Ty, Option<DefId>)> {
-        let path = if let Some(path) = path.and_then(Path::from_ast) {
+        let path = if let Some(path) = path {
            path
        } else {
            return Ok((Ty::Unknown, None));
@@ -719,74 +699,51 @@ impl<'a, D: HirDatabase> InferenceContext<'a, D> {
        })
    }
-    fn infer_expr_opt(
+    fn infer_expr(&mut self, expr: ExprId, expected: &Expectation) -> Cancelable<Ty> {
-        &mut self,
+        let body = Arc::clone(&self.body); // avoid borrow checker problem
-        expr: Option<ast::Expr>,
+        let ty = match &body[expr] {
-        expected: &Expectation,
+            Expr::Missing => Ty::Unknown,
-    ) -> Cancelable<Ty> {
+            Expr::If {
-        if let Some(e) = expr {
+                condition,
-            self.infer_expr(e, expected)
+                then_branch,
-        } else {
+                else_branch,
-            Ok(Ty::Unknown)
+            } => {
-        }
+                // if let is desugared to match, so this is always simple if
-    }
+                self.infer_expr(*condition, &Expectation::has_type(Ty::Bool))?;
+                let then_ty = self.infer_expr(*then_branch, expected)?;
-    fn infer_expr(&mut self, expr: ast::Expr, expected: &Expectation) -> Cancelable<Ty> {
+                if let Some(else_branch) = else_branch {
-        let ty = match expr {
+                    self.infer_expr(*else_branch, expected)?;
-            ast::Expr::IfExpr(e) => {
-                if let Some(condition) = e.condition() {
-                    let expected = if condition.pat().is_none() {
-                        Expectation::has_type(Ty::Bool)
-                    } else {
-                        Expectation::none()
-                    };
-                    self.infer_expr_opt(condition.expr(), &expected)?;
-                    // TODO write type for pat
-                };
-                let if_ty = self.infer_block_opt(e.then_branch(), expected)?;
-                if let Some(else_branch) = e.else_branch() {
-                    self.infer_block(else_branch, expected)?;
                } else {
                    // no else branch -> unit
                    self.unify(&expected.ty, &Ty::unit()); // actually coerce
                }
-                if_ty
+                then_ty
            }
-            ast::Expr::BlockExpr(e) => self.infer_block_opt(e.block(), expected)?,
+            Expr::Block { statements, tail } => self.infer_block(statements, *tail, expected)?,
-            ast::Expr::LoopExpr(e) => {
+            Expr::Loop { body } => {
-                self.infer_block_opt(e.loop_body(), &Expectation::has_type(Ty::unit()))?;
+                self.infer_expr(*body, &Expectation::has_type(Ty::unit()))?;
-                // TODO never, or the type of the break param
+                // TODO handle break with value
-                Ty::Unknown
+                Ty::Never
            }
-            ast::Expr::WhileExpr(e) => {
+            Expr::While { condition, body } => {
-                if let Some(condition) = e.condition() {
+                // while let is desugared to a match loop, so this is always simple while
-                    let expected = if condition.pat().is_none() {
+                self.infer_expr(*condition, &Expectation::has_type(Ty::Bool))?;
-                        Expectation::has_type(Ty::Bool)
+                self.infer_expr(*body, &Expectation::has_type(Ty::unit()))?;
-                    } else {
-                        Expectation::none()
-                    };
-                    self.infer_expr_opt(condition.expr(), &expected)?;
-                    // TODO write type for pat
-                };
-                self.infer_block_opt(e.loop_body(), &Expectation::has_type(Ty::unit()))?;
-                // TODO always unit?
                Ty::unit()
            }
-            ast::Expr::ForExpr(e) => {
+            Expr::For { iterable, body, .. } => {
-                let _iterable_ty = self.infer_expr_opt(e.iterable(), &Expectation::none());
+                let _iterable_ty = self.infer_expr(*iterable, &Expectation::none());
-                if let Some(_pat) = e.pat() {
+                // TODO write type for pat
-                    // TODO write type for pat
+                self.infer_expr(*body, &Expectation::has_type(Ty::unit()))?;
-                }
-                self.infer_block_opt(e.loop_body(), &Expectation::has_type(Ty::unit()))?;
-                // TODO always unit?
                Ty::unit()
            }
-            ast::Expr::LambdaExpr(e) => {
+            Expr::Lambda { body, .. } => {
-                let _body_ty = self.infer_expr_opt(e.body(), &Expectation::none())?;
+                // TODO write types for args, infer lambda type etc.
+                let _body_ty = self.infer_expr(*body, &Expectation::none())?;
                Ty::Unknown
            }
-            ast::Expr::CallExpr(e) => {
+            Expr::Call { callee, args } => {
-                let callee_ty = self.infer_expr_opt(e.expr(), &Expectation::none())?;
+                let callee_ty = self.infer_expr(*callee, &Expectation::none())?;
                let (arg_tys, ret_ty) = match &callee_ty {
                    Ty::FnPtr(sig) => (&sig.input[..], sig.output.clone()),
                    _ => {
@@ -795,112 +752,102 @@ impl<'a, D: HirDatabase> InferenceContext<'a, D> {
                        (&[][..], Ty::Unknown)
                    }
                };
-                if let Some(arg_list) = e.arg_list() {
+                for (i, arg) in args.iter().enumerate() {
-                    for (i, arg) in arg_list.args().enumerate() {
+                    self.infer_expr(
-                        self.infer_expr(
+                        *arg,
-                            arg,
+                        &Expectation::has_type(arg_tys.get(i).cloned().unwrap_or(Ty::Unknown)),
-                            &Expectation::has_type(arg_tys.get(i).cloned().unwrap_or(Ty::Unknown)),
+                    )?;
-                        )?;
-                    }
                }
                ret_ty
            }
-            ast::Expr::MethodCallExpr(e) => {
+            Expr::MethodCall { receiver, args, .. } => {
-                let _receiver_ty = self.infer_expr_opt(e.expr(), &Expectation::none())?;
+                let _receiver_ty = self.infer_expr(*receiver, &Expectation::none())?;
-                if let Some(arg_list) = e.arg_list() {
+                // TODO resolve method...
-                    for arg in arg_list.args() {
+                for (_i, arg) in args.iter().enumerate() {
-                        // TODO unify / expect argument type
+                    // TODO unify / expect argument type
-                        self.infer_expr(arg, &Expectation::none())?;
+                    self.infer_expr(*arg, &Expectation::none())?;
-                    }
                }
                Ty::Unknown
            }
-            ast::Expr::MatchExpr(e) => {
+            Expr::Match { expr, arms } => {
-                let _ty = self.infer_expr_opt(e.expr(), &Expectation::none())?;
+                let _ty = self.infer_expr(*expr, &Expectation::none())?;
-                if let Some(match_arm_list) = e.match_arm_list() {
+                for arm in arms {
-                    for arm in match_arm_list.arms() {
+                    // TODO type the bindings in pats
-                        // TODO type the bindings in pat
+                    // TODO type the guard
-                        // TODO type the guard
+                    let _ty = self.infer_expr(arm.expr, &Expectation::none())?;
-                        let _ty = self.infer_expr_opt(arm.expr(), &Expectation::none())?;
-                    }
-                    // TODO unify all the match arm types
-                    Ty::Unknown
-                } else {
-                    Ty::Unknown
                }
+                // TODO unify all the match arm types
+                Ty::Unknown
            }
-            ast::Expr::TupleExpr(_e) => Ty::Unknown,
+            Expr::Path(p) => self.infer_path_expr(expr, p)?.unwrap_or(Ty::Unknown),
-            ast::Expr::ArrayExpr(_e) => Ty::Unknown,
+            Expr::Continue => Ty::Never,
-            ast::Expr::PathExpr(e) => self.infer_path_expr(e)?.unwrap_or(Ty::Unknown),
+            Expr::Break { expr } => {
-            ast::Expr::ContinueExpr(_e) => Ty::Never,
+                if let Some(expr) = expr {
-            ast::Expr::BreakExpr(_e) => Ty::Never,
+                    // TODO handle break with value
-            ast::Expr::ParenExpr(e) => self.infer_expr_opt(e.expr(), expected)?,
+                    self.infer_expr(*expr, &Expectation::none())?;
-            ast::Expr::Label(_e) => Ty::Unknown,
+                }
-            ast::Expr::ReturnExpr(e) => {
-                // TODO expect return type of function
-                self.infer_expr_opt(e.expr(), &Expectation::none())?;
                Ty::Never
            }
-            ast::Expr::StructLit(e) => {
+            Expr::Return { expr } => {
-                let (ty, def_id) = self.resolve_variant(e.path())?;
+                if let Some(expr) = expr {
-                if let Some(nfl) = e.named_field_list() {
+                    self.infer_expr(*expr, &Expectation::has_type(self.return_ty.clone()))?;
-                    for field in nfl.fields() {
-                        let field_ty = if let (Some(def_id), Some(nr)) = (def_id, field.name_ref())
-                        {
-                            self.db.type_for_field(def_id, nr.as_name())?
-                        } else {
-                            Ty::Unknown
-                        };
-                        self.infer_expr_opt(field.expr(), &Expectation::has_type(field_ty))?;
-                    }
                }
-                ty
+                Ty::Never
            }
-            ast::Expr::IndexExpr(_e) => Ty::Unknown,
+            Expr::StructLit {
-            ast::Expr::FieldExpr(e) => {
+                path,
-                let receiver_ty = self.infer_expr_opt(e.expr(), &Expectation::none())?;
+                fields,
-                if let Some(nr) = e.name_ref() {
+                spread,
-                    let ty = match receiver_ty {
+            } => {
-                        Ty::Tuple(fields) => {
+                let (ty, def_id) = self.resolve_variant(path.as_ref())?;
-                            let i = nr.text().parse::<usize>().ok();
+                for field in fields {
-                            i.and_then(|i| fields.get(i).cloned())
+                    let field_ty = if let Some(def_id) = def_id {
-                                .unwrap_or(Ty::Unknown)
+                        self.db.type_for_field(def_id, field.name.clone())?
-                        }
+                    } else {
-                        Ty::Adt { def_id, .. } => self.db.type_for_field(def_id, nr.as_name())?,
+                        Ty::Unknown
-                        _ => Ty::Unknown,
                    };
-                    self.insert_type_vars(ty)
+                    self.infer_expr(field.expr, &Expectation::has_type(field_ty))?;
-                } else {
+                }
-                    Ty::Unknown
+                if let Some(expr) = spread {
+                    self.infer_expr(*expr, &Expectation::has_type(ty.clone()))?;
                }
+                ty
+            }
+            Expr::Field { expr, name } => {
+                let receiver_ty = self.infer_expr(*expr, &Expectation::none())?;
+                let ty = match receiver_ty {
+                    Ty::Tuple(fields) => {
+                        let i = name.to_string().parse::<usize>().ok();
+                        i.and_then(|i| fields.get(i).cloned())
+                            .unwrap_or(Ty::Unknown)
+                    }
+                    Ty::Adt { def_id, .. } => self.db.type_for_field(def_id, name.clone())?,
+                    _ => Ty::Unknown,
+                };
+                self.insert_type_vars(ty)
            }
-            ast::Expr::TryExpr(e) => {
+            Expr::Try { expr } => {
-                let _inner_ty = self.infer_expr_opt(e.expr(), &Expectation::none())?;
+                let _inner_ty = self.infer_expr(*expr, &Expectation::none())?;
                Ty::Unknown
            }
-            ast::Expr::CastExpr(e) => {
+            Expr::Cast { expr, type_ref } => {
-                let _inner_ty = self.infer_expr_opt(e.expr(), &Expectation::none())?;
+                let _inner_ty = self.infer_expr(*expr, &Expectation::none())?;
-                let cast_ty = Ty::from_ast_opt(
+                let cast_ty =
-                    self.db,
+                    Ty::from_hir(self.db, &self.module, self.impl_block.as_ref(), type_ref)?;
-                    &self.module,
-                    self.impl_block.as_ref(),
-                    e.type_ref(),
-                )?;
                let cast_ty = self.insert_type_vars(cast_ty);
-                // TODO do the coercion...
+                // TODO check the cast...
                cast_ty
            }
-            ast::Expr::RefExpr(e) => {
+            Expr::Ref { expr, mutability } => {
                // TODO pass the expectation down
-                let inner_ty = self.infer_expr_opt(e.expr(), &Expectation::none())?;
+                let inner_ty = self.infer_expr(*expr, &Expectation::none())?;
-                let m = Mutability::from_mutable(e.is_mut());
                // TODO reference coercions etc.
-                Ty::Ref(Arc::new(inner_ty), m)
+                Ty::Ref(Arc::new(inner_ty), *mutability)
            }
-            ast::Expr::PrefixExpr(e) => {
+            Expr::UnaryOp { expr, op } => {
-                let inner_ty = self.infer_expr_opt(e.expr(), &Expectation::none())?;
+                let inner_ty = self.infer_expr(*expr, &Expectation::none())?;
-                match e.op() {
+                match op {
-                    Some(PrefixOp::Deref) => {
+                    Some(UnaryOp::Deref) => {
                        match inner_ty {
                            // builtin deref:
                            Ty::Ref(ref_inner, _) => (*ref_inner).clone(),
@@ -912,18 +859,18 @@ impl<'a, D: HirDatabase> InferenceContext<'a, D> {
                    _ => Ty::Unknown,
                }
            }
-            ast::Expr::RangeExpr(_e) => Ty::Unknown,
+            Expr::BinaryOp { lhs, rhs, op } => match op {
-            ast::Expr::BinExpr(e) => match e.op() {
                Some(op) => {
                    let subtype_expectation = match op {
-                        BinOp::BooleanAnd | BinOp::BooleanOr => Expectation::has_type(Ty::Bool),
+                        BinaryOp::BooleanAnd | BinaryOp::BooleanOr => {
+                            Expectation::has_type(Ty::Bool)
+                        }
                        _ => Expectation::none(),
                    };
-                    let (lhs, rhs) = e.sub_exprs();
+                    let _lhs_ty = self.infer_expr(*lhs, &subtype_expectation)?;
-                    let _lhs_ty = self.infer_expr_opt(lhs, &subtype_expectation)?;
+                    let _rhs_ty = self.infer_expr(*rhs, &subtype_expectation)?;
-                    let _rhs_ty = self.infer_expr_opt(rhs, &subtype_expectation)?;
-                    if is_boolean_operator(op) {
+                    if is_boolean_operator(*op) {
                        Ty::Bool
                    } else {
                        Ty::Unknown
@@ -931,128 +878,93 @@ impl<'a, D: HirDatabase> InferenceContext<'a, D> {
                }
                _ => Ty::Unknown,
            },
-            ast::Expr::Literal(_e) => Ty::Unknown,
        };
        // use a new type variable if we got Ty::Unknown here
        let ty = self.insert_type_vars_shallow(ty);
        self.unify(&ty, &expected.ty);
-        self.write_ty(expr.syntax(), ty.clone());
+        let ty = self.resolve_ty_as_possible(ty);
+        self.write_expr_ty(expr, ty.clone());
        Ok(ty)
    }
-    fn infer_block_opt(
+    fn infer_block(
        &mut self,
-        node: Option<ast::Block>,
+        statements: &[Statement],
+        tail: Option<ExprId>,
        expected: &Expectation,
    ) -> Cancelable<Ty> {
-        if let Some(b) = node {
+        for stmt in statements {
-            self.infer_block(b, expected)
-        } else {
-            Ok(Ty::Unknown)
-        }
-    }
-    fn infer_block(&mut self, node: ast::Block, expected: &Expectation) -> Cancelable<Ty> {
-        for stmt in node.statements() {
            match stmt {
-                ast::Stmt::LetStmt(stmt) => {
+                Statement::Let {
-                    let decl_ty = Ty::from_ast_opt(
+                    pat,
+                    type_ref,
+                    initializer,
+                } => {
+                    let decl_ty = Ty::from_hir_opt(
                        self.db,
                        &self.module,
                        self.impl_block.as_ref(),
-                        stmt.type_ref(),
+                        type_ref.as_ref(),
                    )?;
                    let decl_ty = self.insert_type_vars(decl_ty);
-                    let ty = if let Some(expr) = stmt.initializer() {
+                    let ty = if let Some(expr) = initializer {
-                        let expr_ty = self.infer_expr(expr, &Expectation::has_type(decl_ty))?;
+                        let expr_ty = self.infer_expr(*expr, &Expectation::has_type(decl_ty))?;
                        expr_ty
                    } else {
                        decl_ty
                    };
-                    if let Some(pat) = stmt.pat() {
+                    self.write_pat_ty(*pat, ty);
-                        self.write_ty(pat.syntax(), ty);
-                    };
                }
-                ast::Stmt::ExprStmt(expr_stmt) => {
+                Statement::Expr(expr) => {
-                    self.infer_expr_opt(expr_stmt.expr(), &Expectation::none())?;
+                    self.infer_expr(*expr, &Expectation::none())?;
                }
            }
        }
-        let ty = if let Some(expr) = node.expr() {
+        let ty = if let Some(expr) = tail {
            self.infer_expr(expr, expected)?
        } else {
            Ty::unit()
        };
-        self.write_ty(node.syntax(), ty.clone());
        Ok(ty)
    }
-    fn collect_fn_signature(&mut self, node: ast::FnDef) -> Cancelable<()> {
+    fn collect_fn_signature(&mut self, signature: &FnSignature) -> Cancelable<()> {
-        if let Some(param_list) = node.param_list() {
+        let body = Arc::clone(&self.body); // avoid borrow checker problem
-            if let Some(self_param) = param_list.self_param() {
+        for (type_ref, pat) in signature.args().iter().zip(body.args()) {
-                let self_type = if let Some(type_ref) = self_param.type_ref() {
+            let ty = self.make_ty(type_ref)?;
-                    let ty = self.make_ty(&TypeRef::from_ast(type_ref))?;
+            let ty = self.insert_type_vars(ty);
-                    self.insert_type_vars(ty)
+            self.write_pat_ty(*pat, ty);
-                } else {
-                    // TODO this should be handled by desugaring during HIR conversion
-                    let ty = self.make_ty_opt(self.impl_block.as_ref().map(|i| i.target_type()))?;
-                    let ty = match self_param.flavor() {
-                        ast::SelfParamFlavor::Owned => ty,
-                        ast::SelfParamFlavor::Ref => Ty::Ref(Arc::new(ty), Mutability::Shared),
-                        ast::SelfParamFlavor::MutRef => Ty::Ref(Arc::new(ty), Mutability::Mut),
-                    };
-                    self.insert_type_vars(ty)
-                };
-                if let Some(self_kw) = self_param.self_kw() {
-                    let self_param = LocalSyntaxPtr::new(self_kw.syntax());
-                    self.self_param = Some(self_param);
-                    self.type_of.insert(self_param, self_type);
-                }
-            }
-            for param in param_list.params() {
-                let pat = if let Some(pat) = param.pat() {
-                    pat
-                } else {
-                    continue;
-                };
-                let ty = if let Some(type_ref) = param.type_ref() {
-                    let ty = self.make_ty(&TypeRef::from_ast(type_ref))?;
-                    self.insert_type_vars(ty)
-                } else {
-                    // missing type annotation
-                    self.new_type_var()
-                };
-                self.type_of.insert(LocalSyntaxPtr::new(pat.syntax()), ty);
-            }
        }
+        self.return_ty = {
-        self.return_ty = if let Some(type_ref) = node.ret_type().and_then(|n| n.type_ref()) {
+            let ty = self.make_ty(signature.ret_type())?;
-            let ty = self.make_ty(&TypeRef::from_ast(type_ref))?;
+            let ty = self.insert_type_vars(ty);
-            self.insert_type_vars(ty)
+            ty
-        } else {
-            Ty::unit()
        };
+        Ok(())
+    }
+    fn infer_body(&mut self) -> Cancelable<()> {
+        self.infer_expr(
+            self.body.body_expr(),
+            &Expectation::has_type(self.return_ty.clone()),
+        )?;
        Ok(())
    }
 }
 pub fn infer(db: &impl HirDatabase, def_id: DefId) -> Cancelable<Arc<InferenceResult>> {
    let function = Function::new(def_id); // TODO: consts also need inference
-    let scopes = function.scopes(db)?;
+    let body = function.body(db)?;
+    let scopes = db.fn_scopes(def_id)?;
    let module = function.module(db)?;
    let impl_block = function.impl_block(db)?;
-    let mut ctx = InferenceContext::new(db, scopes, module, impl_block);
+    let mut ctx = InferenceContext::new(db, body, scopes, module, impl_block);
-    let syntax = function.syntax(db);
-    let node = syntax.borrowed();
-    ctx.collect_fn_signature(node)?;
+    let signature = function.signature(db);
+    ctx.collect_fn_signature(&signature)?;
-    if let Some(block) = node.body() {
+    ctx.infer_body()?;
-        ctx.infer_block(block, &Expectation::has_type(ctx.return_ty.clone()))?;
-    }
    Ok(Arc::new(ctx.resolve_all()))
 }
diff --git a/crates/ra_hir/src/ty/tests.rs b/crates/ra_hir/src/ty/tests.rs
index 25a354947..e46f309ae 100644
--- a/crates/ra_hir/src/ty/tests.rs
+++ b/crates/ra_hir/src/ty/tests.rs
@@ -4,8 +4,9 @@ use std::path::{PathBuf, Path};
 use std::fs;
 use salsa::Database;
+use rustc_hash::FxHashMap;
-use ra_db::{SyntaxDatabase};
+use ra_db::SyntaxDatabase;
 use ra_syntax::ast::{self, AstNode};
 use test_utils::{project_dir, assert_eq_text, read_text};
@@ -193,7 +194,25 @@ fn infer(content: &str) -> String {
            .unwrap()
            .unwrap();
        let inference_result = func.infer(&db).unwrap();
-        for (syntax_ptr, ty) in &inference_result.type_of {
+        let body_syntax_mapping = func.body_syntax_mapping(&db).unwrap();
+        let mut types = FxHashMap::default();
+        for (pat, ty) in &inference_result.type_of_pat {
+            let syntax_ptr = if let Some(sp) = body_syntax_mapping.pat_syntax(*pat) {
+                sp
+            } else {
+                continue;
+            };
+            types.insert(syntax_ptr, ty);
+        }
+        for (expr, ty) in &inference_result.type_of_expr {
+            let syntax_ptr = if let Some(sp) = body_syntax_mapping.expr_syntax(*expr) {
+                sp
+            } else {
+                continue;
+            };
+            types.insert(syntax_ptr, ty);
+        }
+        for (syntax_ptr, ty) in &types {
            let node = syntax_ptr.resolve(&source_file);
            write!(
                acc,
@@ -246,7 +265,6 @@ fn test_data_dir() -> PathBuf {
 }
 #[test]
-#[should_panic] // TODO this should work once hir::Expr is used
 fn typing_whitespace_inside_a_function_should_not_invalidate_types() {
    let (mut db, pos) = MockDatabase::with_position(
        "
diff --git a/crates/ra_hir/src/ty/tests/data/0001_basics.txt b/crates/ra_hir/src/ty/tests/data/0001_basics.txt
index 212e92e00..4df6b42c9 100644
--- a/crates/ra_hir/src/ty/tests/data/0001_basics.txt
+++ b/crates/ra_hir/src/ty/tests/data/0001_basics.txt
@@ -8,6 +8,6 @@
 [27; 28) 'c': !
 [62; 63) 'c': !
 [17; 18) 'b': isize
-[100; 106) '"test"': [unknown]
 [42; 121) '{     ...f32; }': ()
+[100; 106) '"test"': [unknown]
 [69; 70) 'd': &[unknown]
diff --git a/crates/ra_hir/src/ty/tests/data/0004_struct.txt b/crates/ra_hir/src/ty/tests/data/0004_struct.txt
index b4af18b87..6f919b332 100644
--- a/crates/ra_hir/src/ty/tests/data/0004_struct.txt
+++ b/crates/ra_hir/src/ty/tests/data/0004_struct.txt
@@ -1,8 +1,8 @@
 [86; 90) 'C(1)': [unknown]
 [121; 122) 'B': B
 [86; 87) 'C': [unknown]
-[129; 130) '1': [unknown]
 [107; 108) 'a': A
+[129; 130) '1': [unknown]
 [127; 128) 'C': [unknown]
 [139; 142) 'a.b': B
 [114; 133) 'A { b:...C(1) }': A
diff --git a/crates/ra_hir/src/ty/tests/data/0005_refs.txt b/crates/ra_hir/src/ty/tests/data/0005_refs.txt
index 296e955c1..cc32162a1 100644
--- a/crates/ra_hir/src/ty/tests/data/0005_refs.txt
+++ b/crates/ra_hir/src/ty/tests/data/0005_refs.txt
@@ -6,9 +6,9 @@
 [46; 47) 'd': *mut u32
 [59; 150) '{     ... *d; }': ()
 [116; 117) 'b': &mut u32
+[72; 74) '*a': u32
 [131; 132) 'c': *const u32
 [130; 132) '*c': u32
-[72; 74) '*a': u32
 [107; 109) '*b': u32
 [108; 109) 'b': &mut u32
 [9; 10) 'a': &u32
@@ -17,7 +17,7 @@
 [100; 101) 'b': &mut u32
 [81; 82) 'a': &u32
 [80; 82) '&a': &&u32
-[73; 74) 'a': &u32
 [123; 124) 'c': *const u32
+[73; 74) 'a': &u32
 [31; 32) 'c': *const u32
 [138; 139) 'd': *mut u32
diff --git a/crates/ra_hir/src/ty/tests/data/0006_backwards.txt b/crates/ra_hir/src/ty/tests/data/0006_backwards.txt
index 120069401..0efae598e 100644
--- a/crates/ra_hir/src/ty/tests/data/0006_backwards.txt
+++ b/crates/ra_hir/src/ty/tests/data/0006_backwards.txt
@@ -1,12 +1,12 @@
 [22; 24) '{}': ()
 [14; 15) 'x': u32
 [142; 158) 'unknow...nction': [unknown]
-[126; 127) 'a': u32
-[198; 216) 'unknow...tion()': f64
 [228; 229) 'c': f64
+[198; 216) 'unknow...tion()': f64
+[126; 127) 'a': u32
 [198; 214) 'unknow...nction': [unknown]
-[166; 184) 'S { i3...d: b }': S
 [222; 229) '&mut &c': &mut &f64
+[166; 184) 'S { i3...d: b }': S
 [194; 195) 'c': f64
 [92; 110) 'unknow...tion()': u32
 [142; 160) 'unknow...tion()': i32
diff --git a/crates/ra_hir/src/ty/tests/data/0008_boolean_op.txt b/crates/ra_hir/src/ty/tests/data/0008_boolean_op.txt
index ca01ad159..0ae172914 100644
--- a/crates/ra_hir/src/ty/tests/data/0008_boolean_op.txt
+++ b/crates/ra_hir/src/ty/tests/data/0008_boolean_op.txt
@@ -1,31 +1,31 @@
 [28; 32) '0i32': i32
 [22; 34) '{     0i32 }': i32
 [6; 7) 'x': [unknown]
-[127; 134) 'CONST_1': [unknown]
 [201; 205) '3i32': bool
+[127; 134) 'CONST_1': [unknown]
 [76; 77) 'y': bool
-[65; 66) 'b': bool
 [60; 66) 'a && b': bool
+[65; 66) 'b': bool
+[229; 231) '10': [unknown]
 [127; 145) 'CONST_...ONST_2': bool
 [182; 183) 'd': [unknown]
-[229; 231) '10': [unknown]
 [209; 222) '"hello world"': bool
 [229; 235) '10 < 3': bool
 [186; 187) 'b': [unknown]
-[159; 172) 'f(z || y) + 5': [unknown]
 [56; 57) 'x': bool
+[159; 172) 'f(z || y) + 5': [unknown]
 [112; 113) 'y': bool
-[201; 222) '3i32 &...world"': bool
 [234; 235) '3': [unknown]
+[201; 222) '3i32 &...world"': bool
 [138; 145) 'CONST_2': [unknown]
 [80; 93) 'true || false': bool
 [46; 237) '{     ... < 3 }': bool
 [197; 198) 'e': bool
 [107; 113) 'x == y': bool
 [88; 93) 'false': bool
-[80; 84) 'true': bool
-[123; 124) 'h': bool
 [155; 156) 'c': [unknown]
+[123; 124) 'h': bool
+[80; 84) 'true': bool
 [103; 104) 'z': bool
 [60; 61) 'a': bool
 [107; 108) 'x': bool