129 files changed, 728 insertions, 2510 deletions
diff --git a/crates/gen_lsp_server/src/msg.rs b/crates/gen_lsp_server/src/msg.rs
index 818111fe7..02c7a1858 100644
--- a/crates/gen_lsp_server/src/msg.rs
+++ b/crates/gen_lsp_server/src/msg.rs
@@ -80,10 +80,7 @@ impl RawMessage {
            #[serde(flatten)]
            msg: RawMessage,
        }
-        let text = to_string(&JsonRpc {
+        let text = to_string(&JsonRpc { jsonrpc: "2.0", msg: self })?;
-            jsonrpc: "2.0",
-            msg: self,
-        })?;
        write_msg_text(w, &text)?;
        Ok(())
    }
@@ -95,11 +92,7 @@ impl RawRequest {
        R: Request,
        R::Params: serde::Serialize,
    {
-        RawRequest {
+        RawRequest { id, method: R::METHOD.to_string(), params: to_value(params).unwrap() }
-            id,
-            method: R::METHOD.to_string(),
-            params: to_value(params).unwrap(),
-        }
    }
    pub fn cast<R>(self) -> ::std::result::Result<(u64, R::Params), RawRequest>
    where
@@ -121,23 +114,11 @@ impl RawResponse {
        R: Request,
        R::Result: serde::Serialize,
    {
-        RawResponse {
+        RawResponse { id, result: Some(to_value(&result).unwrap()), error: None }
-            id,
-            result: Some(to_value(&result).unwrap()),
-            error: None,
-        }
    }
    pub fn err(id: u64, code: i32, message: String) -> RawResponse {
-        let error = RawResponseError {
+        let error = RawResponseError { code, message, data: None };
-            code,
+        RawResponse { id, result: None, error: Some(error) }
-            message,
-            data: None,
-        };
-        RawResponse {
-            id,
-            result: None,
-            error: Some(error),
-        }
    }
 }
@@ -147,10 +128,7 @@ impl RawNotification {
        N: Notification,
        N::Params: serde::Serialize,
    {
-        RawNotification {
+        RawNotification { method: N::METHOD.to_string(), params: to_value(params).unwrap() }
-            method: N::METHOD.to_string(),
-            params: to_value(params).unwrap(),
-        }
    }
    pub fn is<N>(&self) -> bool
    where
@@ -187,9 +165,8 @@ fn read_msg_text(inp: &mut impl BufRead) -> Result<Option<String>> {
        }
        let mut parts = buf.splitn(2, ": ");
        let header_name = parts.next().unwrap();
-        let header_value = parts
+        let header_value =
-            .next()
+            parts.next().ok_or_else(|| format_err!("malformed header: {:?}", buf))?;
-            .ok_or_else(|| format_err!("malformed header: {:?}", buf))?;
        if header_name == "Content-Length" {
            size = Some(header_value.parse::<usize>()?);
        }
diff --git a/crates/gen_lsp_server/src/stdio.rs b/crates/gen_lsp_server/src/stdio.rs
index 5c8e33854..dab2d8da8 100644
--- a/crates/gen_lsp_server/src/stdio.rs
+++ b/crates/gen_lsp_server/src/stdio.rs
@@ -13,9 +13,7 @@ pub fn stdio_transport() -> (Receiver<RawMessage>, Sender<RawMessage>, Threads)
    let writer = thread::spawn(move || {
        let stdout = stdout();
        let mut stdout = stdout.lock();
-        writer_receiver
+        writer_receiver.into_iter().try_for_each(|it| it.write(&mut stdout))?;
-            .into_iter()
-            .try_for_each(|it| it.write(&mut stdout))?;
        Ok(())
    });
    let (reader_sender, reader_receiver) = bounded::<RawMessage>(16);
diff --git a/crates/ra_arena/src/lib.rs b/crates/ra_arena/src/lib.rs
index 97f554838..1c97c2662 100644
--- a/crates/ra_arena/src/lib.rs
+++ b/crates/ra_arena/src/lib.rs
@@ -44,10 +44,7 @@ pub struct Arena<ID: ArenaId, T> {
 impl<ID: ArenaId, T: fmt::Debug> fmt::Debug for Arena<ID, T> {
    fn fmt(&self, fmt: &mut fmt::Formatter) -> fmt::Result {
-        fmt.debug_struct("Arena")
+        fmt.debug_struct("Arena").field("len", &self.len()).field("data", &self.data).finish()
-            .field("len", &self.len())
-            .field("data", &self.data)
-            .finish()
    }
 }
@@ -80,19 +77,13 @@ impl<ID: ArenaId, T> Arena<ID, T> {
        ID::from_raw(id)
    }
    pub fn iter<'a>(&'a self) -> impl Iterator<Item = (ID, &'a T)> {
-        self.data
+        self.data.iter().enumerate().map(|(idx, value)| (ID::from_raw(RawId(idx as u32)), value))
-            .iter()
-            .enumerate()
-            .map(|(idx, value)| (ID::from_raw(RawId(idx as u32)), value))
    }
 }
 impl<ID: ArenaId, T> Default for Arena<ID, T> {
    fn default() -> Arena<ID, T> {
-        Arena {
+        Arena { data: Vec::new(), _ty: PhantomData }
-            data: Vec::new(),
-            _ty: PhantomData,
-        }
    }
 }
@@ -116,9 +107,6 @@ impl<ID: ArenaId, T> FromIterator<T> for Arena<ID, T> {
    where
        I: IntoIterator<Item = T>,
    {
-        Arena {
+        Arena { data: Vec::from_iter(iter), _ty: PhantomData }
-            data: Vec::from_iter(iter),
-            _ty: PhantomData,
-        }
    }
 }
diff --git a/crates/ra_arena/src/map.rs b/crates/ra_arena/src/map.rs
index be80edaf3..b73d4e365 100644
--- a/crates/ra_arena/src/map.rs
+++ b/crates/ra_arena/src/map.rs
@@ -42,10 +42,7 @@ impl<ID: ArenaId, T> ArenaMap<ID, T> {
    }
    pub fn iter(&self) -> impl Iterator<Item = (ID, &T)> {
-        self.v
+        self.v.iter().enumerate().filter_map(|(idx, o)| Some((Self::from_idx(idx), o.as_ref()?)))
-            .iter()
-            .enumerate()
-            .filter_map(|(idx, o)| Some((Self::from_idx(idx), o.as_ref()?)))
    }
    fn to_idx(id: ID) -> usize {
@@ -66,9 +63,6 @@ impl<ID: ArenaId, T> std::ops::Index<ID> for ArenaMap<ID, T> {
 impl<ID, T> Default for ArenaMap<ID, T> {
    fn default() -> Self {
-        ArenaMap {
+        ArenaMap { v: Vec::new(), _ty: PhantomData }
-            v: Vec::new(),
-            _ty: PhantomData,
-        }
    }
 }
diff --git a/crates/ra_assists/src/add_derive.rs b/crates/ra_assists/src/add_derive.rs
index 01a4079f6..caf21e079 100644
--- a/crates/ra_assists/src/add_derive.rs
+++ b/crates/ra_assists/src/add_derive.rs
@@ -30,10 +30,8 @@ pub(crate) fn add_derive(ctx: AssistCtx<impl HirDatabase>) -> Option<Assist> {
 // Insert `derive` after doc comments.
 fn derive_insertion_offset(nominal: &ast::NominalDef) -> Option<TextUnit> {
-    let non_ws_child = nominal
+    let non_ws_child =
-        .syntax()
+        nominal.syntax().children().find(|it| it.kind() != COMMENT && it.kind() != WHITESPACE)?;
-        .children()
-        .find(|it| it.kind() != COMMENT && it.kind() != WHITESPACE)?;
    Some(non_ws_child.range().start())
 }
diff --git a/crates/ra_assists/src/add_impl.rs b/crates/ra_assists/src/add_impl.rs
index 699508f91..f2360bc89 100644
--- a/crates/ra_assists/src/add_impl.rs
+++ b/crates/ra_assists/src/add_impl.rs
@@ -21,17 +21,11 @@ pub(crate) fn add_impl(ctx: AssistCtx<impl HirDatabase>) -> Option<Assist> {
        buf.push_str(" ");
        buf.push_str(name.text().as_str());
        if let Some(type_params) = type_params {
-            let lifetime_params = type_params
+            let lifetime_params =
-                .lifetime_params()
+                type_params.lifetime_params().filter_map(|it| it.lifetime()).map(|it| it.text());
-                .filter_map(|it| it.lifetime())
+            let type_params =
-                .map(|it| it.text());
+                type_params.type_params().filter_map(|it| it.name()).map(|it| it.text());
-            let type_params = type_params
+            join(lifetime_params.chain(type_params)).surround_with("<", ">").to_buf(&mut buf);
-                .type_params()
-                .filter_map(|it| it.name())
-                .map(|it| it.text());
-            join(lifetime_params.chain(type_params))
-                .surround_with("<", ">")
-                .to_buf(&mut buf);
        }
        buf.push_str(" {\n");
        edit.set_cursor(start_offset + TextUnit::of_str(&buf));
@@ -47,11 +41,7 @@ mod tests {
    #[test]
    fn test_add_impl() {
-        check_assist(
+        check_assist(add_impl, "struct Foo {<|>}\n", "struct Foo {}\n\nimpl Foo {\n<|>\n}\n");
-            add_impl,
-            "struct Foo {<|>}\n",
-            "struct Foo {}\n\nimpl Foo {\n<|>\n}\n",
-        );
        check_assist(
            add_impl,
            "struct Foo<T: Clone> {<|>}",
diff --git a/crates/ra_assists/src/assist_ctx.rs b/crates/ra_assists/src/assist_ctx.rs
index 6d09bde52..0bf640241 100644
--- a/crates/ra_assists/src/assist_ctx.rs
+++ b/crates/ra_assists/src/assist_ctx.rs
@@ -69,12 +69,7 @@ impl<'a, DB: HirDatabase> AssistCtx<'a, DB> {
        F: FnOnce(AssistCtx<DB>) -> T,
    {
        let source_file = &db.parse(frange.file_id);
-        let ctx = AssistCtx {
+        let ctx = AssistCtx { db, frange, source_file, should_compute_edit };
-            db,
-            frange,
-            source_file,
-            should_compute_edit,
-        };
        f(ctx)
    }
@@ -83,9 +78,7 @@ impl<'a, DB: HirDatabase> AssistCtx<'a, DB> {
        label: impl Into<String>,
        f: impl FnOnce(&mut AssistBuilder),
    ) -> Option<Assist> {
-        let label = AssistLabel {
+        let label = AssistLabel { label: label.into() };
-            label: label.into(),
-        };
        if !self.should_compute_edit {
            return Some(Assist::Unresolved(label));
        }
@@ -146,9 +139,6 @@ impl AssistBuilder {
    }
    fn build(self) -> AssistAction {
-        AssistAction {
+        AssistAction { edit: self.edit.finish(), cursor_position: self.cursor_position }
-            edit: self.edit.finish(),
-            cursor_position: self.cursor_position,
-        }
    }
 }
diff --git a/crates/ra_assists/src/change_visibility.rs b/crates/ra_assists/src/change_visibility.rs
index 4cd32985e..fa5f231c8 100644
--- a/crates/ra_assists/src/change_visibility.rs
+++ b/crates/ra_assists/src/change_visibility.rs
@@ -81,31 +81,11 @@ mod tests {
    #[test]
    fn change_visibility_adds_pub_crate_to_items() {
-        check_assist(
+        check_assist(change_visibility, "<|>fn foo() {}", "<|>pub(crate) fn foo() {}");
-            change_visibility,
+        check_assist(change_visibility, "f<|>n foo() {}", "<|>pub(crate) fn foo() {}");
-            "<|>fn foo() {}",
+        check_assist(change_visibility, "<|>struct Foo {}", "<|>pub(crate) struct Foo {}");
-            "<|>pub(crate) fn foo() {}",
+        check_assist(change_visibility, "<|>mod foo {}", "<|>pub(crate) mod foo {}");
-        );
+        check_assist(change_visibility, "<|>trait Foo {}", "<|>pub(crate) trait Foo {}");
-        check_assist(
-            change_visibility,
-            "f<|>n foo() {}",
-            "<|>pub(crate) fn foo() {}",
-        );
-        check_assist(
-            change_visibility,
-            "<|>struct Foo {}",
-            "<|>pub(crate) struct Foo {}",
-        );
-        check_assist(
-            change_visibility,
-            "<|>mod foo {}",
-            "<|>pub(crate) mod foo {}",
-        );
-        check_assist(
-            change_visibility,
-            "<|>trait Foo {}",
-            "<|>pub(crate) trait Foo {}",
-        );
        check_assist(change_visibility, "m<|>od {}", "<|>pub(crate) mod {}");
        check_assist(
            change_visibility,
@@ -125,20 +105,12 @@ mod tests {
    #[test]
    fn change_visibility_pub_to_pub_crate() {
-        check_assist(
+        check_assist(change_visibility, "<|>pub fn foo() {}", "<|>pub(crate) fn foo() {}")
-            change_visibility,
-            "<|>pub fn foo() {}",
-            "<|>pub(crate) fn foo() {}",
-        )
    }
    #[test]
    fn change_visibility_pub_crate_to_pub() {
-        check_assist(
+        check_assist(change_visibility, "<|>pub(crate) fn foo() {}", "<|>pub fn foo() {}")
-            change_visibility,
-            "<|>pub(crate) fn foo() {}",
-            "<|>pub fn foo() {}",
-        )
    }
    #[test]
diff --git a/crates/ra_assists/src/fill_match_arms.rs b/crates/ra_assists/src/fill_match_arms.rs
index 9aa37d94c..741f75e2a 100644
--- a/crates/ra_assists/src/fill_match_arms.rs
+++ b/crates/ra_assists/src/fill_match_arms.rs
@@ -27,10 +27,7 @@ pub(crate) fn fill_match_arms(ctx: AssistCtx<impl HirDatabase>) -> Option<Assist
    let node_expr = syntax_mapping.node_expr(expr)?;
    let match_expr_ty = infer_result[node_expr].clone();
    let enum_def = match match_expr_ty {
-        Ty::Adt {
+        Ty::Adt { def_id: AdtDef::Enum(e), .. } => e,
-            def_id: AdtDef::Enum(e),
-            ..
-        } => e,
        _ => return None,
    };
    let enum_name = enum_def.name(ctx.db)?;
diff --git a/crates/ra_assists/src/introduce_variable.rs b/crates/ra_assists/src/introduce_variable.rs
index f587b4fe6..4f7c9f3c2 100644
--- a/crates/ra_assists/src/introduce_variable.rs
+++ b/crates/ra_assists/src/introduce_variable.rs
@@ -81,11 +81,7 @@ fn anchor_stmt(expr: &ast::Expr) -> Option<(&SyntaxNode, bool)> {
            return Some((node, false));
        }
-        if let Some(expr) = node
+        if let Some(expr) = node.parent().and_then(ast::Block::cast).and_then(|it| it.expr()) {
-            .parent()
-            .and_then(ast::Block::cast)
-            .and_then(|it| it.expr())
-        {
            if expr.syntax() == node {
                return Some((node, false));
            }
diff --git a/crates/ra_assists/src/lib.rs b/crates/ra_assists/src/lib.rs
index 555af51bc..881db6347 100644
--- a/crates/ra_assists/src/lib.rs
+++ b/crates/ra_assists/src/lib.rs
@@ -89,9 +89,7 @@ fn all_assists<DB: HirDatabase>() -> &'static [fn(AssistCtx<DB>) -> Option<Assis
 }
 fn non_trivia_sibling(node: &SyntaxNode, direction: Direction) -> Option<&SyntaxNode> {
-    node.siblings(direction)
+    node.siblings(direction).skip(1).find(|node| !node.kind().is_trivia())
-        .skip(1)
-        .find(|node| !node.kind().is_trivia())
 }
 #[cfg(test)]
@@ -110,10 +108,8 @@ mod helpers {
    ) {
        let (before_cursor_pos, before) = extract_offset(before);
        let (db, _source_root, file_id) = MockDatabase::with_single_file(&before);
-        let frange = FileRange {
+        let frange =
-            file_id,
+            FileRange { file_id, range: TextRange::offset_len(before_cursor_pos, 0.into()) };
-            range: TextRange::offset_len(before_cursor_pos, 0.into()),
-        };
        let assist =
            AssistCtx::with_ctx(&db, frange, true, assist).expect("code action is not applicable");
        let action = match assist {
@@ -161,10 +157,8 @@ mod helpers {
    ) {
        let (before_cursor_pos, before) = extract_offset(before);
        let (db, _source_root, file_id) = MockDatabase::with_single_file(&before);
-        let frange = FileRange {
+        let frange =
-            file_id,
+            FileRange { file_id, range: TextRange::offset_len(before_cursor_pos, 0.into()) };
-            range: TextRange::offset_len(before_cursor_pos, 0.into()),
-        };
        let assist = AssistCtx::with_ctx(&db, frange, true, assist);
        assert!(assist.is_none());
    }
diff --git a/crates/ra_assists/src/replace_if_let_with_match.rs b/crates/ra_assists/src/replace_if_let_with_match.rs
index f6af47ec9..683f0d119 100644
--- a/crates/ra_assists/src/replace_if_let_with_match.rs
+++ b/crates/ra_assists/src/replace_if_let_with_match.rs
@@ -30,11 +30,7 @@ fn build_match_expr(
 ) -> String {
    let mut buf = String::new();
    buf.push_str(&format!("match {} {{\n", expr.syntax().text()));
-    buf.push_str(&format!(
+    buf.push_str(&format!("    {} => {}\n", pat1.syntax().text(), format_arm(arm1)));
-        "    {} => {}\n",
-        pat1.syntax().text(),
-        format_arm(arm1)
-    ));
    buf.push_str(&format!("    _ => {}\n", format_arm(arm2)));
    buf.push_str("}");
    buf
diff --git a/crates/ra_assists/src/split_import.rs b/crates/ra_assists/src/split_import.rs
index 7e34be087..fb69cef9c 100644
--- a/crates/ra_assists/src/split_import.rs
+++ b/crates/ra_assists/src/split_import.rs
@@ -8,9 +8,7 @@ use ra_syntax::{
 use crate::{AssistCtx, Assist};
 pub(crate) fn split_import(ctx: AssistCtx<impl HirDatabase>) -> Option<Assist> {
-    let colon_colon = ctx
+    let colon_colon = ctx.leaf_at_offset().find(|leaf| leaf.kind() == COLONCOLON)?;
-        .leaf_at_offset()
-        .find(|leaf| leaf.kind() == COLONCOLON)?;
    let path = colon_colon.parent().and_then(ast::Path::cast)?;
    let top_path = generate(Some(path), |it| it.parent_path()).last()?;
diff --git a/crates/ra_cli/src/main.rs b/crates/ra_cli/src/main.rs
index 6b5be27be..a4debeb48 100644
--- a/crates/ra_cli/src/main.rs
+++ b/crates/ra_cli/src/main.rs
@@ -13,18 +13,8 @@ fn main() -> Result<()> {
        .setting(clap::AppSettings::SubcommandRequiredElseHelp)
        .subcommand(
            SubCommand::with_name("render-test")
-                .arg(
+                .arg(Arg::with_name("line").long("--line").required(true).takes_value(true))
-                    Arg::with_name("line")
+                .arg(Arg::with_name("file").long("--file").required(true).takes_value(true)),
-                        .long("--line")
-                        .required(true)
-                        .takes_value(true),
-                )
-                .arg(
-                    Arg::with_name("file")
-                        .long("--file")
-                        .required(true)
-                        .takes_value(true),
-                ),
        )
        .subcommand(SubCommand::with_name("parse").arg(Arg::with_name("no-dump").long("--no-dump")))
        .subcommand(SubCommand::with_name("symbols"))
@@ -108,8 +98,5 @@ fn selections(file: &SourceFile, start: u32, end: u32) -> String {
        .iter()
        .map(|r| (1 + u32::from(r.start()), 1 + u32::from(r.end())))
        .map(|(s, e)| format!("({} {})", s, e));
-    join(ranges)
+    join(ranges).separator(" ").surround_with("(", ")").to_string()
-        .separator(" ")
-        .surround_with("(", ")")
-        .to_string()
 }
diff --git a/crates/ra_db/src/input.rs b/crates/ra_db/src/input.rs
index 275894252..614325a0f 100644
--- a/crates/ra_db/src/input.rs
+++ b/crates/ra_db/src/input.rs
@@ -64,10 +64,7 @@ struct CrateData {
 impl CrateData {
    fn new(file_id: FileId) -> CrateData {
-        CrateData {
+        CrateData { file_id, dependencies: Vec::new() }
-            file_id,
-            dependencies: Vec::new(),
-        }
    }
    fn add_dep(&mut self, name: SmolStr, crate_id: CrateId) {
@@ -112,10 +109,7 @@ impl CrateGraph {
        self.arena[&crate_id].file_id
    }
    pub fn crate_id_for_crate_root(&self, file_id: FileId) -> Option<CrateId> {
-        let (&crate_id, _) = self
+        let (&crate_id, _) = self.arena.iter().find(|(_crate_id, data)| data.file_id == file_id)?;
-            .arena
-            .iter()
-            .find(|(_crate_id, data)| data.file_id == file_id)?;
        Some(crate_id)
    }
    pub fn dependencies<'a>(
@@ -153,15 +147,9 @@ mod tests {
        let crate1 = graph.add_crate_root(FileId(1u32));
        let crate2 = graph.add_crate_root(FileId(2u32));
        let crate3 = graph.add_crate_root(FileId(3u32));
-        assert!(graph
+        assert!(graph.add_dep(crate1, SmolStr::new("crate2"), crate2).is_ok());
-            .add_dep(crate1, SmolStr::new("crate2"), crate2)
+        assert!(graph.add_dep(crate2, SmolStr::new("crate3"), crate3).is_ok());
-            .is_ok());
+        assert!(graph.add_dep(crate3, SmolStr::new("crate1"), crate1).is_err());
-        assert!(graph
-            .add_dep(crate2, SmolStr::new("crate3"), crate3)
-            .is_ok());
-        assert!(graph
-            .add_dep(crate3, SmolStr::new("crate1"), crate1)
-            .is_err());
    }
    #[test]
@@ -170,11 +158,7 @@ mod tests {
        let crate1 = graph.add_crate_root(FileId(1u32));
        let crate2 = graph.add_crate_root(FileId(2u32));
        let crate3 = graph.add_crate_root(FileId(3u32));
-        assert!(graph
+        assert!(graph.add_dep(crate1, SmolStr::new("crate2"), crate2).is_ok());
-            .add_dep(crate1, SmolStr::new("crate2"), crate2)
+        assert!(graph.add_dep(crate2, SmolStr::new("crate3"), crate3).is_ok());
-            .is_ok());
-        assert!(graph
-            .add_dep(crate2, SmolStr::new("crate3"), crate3)
-            .is_ok());
    }
 }
diff --git a/crates/ra_db/src/lib.rs b/crates/ra_db/src/lib.rs
index 66634e05b..31442713d 100644
--- a/crates/ra_db/src/lib.rs
+++ b/crates/ra_db/src/lib.rs
@@ -94,11 +94,8 @@ pub trait SourceDatabase: CheckCanceled + std::fmt::Debug {
 fn source_root_crates(db: &impl SourceDatabase, id: SourceRootId) -> Arc<Vec<CrateId>> {
    let root = db.source_root(id);
    let graph = db.crate_graph();
-    let res = root
+    let res =
-        .files
+        root.files.values().filter_map(|&it| graph.crate_id_for_crate_root(it)).collect::<Vec<_>>();
-        .values()
-        .filter_map(|&it| graph.crate_id_for_crate_root(it))
-        .collect::<Vec<_>>();
    Arc::new(res)
 }
diff --git a/crates/ra_db/src/loc2id.rs b/crates/ra_db/src/loc2id.rs
index 359cd893d..d27fa7682 100644
--- a/crates/ra_db/src/loc2id.rs
+++ b/crates/ra_db/src/loc2id.rs
@@ -30,10 +30,7 @@ where
    LOC: Clone + Eq + Hash,
 {
    fn default() -> Self {
-        Loc2IdMap {
+        Loc2IdMap { id2loc: Arena::default(), loc2id: FxHashMap::default() }
-            id2loc: Arena::default(),
-            loc2id: FxHashMap::default(),
-        }
    }
 }
@@ -85,9 +82,7 @@ where
    LOC: Clone + Eq + Hash,
 {
    fn default() -> Self {
-        LocationIntener {
+        LocationIntener { map: Default::default() }
-            map: Default::default(),
-        }
    }
 }
diff --git a/crates/ra_hir/src/adt.rs b/crates/ra_hir/src/adt.rs
index c549e2126..6d917bb1b 100644
--- a/crates/ra_hir/src/adt.rs
+++ b/crates/ra_hir/src/adt.rs
@@ -62,10 +62,7 @@ impl StructData {
 }
 fn variants(enum_def: &ast::EnumDef) -> impl Iterator<Item = &ast::EnumVariant> {
-    enum_def
+    enum_def.variant_list().into_iter().flat_map(|it| it.variants())
-        .variant_list()
-        .into_iter()
-        .flat_map(|it| it.variants())
 }
 impl EnumVariant {
@@ -83,9 +80,7 @@ impl EnumVariant {
        (file_id, var)
    }
    pub(crate) fn variant_data(&self, db: &impl PersistentHirDatabase) -> Arc<VariantData> {
-        db.enum_data(self.parent).variants[self.id]
+        db.enum_data(self.parent).variants[self.id].variant_data.clone()
-            .variant_data
-            .clone()
    }
 }
@@ -222,14 +217,12 @@ impl StructField {
        };
        let field_sources = match struct_flavor {
-            ast::StructFlavor::Tuple(fl) => fl
+            ast::StructFlavor::Tuple(fl) => {
-                .fields()
+                fl.fields().map(|it| FieldSource::Pos(it.to_owned())).collect()
-                .map(|it| FieldSource::Pos(it.to_owned()))
+            }
-                .collect(),
+            ast::StructFlavor::Named(fl) => {
-            ast::StructFlavor::Named(fl) => fl
+                fl.fields().map(|it| FieldSource::Named(it.to_owned())).collect()
-                .fields()
+            }
-                .map(|it| FieldSource::Named(it.to_owned()))
-                .collect(),
            ast::StructFlavor::Unit => Vec::new(),
        };
        let field = field_sources
diff --git a/crates/ra_hir/src/code_model_api.rs b/crates/ra_hir/src/code_model_api.rs
index a58bf8f87..cafc5279d 100644
--- a/crates/ra_hir/src/code_model_api.rs
+++ b/crates/ra_hir/src/code_model_api.rs
@@ -71,17 +71,7 @@ pub enum ModuleDef {
    Trait(Trait),
    Type(Type),
 }
-impl_froms!(
+impl_froms!(ModuleDef: Module, Function, Struct, Enum, EnumVariant, Const, Static, Trait, Type);
-    ModuleDef: Module,
-    Function,
-    Struct,
-    Enum,
-    EnumVariant,
-    Const,
-    Static,
-    Trait,
-    Type
-);
 pub enum ModuleSource {
    SourceFile(TreeArc<ast::SourceFile>),
@@ -90,13 +80,8 @@ pub enum ModuleSource {
 #[derive(Clone, Debug, Hash, PartialEq, Eq)]
 pub enum Problem {
-    UnresolvedModule {
+    UnresolvedModule { candidate: RelativePathBuf },
-        candidate: RelativePathBuf,
+    NotDirOwner { move_to: RelativePathBuf, candidate: RelativePathBuf },
-    },
-    NotDirOwner {
-        move_to: RelativePathBuf,
-        candidate: RelativePathBuf,
-    },
 }
 impl Module {
@@ -187,8 +172,7 @@ impl Module {
 impl Docs for Module {
    fn docs(&self, db: &impl HirDatabase) -> Option<Documentation> {
-        self.declaration_source(db)
+        self.declaration_source(db).and_then(|it| docs_from_ast(&*it.1))
-            .and_then(|it| docs_from_ast(&*it.1))
    }
 }
@@ -206,9 +190,7 @@ pub enum FieldSource {
 impl StructField {
    pub fn name(&self, db: &impl HirDatabase) -> Name {
-        self.parent.variant_data(db).fields().unwrap()[self.id]
+        self.parent.variant_data(db).fields().unwrap()[self.id].name.clone()
-            .name
-            .clone()
    }
    pub fn source(&self, db: &impl PersistentHirDatabase) -> (HirFileId, FieldSource) {
@@ -257,10 +239,7 @@ impl Struct {
            .fields()
            .into_iter()
            .flat_map(|it| it.iter())
-            .map(|(id, _)| StructField {
+            .map(|(id, _)| StructField { parent: (*self).into(), id })
-                parent: (*self).into(),
-                id,
-            })
            .collect()
    }
@@ -271,10 +250,7 @@ impl Struct {
            .into_iter()
            .flat_map(|it| it.iter())
            .find(|(_id, data)| data.name == *name)
-            .map(|(id, _)| StructField {
+            .map(|(id, _)| StructField { parent: (*self).into(), id })
-                parent: (*self).into(),
-                id,
-            })
    }
    pub fn generic_params(&self, db: &impl PersistentHirDatabase) -> Arc<GenericParams> {
@@ -292,11 +268,7 @@ impl Struct {
        let r = self.module(db).resolver(db);
        // ...and add generic params, if present
        let p = self.generic_params(db);
-        let r = if !p.params.is_empty() {
+        let r = if !p.params.is_empty() { r.push_generic_params_scope(p) } else { r };
-            r.push_generic_params_scope(p)
-        } else {
-            r
-        };
        r
    }
 }
@@ -356,11 +328,7 @@ impl Enum {
        let r = self.module(db).resolver(db);
        // ...and add generic params, if present
        let p = self.generic_params(db);
-        let r = if !p.params.is_empty() {
+        let r = if !p.params.is_empty() { r.push_generic_params_scope(p) } else { r };
-            r.push_generic_params_scope(p)
-        } else {
-            r
-        };
        r
    }
 }
@@ -400,10 +368,7 @@ impl EnumVariant {
            .fields()
            .into_iter()
            .flat_map(|it| it.iter())
-            .map(|(id, _)| StructField {
+            .map(|(id, _)| StructField { parent: (*self).into(), id })
-                parent: (*self).into(),
-                id,
-            })
            .collect()
    }
@@ -413,10 +378,7 @@ impl EnumVariant {
            .into_iter()
            .flat_map(|it| it.iter())
            .find(|(_id, data)| data.name == *name)
-            .map(|(id, _)| StructField {
+            .map(|(id, _)| StructField { parent: (*self).into(), id })
-                parent: (*self).into(),
-                id,
-            })
    }
 }
@@ -488,10 +450,7 @@ impl Function {
    pub fn scopes(&self, db: &impl HirDatabase) -> ScopesWithSyntaxMapping {
        let scopes = db.expr_scopes(*self);
        let syntax_mapping = db.body_syntax_mapping(*self);
-        ScopesWithSyntaxMapping {
+        ScopesWithSyntaxMapping { scopes, syntax_mapping }
-            scopes,
-            syntax_mapping,
-        }
    }
    pub fn signature(&self, db: &impl HirDatabase) -> Arc<FnSignature> {
@@ -516,11 +475,7 @@ impl Function {
            .unwrap_or_else(|| self.module(db).resolver(db));
        // ...and add generic params, if present
        let p = self.generic_params(db);
-        let r = if !p.params.is_empty() {
+        let r = if !p.params.is_empty() { r.push_generic_params_scope(p) } else { r };
-            r.push_generic_params_scope(p)
-        } else {
-            r
-        };
        r
    }
 }
diff --git a/crates/ra_hir/src/code_model_impl/function.rs b/crates/ra_hir/src/code_model_impl/function.rs
index 8326c02c7..b9438fdb7 100644
--- a/crates/ra_hir/src/code_model_impl/function.rs
+++ b/crates/ra_hir/src/code_model_impl/function.rs
@@ -25,10 +25,7 @@ impl FnSignature {
        func: Function,
    ) -> Arc<FnSignature> {
        let (_, node) = func.source(db);
-        let name = node
+        let name = node.name().map(|n| n.as_name()).unwrap_or_else(Name::missing);
-            .name()
-            .map(|n| n.as_name())
-            .unwrap_or_else(Name::missing);
        let mut params = Vec::new();
        let mut has_self_param = false;
        if let Some(param_list) = node.param_list() {
@@ -61,12 +58,7 @@ impl FnSignature {
            TypeRef::unit()
        };
-        let sig = FnSignature {
+        let sig = FnSignature { name, params, ret_type, has_self_param };
-            name,
-            params,
-            ret_type,
-            has_self_param,
-        };
        Arc::new(sig)
    }
 }
diff --git a/crates/ra_hir/src/code_model_impl/krate.rs b/crates/ra_hir/src/code_model_impl/krate.rs
index 1517434b8..161ae6e18 100644
--- a/crates/ra_hir/src/code_model_impl/krate.rs
+++ b/crates/ra_hir/src/code_model_impl/krate.rs
@@ -11,9 +11,7 @@ impl Crate {
        crate_graph
            .dependencies(self.crate_id)
            .map(|dep| {
-                let krate = Crate {
+                let krate = Crate { crate_id: dep.crate_id() };
-                    crate_id: dep.crate_id(),
-                };
                let name = dep.as_name();
                CrateDependency { krate, name }
            })
@@ -23,10 +21,7 @@ impl Crate {
        let module_tree = db.module_tree(*self);
        let module_id = module_tree.modules().next()?;
-        let module = Module {
+        let module = Module { krate: *self, module_id };
-            krate: *self,
-            module_id,
-        };
        Some(module)
    }
 }
diff --git a/crates/ra_hir/src/code_model_impl/module.rs b/crates/ra_hir/src/code_model_impl/module.rs
index f487b8532..1425fa693 100644
--- a/crates/ra_hir/src/code_model_impl/module.rs
+++ b/crates/ra_hir/src/code_model_impl/module.rs
@@ -12,10 +12,7 @@ use crate::{
 impl Module {
    fn with_module_id(&self, module_id: ModuleId) -> Module {
-        Module {
+        Module { module_id, krate: self.krate }
-            module_id,
-            krate: self.krate,
-        }
    }
    pub(crate) fn name_impl(&self, db: &impl HirDatabase) -> Option<Name> {
@@ -42,10 +39,7 @@ impl Module {
    ) -> Option<(FileId, TreeArc<ast::Module>)> {
        let module_tree = db.module_tree(self.krate);
        let link = self.module_id.parent_link(&module_tree)?;
-        let file_id = link
+        let file_id = link.owner(&module_tree).file_id(&module_tree).as_original_file();
-            .owner(&module_tree)
-            .file_id(&module_tree)
-            .as_original_file();
        let src = link.source(&module_tree, db);
        Some((file_id, src))
    }
diff --git a/crates/ra_hir/src/expr.rs b/crates/ra_hir/src/expr.rs
index 6826e966b..4e61d87ff 100644
--- a/crates/ra_hir/src/expr.rs
+++ b/crates/ra_hir/src/expr.rs
@@ -121,9 +121,7 @@ impl BodySyntaxMapping {
    }
    pub fn node_expr(&self, node: &ast::Expr) -> Option<ExprId> {
-        self.expr_syntax_mapping
+        self.expr_syntax_mapping.get(&SyntaxNodePtr::new(node.syntax())).cloned()
-            .get(&SyntaxNodePtr::new(node.syntax()))
-            .cloned()
    }
    pub fn pat_syntax(&self, pat: PatId) -> Option<SyntaxNodePtr> {
@@ -135,9 +133,7 @@ impl BodySyntaxMapping {
    }
    pub fn node_pat(&self, node: &ast::Pat) -> Option<PatId> {
-        self.pat_syntax_mapping
+        self.pat_syntax_mapping.get(&SyntaxNodePtr::new(node.syntax())).cloned()
-            .get(&SyntaxNodePtr::new(node.syntax()))
-            .cloned()
    }
    pub fn body(&self) -> &Arc<Body> {
@@ -262,11 +258,7 @@ pub struct StructLitField {
 #[derive(Debug, Clone, Eq, PartialEq)]
 pub enum Statement {
-    Let {
+    Let { pat: PatId, type_ref: Option<TypeRef>, initializer: Option<ExprId> },
-        pat: PatId,
-        type_ref: Option<TypeRef>,
-        initializer: Option<ExprId>,
-    },
    Expr(ExprId),
 }
@@ -275,11 +267,7 @@ impl Expr {
        match self {
            Expr::Missing => {}
            Expr::Path(_) => {}
-            Expr::If {
+            Expr::If { condition, then_branch, else_branch } => {
-                condition,
-                then_branch,
-                else_branch,
-            } => {
                f(*condition);
                f(*then_branch);
                if let Some(else_branch) = else_branch {
@@ -457,11 +445,7 @@ impl Pat {
                args.iter().map(|pat| *pat).for_each(f);
            }
            Pat::Ref { pat, .. } => f(*pat),
-            Pat::Slice {
+            Pat::Slice { prefix, rest, suffix } => {
-                prefix,
-                rest,
-                suffix,
-            } => {
                let total_iter = prefix.iter().chain(rest.iter()).chain(suffix.iter());
                total_iter.map(|pat| *pat).for_each(f);
            }
@@ -520,10 +504,7 @@ impl ExprCollector {
    }
    fn empty_block(&mut self) -> ExprId {
-        let block = Expr::Block {
+        let block = Expr::Block { statements: Vec::new(), tail: None };
-            statements: Vec::new(),
-            tail: None,
-        };
        self.exprs.alloc(block)
    }
@@ -549,24 +530,10 @@ impl ExprCollector {
                        .unwrap_or_else(|| self.empty_block());
                    let placeholder_pat = self.pats.alloc(Pat::Missing);
                    let arms = vec![
-                        MatchArm {
+                        MatchArm { pats: vec![pat], expr: then_branch, guard: None },
-                            pats: vec![pat],
+                        MatchArm { pats: vec![placeholder_pat], expr: else_branch, guard: None },
-                            expr: then_branch,
-                            guard: None,
-                        },
-                        MatchArm {
-                            pats: vec![placeholder_pat],
-                            expr: else_branch,
-                            guard: None,
-                        },
                    ];
-                    self.alloc_expr(
+                    self.alloc_expr(Expr::Match { expr: match_expr, arms }, syntax_ptr)
-                        Expr::Match {
-                            expr: match_expr,
-                            arms,
-                        },
-                        syntax_ptr,
-                    )
                } else {
                    let condition = self.collect_expr_opt(e.condition().and_then(|c| c.expr()));
                    let then_branch = self.collect_block_opt(e.then_branch());
@@ -577,14 +544,7 @@ impl ExprCollector {
                            self.collect_expr(expr)
                        }
                    });
-                    self.alloc_expr(
+                    self.alloc_expr(Expr::If { condition, then_branch, else_branch }, syntax_ptr)
-                        Expr::If {
-                            condition,
-                            then_branch,
-                            else_branch,
-                        },
-                        syntax_ptr,
-                    )
                }
            }
            ast::ExprKind::BlockExpr(e) => self.collect_block_opt(e.block()),
@@ -610,14 +570,7 @@ impl ExprCollector {
                let iterable = self.collect_expr_opt(e.iterable());
                let pat = self.collect_pat_opt(e.pat());
                let body = self.collect_block_opt(e.loop_body());
-                self.alloc_expr(
+                self.alloc_expr(Expr::For { iterable, pat, body }, syntax_ptr)
-                    Expr::For {
-                        iterable,
-                        pat,
-                        body,
-                    },
-                    syntax_ptr,
-                )
            }
            ast::ExprKind::CallExpr(e) => {
                let callee = self.collect_expr_opt(e.expr());
@@ -635,18 +588,8 @@ impl ExprCollector {
                } else {
                    Vec::new()
                };
-                let method_name = e
+                let method_name = e.name_ref().map(|nr| nr.as_name()).unwrap_or_else(Name::missing);
-                    .name_ref()
+                self.alloc_expr(Expr::MethodCall { receiver, method_name, args }, syntax_ptr)
-                    .map(|nr| nr.as_name())
-                    .unwrap_or_else(Name::missing);
-                self.alloc_expr(
-                    Expr::MethodCall {
-                        receiver,
-                        method_name,
-                        args,
-                    },
-                    syntax_ptr,
-                )
            }
            ast::ExprKind::MatchExpr(e) => {
                let expr = self.collect_expr_opt(e.expr());
@@ -668,11 +611,8 @@ impl ExprCollector {
                self.alloc_expr(Expr::Match { expr, arms }, syntax_ptr)
            }
            ast::ExprKind::PathExpr(e) => {
-                let path = e
+                let path =
-                    .path()
+                    e.path().and_then(Path::from_ast).map(Expr::Path).unwrap_or(Expr::Missing);
-                    .and_then(Path::from_ast)
-                    .map(Expr::Path)
-                    .unwrap_or(Expr::Missing);
                self.alloc_expr(path, syntax_ptr)
            }
            ast::ExprKind::ContinueExpr(_e) => {
@@ -721,21 +661,11 @@ impl ExprCollector {
                    Vec::new()
                };
                let spread = e.spread().map(|s| self.collect_expr(s));
-                self.alloc_expr(
+                self.alloc_expr(Expr::StructLit { path, fields, spread }, syntax_ptr)
-                    Expr::StructLit {
-                        path,
-                        fields,
-                        spread,
-                    },
-                    syntax_ptr,
-                )
            }
            ast::ExprKind::FieldExpr(e) => {
                let expr = self.collect_expr_opt(e.expr());
-                let name = e
+                let name = e.name_ref().map(|nr| nr.as_name()).unwrap_or_else(Name::missing);
-                    .name_ref()
-                    .map(|nr| nr.as_name())
-                    .unwrap_or_else(Name::missing);
                self.alloc_expr(Expr::Field { expr, name }, syntax_ptr)
            }
            ast::ExprKind::TryExpr(e) => {
@@ -772,14 +702,7 @@ impl ExprCollector {
                    }
                }
                let body = self.collect_expr_opt(e.body());
-                self.alloc_expr(
+                self.alloc_expr(Expr::Lambda { args, arg_types, body }, syntax_ptr)
-                    Expr::Lambda {
-                        args,
-                        arg_types,
-                        body,
-                    },
-                    syntax_ptr,
-                )
            }
            ast::ExprKind::BinExpr(e) => {
                let lhs = self.collect_expr_opt(e.lhs());
@@ -804,9 +727,8 @@ impl ExprCollector {
                let lit = match child.flavor() {
                    LiteralFlavor::IntNumber { suffix } => {
-                        let known_name = suffix
+                        let known_name =
-                            .map(Name::new)
+                            suffix.map(Name::new).and_then(|name| UncertainIntTy::from_name(&name));
-                            .and_then(|name| UncertainIntTy::from_name(&name));
                        Literal::Int(
                            Default::default(),
@@ -857,11 +779,7 @@ impl ExprCollector {
                    let pat = self.collect_pat_opt(stmt.pat());
                    let type_ref = stmt.type_ref().map(TypeRef::from_ast);
                    let initializer = stmt.initializer().map(|e| self.collect_expr(e));
-                    Statement::Let {
+                    Statement::Let { pat, type_ref, initializer }
-                        pat,
-                        type_ref,
-                        initializer,
-                    }
                }
                ast::StmtKind::ExprStmt(stmt) => {
                    Statement::Expr(self.collect_expr_opt(stmt.expr()))
@@ -869,10 +787,7 @@ impl ExprCollector {
            })
            .collect();
        let tail = block.expr().map(|e| self.collect_expr(e));
-        self.alloc_expr(
+        self.alloc_expr(Expr::Block { statements, tail }, SyntaxNodePtr::new(block.syntax()))
-            Expr::Block { statements, tail },
-            SyntaxNodePtr::new(block.syntax()),
-        )
    }
    fn collect_block_opt(&mut self, block: Option<&ast::Block>) -> ExprId {
@@ -886,17 +801,10 @@ impl ExprCollector {
    fn collect_pat(&mut self, pat: &ast::Pat) -> PatId {
        let pattern = match pat.kind() {
            ast::PatKind::BindPat(bp) => {
-                let name = bp
+                let name = bp.name().map(|nr| nr.as_name()).unwrap_or_else(Name::missing);
-                    .name()
-                    .map(|nr| nr.as_name())
-                    .unwrap_or_else(Name::missing);
                let annotation = BindingAnnotation::new(bp.is_mutable(), bp.is_ref());
                let subpat = bp.pat().map(|subpat| self.collect_pat(subpat));
-                Pat::Bind {
+                Pat::Bind { name, mode: annotation, subpat }
-                    name,
-                    mode: annotation,
-                    subpat,
-                }
            }
            ast::PatKind::TupleStructPat(p) => {
                let path = p.path().and_then(Path::from_ast);
@@ -919,9 +827,8 @@ impl ExprCollector {
            ast::PatKind::PlaceholderPat(_) => Pat::Wild,
            ast::PatKind::StructPat(p) => {
                let path = p.path().and_then(Path::from_ast);
-                let field_pat_list = p
+                let field_pat_list =
-                    .field_pat_list()
+                    p.field_pat_list().expect("every struct should have a field list");
-                    .expect("every struct should have a field list");
                let mut fields: Vec<_> = field_pat_list
                    .bind_pats()
                    .map(|bind_pat| {
@@ -961,10 +868,7 @@ impl ExprCollector {
        if let Some(param_list) = node.param_list() {
            if let Some(self_param) = param_list.self_param() {
                let self_param = SyntaxNodePtr::new(
-                    self_param
+                    self_param.self_kw().expect("self param without self keyword").syntax(),
-                        .self_kw()
-                        .expect("self param without self keyword")
-                        .syntax(),
                );
                let param_pat = self.alloc_pat(
                    Pat::Bind {
diff --git a/crates/ra_hir/src/expr/scope.rs b/crates/ra_hir/src/expr/scope.rs
index 368994bf7..44d5c2429 100644
--- a/crates/ra_hir/src/expr/scope.rs
+++ b/crates/ra_hir/src/expr/scope.rs
@@ -74,17 +74,11 @@ impl ExprScopes {
    }
    fn root_scope(&mut self) -> ScopeId {
-        self.scopes.alloc(ScopeData {
+        self.scopes.alloc(ScopeData { parent: None, entries: vec![] })
-            parent: None,
-            entries: vec![],
-        })
    }
    fn new_scope(&mut self, parent: ScopeId) -> ScopeId {
-        self.scopes.alloc(ScopeData {
+        self.scopes.alloc(ScopeData { parent: Some(parent), entries: vec![] })
-            parent: Some(parent),
-            entries: vec![],
-        })
    }
    fn add_bindings(&mut self, body: &Body, scope: ScopeId, pat: PatId) {
@@ -92,10 +86,7 @@ impl ExprScopes {
            Pat::Bind { name, .. } => {
                // bind can have a subpattern, but it's actually not allowed
                // to bind to things in there
-                let entry = ScopeEntry {
+                let entry = ScopeEntry { name: name.clone(), pat };
-                    name: name.clone(),
-                    pat,
-                };
                self.scopes[scope].entries.push(entry)
            }
            p => p.walk_child_pats(|pat| self.add_bindings(body, scope, pat)),
@@ -104,9 +95,7 @@ impl ExprScopes {
    fn add_params_bindings(&mut self, scope: ScopeId, params: &[PatId]) {
        let body = Arc::clone(&self.body);
-        params
+        params.iter().for_each(|pat| self.add_bindings(&body, scope, *pat));
-            .iter()
-            .for_each(|pat| self.add_bindings(&body, scope, *pat));
    }
    fn set_scope(&mut self, node: ExprId, scope: ScopeId) {
@@ -142,9 +131,7 @@ impl ScopeEntryWithSyntax {
 impl ScopesWithSyntaxMapping {
    fn scope_chain<'a>(&'a self, node: &SyntaxNode) -> impl Iterator<Item = ScopeId> + 'a {
-        generate(self.scope_for(node), move |&scope| {
+        generate(self.scope_for(node), move |&scope| self.scopes.scopes[scope].parent)
-            self.scopes.scopes[scope].parent
-        })
    }
    pub fn scope_for_offset(&self, offset: TextUnit) -> Option<ScopeId> {
@@ -154,10 +141,7 @@ impl ScopesWithSyntaxMapping {
            .filter_map(|(id, scope)| Some((self.syntax_mapping.expr_syntax(*id)?, scope)))
            // find containing scope
            .min_by_key(|(ptr, _scope)| {
-                (
+                (!(ptr.range().start() <= offset && offset <= ptr.range().end()), ptr.range().len())
-                    !(ptr.range().start() <= offset && offset <= ptr.range().end()),
-                    ptr.range().len(),
-                )
            })
            .map(|(ptr, scope)| self.adjust(ptr, *scope, offset))
    }
@@ -251,9 +235,7 @@ fn compute_block_scopes(
 ) {
    for stmt in statements {
        match stmt {
-            Statement::Let {
+            Statement::Let { pat, initializer, .. } => {
-                pat, initializer, ..
-            } => {
                if let Some(expr) = initializer {
                    scopes.set_scope(*expr, scope);
                    compute_expr_scopes(*expr, body, scopes, scope);
@@ -278,21 +260,13 @@ fn compute_expr_scopes(expr: ExprId, body: &Body, scopes: &mut ExprScopes, scope
        Expr::Block { statements, tail } => {
            compute_block_scopes(&statements, *tail, body, scopes, scope);
        }
-        Expr::For {
+        Expr::For { iterable, pat, body: body_expr } => {
-            iterable,
-            pat,
-            body: body_expr,
-        } => {
            compute_expr_scopes(*iterable, body, scopes, scope);
            let scope = scopes.new_scope(scope);
            scopes.add_bindings(body, scope, *pat);
            compute_expr_scopes(*body_expr, body, scopes, scope);
        }
-        Expr::Lambda {
+        Expr::Lambda { args, body: body_expr, .. } => {
-            args,
-            body: body_expr,
-            ..
-        } => {
            let scope = scopes.new_scope(scope);
            scopes.add_params_bindings(scope, &args);
            compute_expr_scopes(*body_expr, body, scopes, scope);
@@ -341,9 +315,7 @@ mod tests {
        let file = SourceFile::parse(&code);
        let marker: &ast::PathExpr = find_node_at_offset(file.syntax(), off).unwrap();
        let fn_def: &ast::FnDef = find_node_at_offset(file.syntax(), off).unwrap();
-        let irrelevant_function = Function {
+        let irrelevant_function = Function { id: crate::ids::FunctionId::from_raw(0.into()) };
-            id: crate::ids::FunctionId::from_raw(0.into()),
-        };
        let body_hir = expr::collect_fn_body_syntax(irrelevant_function, fn_def);
        let scopes = ExprScopes::new(Arc::clone(body_hir.body()));
        let scopes = ScopesWithSyntaxMapping {
@@ -444,9 +416,7 @@ mod tests {
        let fn_def: &ast::FnDef = find_node_at_offset(file.syntax(), off).unwrap();
        let name_ref: &ast::NameRef = find_node_at_offset(file.syntax(), off).unwrap();
-        let irrelevant_function = Function {
+        let irrelevant_function = Function { id: crate::ids::FunctionId::from_raw(0.into()) };
-            id: crate::ids::FunctionId::from_raw(0.into()),
-        };
        let body_hir = expr::collect_fn_body_syntax(irrelevant_function, fn_def);
        let scopes = ExprScopes::new(Arc::clone(body_hir.body()));
        let scopes = ScopesWithSyntaxMapping {
diff --git a/crates/ra_hir/src/generics.rs b/crates/ra_hir/src/generics.rs
index a82205f0b..c72360f44 100644
--- a/crates/ra_hir/src/generics.rs
+++ b/crates/ra_hir/src/generics.rs
@@ -58,14 +58,8 @@ impl GenericParams {
    fn fill_params(&mut self, params: &ast::TypeParamList) {
        for (idx, type_param) in params.type_params().enumerate() {
-            let name = type_param
+            let name = type_param.name().map(AsName::as_name).unwrap_or_else(Name::missing);
-                .name()
+            let param = GenericParam { idx: idx as u32, name };
-                .map(AsName::as_name)
-                .unwrap_or_else(Name::missing);
-            let param = GenericParam {
-                idx: idx as u32,
-                name,
-            };
            self.params.push(param);
        }
    }
diff --git a/crates/ra_hir/src/ids.rs b/crates/ra_hir/src/ids.rs
index 95678bf70..ea13c1196 100644
--- a/crates/ra_hir/src/ids.rs
+++ b/crates/ra_hir/src/ids.rs
@@ -169,11 +169,7 @@ impl<N: AstNode> Hash for ItemLoc<N> {
 impl<N: AstNode> Clone for ItemLoc<N> {
    fn clone(&self) -> ItemLoc<N> {
-        ItemLoc {
+        ItemLoc { module: self.module, raw: self.raw, _ty: PhantomData }
-            module: self.module,
-            raw: self.raw,
-            _ty: PhantomData,
-        }
    }
 }
@@ -186,11 +182,7 @@ pub(crate) struct LocationCtx<DB> {
 impl<'a, DB: PersistentHirDatabase> LocationCtx<&'a DB> {
    pub(crate) fn new(db: &'a DB, module: Module, file_id: HirFileId) -> LocationCtx<&'a DB> {
-        LocationCtx {
+        LocationCtx { db, module, file_id }
-            db,
-            module,
-            file_id,
-        }
    }
    pub(crate) fn to_def<N, DEF>(self, ast: &N) -> DEF
    where
@@ -205,15 +197,9 @@ pub(crate) trait AstItemDef<N: AstNode>: ArenaId + Clone {
    fn interner(interner: &HirInterner) -> &LocationIntener<ItemLoc<N>, Self>;
    fn from_ast(ctx: LocationCtx<&impl PersistentHirDatabase>, ast: &N) -> Self {
        let items = ctx.db.file_items(ctx.file_id);
-        let raw = SourceItemId {
+        let raw =
-            file_id: ctx.file_id,
+            SourceItemId { file_id: ctx.file_id, item_id: items.id_of(ctx.file_id, ast.syntax()) };
-            item_id: items.id_of(ctx.file_id, ast.syntax()),
+        let loc = ItemLoc { module: ctx.module, raw, _ty: PhantomData };
-        };
-        let loc = ItemLoc {
-            module: ctx.module,
-            raw,
-            _ty: PhantomData,
-        };
        Self::interner(ctx.db.as_ref()).loc2id(&loc)
    }
@@ -221,9 +207,8 @@ pub(crate) trait AstItemDef<N: AstNode>: ArenaId + Clone {
        let int = Self::interner(db.as_ref());
        let loc = int.id2loc(self);
        let syntax = db.file_item(loc.raw);
-        let ast = N::cast(&syntax)
+        let ast =
-            .unwrap_or_else(|| panic!("invalid ItemLoc: {:?}", loc.raw))
+            N::cast(&syntax).unwrap_or_else(|| panic!("invalid ItemLoc: {:?}", loc.raw)).to_owned();
-            .to_owned();
        (loc.raw.file_id, ast)
    }
    fn module(self, db: &impl HirDatabase) -> Module {
@@ -317,10 +302,7 @@ pub struct SourceFileItems {
 impl SourceFileItems {
    pub(crate) fn new(file_id: HirFileId, source_file: &SourceFile) -> SourceFileItems {
-        let mut res = SourceFileItems {
+        let mut res = SourceFileItems { file_id, arena: Arena::default() };
-            file_id,
-            arena: Arena::default(),
-        };
        res.init(source_file);
        res
    }
diff --git a/crates/ra_hir/src/impl_block.rs b/crates/ra_hir/src/impl_block.rs
index 094dbedb3..b2fbee8d7 100644
--- a/crates/ra_hir/src/impl_block.rs
+++ b/crates/ra_hir/src/impl_block.rs
@@ -50,17 +50,11 @@ impl ImplBlock {
        item: ImplItem,
    ) -> Option<ImplBlock> {
        let impl_id = *module_impl_blocks.impls_by_def.get(&item)?;
-        Some(ImplBlock {
+        Some(ImplBlock { module_impl_blocks, impl_id })
-            module_impl_blocks,
-            impl_id,
-        })
    }
    pub(crate) fn from_id(module_impl_blocks: Arc<ModuleImplBlocks>, impl_id: ImplId) -> ImplBlock {
-        ImplBlock {
+        ImplBlock { module_impl_blocks, impl_id }
-            module_impl_blocks,
-            impl_id,
-        }
    }
    pub fn id(&self) -> ImplId {
@@ -144,11 +138,7 @@ impl ImplData {
        } else {
            Vec::new()
        };
-        ImplData {
+        ImplData { target_trait, target_type, items }
-            target_trait,
-            target_type,
-            items,
-        }
    }
    pub fn target_trait(&self) -> Option<&TypeRef> {
@@ -212,10 +202,9 @@ impl ModuleImplBlocks {
        let file_id: HirFileId = file_id.into();
        let node = match &module_source {
            ModuleSource::SourceFile(node) => node.syntax(),
-            ModuleSource::Module(node) => node
+            ModuleSource::Module(node) => {
-                .item_list()
+                node.item_list().expect("inline module should have item list").syntax()
-                .expect("inline module should have item list")
+            }
-                .syntax(),
        };
        for impl_block_ast in node.children().filter_map(ast::ImplBlock::cast) {
diff --git a/crates/ra_hir/src/macros.rs b/crates/ra_hir/src/macros.rs
index cb8a9312e..95925159f 100644
--- a/crates/ra_hir/src/macros.rs
+++ b/crates/ra_hir/src/macros.rs
@@ -48,9 +48,7 @@ impl MacroDef {
        let input = {
            let arg = macro_call.token_tree()?.syntax();
-            MacroInput {
+            MacroInput { text: arg.text().to_string() }
-                text: arg.text().to_string(),
-            }
        };
        Some((def, input))
    }
@@ -68,20 +66,14 @@ impl MacroDef {
        let ptr = SyntaxNodePtr::new(array_expr.syntax());
        let src_range = TextRange::offset_len(0.into(), TextUnit::of_str(&input.text));
        let ranges_map = vec![(src_range, array_expr.syntax().range())];
-        let res = MacroExpansion {
+        let res = MacroExpansion { text, ranges_map, ptr };
-            text,
-            ranges_map,
-            ptr,
-        };
        Some(res)
    }
    fn expand_query_group(self, input: MacroInput) -> Option<MacroExpansion> {
        let anchor = "trait ";
        let pos = input.text.find(anchor)? + anchor.len();
-        let trait_name = input.text[pos..]
+        let trait_name =
-            .chars()
+            input.text[pos..].chars().take_while(|c| c.is_alphabetic()).collect::<String>();
-            .take_while(|c| c.is_alphabetic())
-            .collect::<String>();
        if trait_name.is_empty() {
            return None;
        }
@@ -92,11 +84,7 @@ impl MacroDef {
        let name = trait_def.name()?;
        let ptr = SyntaxNodePtr::new(trait_def.syntax());
        let ranges_map = vec![(src_range, name.syntax().range())];
-        let res = MacroExpansion {
+        let res = MacroExpansion { text, ranges_map, ptr };
-            text,
-            ranges_map,
-            ptr,
-        };
        Some(res)
    }
 }
diff --git a/crates/ra_hir/src/mock.rs b/crates/ra_hir/src/mock.rs
index 87095fb21..950f89948 100644
--- a/crates/ra_hir/src/mock.rs
+++ b/crates/ra_hir/src/mock.rs
@@ -64,10 +64,7 @@ impl MockDatabase {
        let mut source_root = SourceRoot::default();
        for entry in parse_fixture(fixture) {
            if entry.text.contains(CURSOR_MARKER) {
-                assert!(
+                assert!(position.is_none(), "only one marker (<|>) per fixture is allowed");
-                    position.is_none(),
-                    "only one marker (<|>) per fixture is allowed"
-                );
                position = Some(self.add_file_with_position(
                    source_root_id,
                    &mut source_root,
diff --git a/crates/ra_hir/src/module_tree.rs b/crates/ra_hir/src/module_tree.rs
index a1aa3d8ce..1f19ee191 100644
--- a/crates/ra_hir/src/module_tree.rs
+++ b/crates/ra_hir/src/module_tree.rs
@@ -153,10 +153,8 @@ impl ModuleTree {
        file_id: HirFileId,
        decl_id: Option<SourceFileItemId>,
    ) -> Option<ModuleId> {
-        let (res, _) = self
+        let (res, _) =
-            .mods
+            self.mods.iter().find(|(_, m)| (m.file_id, m.decl_id) == (file_id, decl_id))?;
-            .iter()
-            .find(|(_, m)| (m.file_id, m.decl_id) == (file_id, decl_id))?;
        Some(res)
    }
@@ -178,18 +176,10 @@ impl ModuleTree {
        decl_id: Option<SourceFileItemId>,
    ) -> ModuleId {
        let is_root = parent.is_none();
-        let id = self.alloc_mod(ModuleData {
+        let id = self.alloc_mod(ModuleData { file_id, decl_id, parent, children: Vec::new() });
-            file_id,
-            decl_id,
-            parent,
-            children: Vec::new(),
-        });
        for sub in db.submodules(file_id, decl_id).iter() {
            let link = self.alloc_link(LinkData {
-                source: SourceItemId {
+                source: SourceItemId { file_id, item_id: sub.decl_id },
-                    file_id,
-                    item_id: sub.decl_id,
-                },
                name: sub.name.clone(),
                owner: id,
                points_to: Vec::new(),
@@ -244,9 +234,7 @@ impl ModuleId {
        Some(tree.links[link].owner)
    }
    pub(crate) fn crate_root(self, tree: &ModuleTree) -> ModuleId {
-        generate(Some(self), move |it| it.parent(tree))
+        generate(Some(self), move |it| it.parent(tree)).last().unwrap()
-            .last()
-            .unwrap()
    }
    pub(crate) fn child(self, tree: &ModuleTree, name: &Name) -> Option<ModuleId> {
        let link = tree.mods[self]
diff --git a/crates/ra_hir/src/nameres.rs b/crates/ra_hir/src/nameres.rs
index 681aa9a67..b7382d9c3 100644
--- a/crates/ra_hir/src/nameres.rs
+++ b/crates/ra_hir/src/nameres.rs
@@ -83,40 +83,25 @@ pub struct PerNs<T> {
 impl<T> Default for PerNs<T> {
    fn default() -> Self {
-        PerNs {
+        PerNs { types: None, values: None }
-            types: None,
-            values: None,
-        }
    }
 }
 impl<T> PerNs<T> {
    pub fn none() -> PerNs<T> {
-        PerNs {
+        PerNs { types: None, values: None }
-            types: None,
-            values: None,
-        }
    }
    pub fn values(t: T) -> PerNs<T> {
-        PerNs {
+        PerNs { types: None, values: Some(t) }
-            types: None,
-            values: Some(t),
-        }
    }
    pub fn types(t: T) -> PerNs<T> {
-        PerNs {
+        PerNs { types: Some(t), values: None }
-            types: Some(t),
-            values: None,
-        }
    }
    pub fn both(types: T, values: T) -> PerNs<T> {
-        PerNs {
+        PerNs { types: Some(types), values: Some(values) }
-            types: Some(types),
-            values: Some(values),
-        }
    }
    pub fn is_none(&self) -> bool {
@@ -147,31 +132,19 @@ impl<T> PerNs<T> {
    }
    pub fn as_ref(&self) -> PerNs<&T> {
-        PerNs {
+        PerNs { types: self.types.as_ref(), values: self.values.as_ref() }
-            types: self.types.as_ref(),
-            values: self.values.as_ref(),
-        }
    }
    pub fn combine(self, other: PerNs<T>) -> PerNs<T> {
-        PerNs {
+        PerNs { types: self.types.or(other.types), values: self.values.or(other.values) }
-            types: self.types.or(other.types),
-            values: self.values.or(other.values),
-        }
    }
    pub fn and_then<U>(self, f: impl Fn(T) -> Option<U>) -> PerNs<U> {
-        PerNs {
+        PerNs { types: self.types.and_then(&f), values: self.values.and_then(&f) }
-            types: self.types.and_then(&f),
-            values: self.values.and_then(&f),
-        }
    }
    pub fn map<U>(self, f: impl Fn(T) -> U) -> PerNs<U> {
-        PerNs {
+        PerNs { types: self.types.map(&f), values: self.values.map(&f) }
-            types: self.types.map(&f),
-            values: self.values.map(&f),
-        }
    }
 }
@@ -233,9 +206,7 @@ where
        for dep in self.krate.dependencies(self.db) {
            log::debug!("crate dep {:?} -> {:?}", dep.name, dep.krate);
            if let Some(module) = dep.krate.root_module(self.db) {
-                self.result
+                self.result.extern_prelude.insert(dep.name.clone(), module.into());
-                    .extern_prelude
-                    .insert(dep.name.clone(), module.into());
            }
        }
    }
@@ -245,17 +216,11 @@ where
        for (import_id, import_data) in input.imports.iter() {
            if let Some(last_segment) = import_data.path.segments.iter().last() {
                if !import_data.is_glob {
-                    let name = import_data
+                    let name =
-                        .alias
+                        import_data.alias.clone().unwrap_or_else(|| last_segment.name.clone());
-                        .clone()
+                    module_items
-                        .unwrap_or_else(|| last_segment.name.clone());
+                        .items
-                    module_items.items.insert(
+                        .insert(name, Resolution { def: PerNs::none(), import: Some(import_id) });
-                        name,
-                        Resolution {
-                            def: PerNs::none(),
-                            import: Some(import_id),
-                        },
-                    );
                }
            }
        }
@@ -267,10 +232,7 @@ where
        // Populate modules
        for (name, module_id) in module_id.children(&self.module_tree) {
-            let module = Module {
+            let module = Module { module_id, krate: self.krate };
-                module_id,
-                krate: self.krate,
-            };
            self.add_module_item(&mut module_items, name, PerNs::types(module.into()));
        }
@@ -305,20 +267,13 @@ where
        if import.is_glob {
            return ReachedFixedPoint::Yes;
        };
-        let original_module = Module {
+        let original_module = Module { krate: self.krate, module_id };
-            krate: self.krate,
-            module_id,
-        };
        let (def, reached_fixedpoint) =
-            self.result
+            self.result.resolve_path_fp(self.db, original_module, &import.path);
-                .resolve_path_fp(self.db, original_module, &import.path);
        if reached_fixedpoint == ReachedFixedPoint::Yes {
            let last_segment = import.path.segments.last().unwrap();
-            let name = import
+            let name = import.alias.clone().unwrap_or_else(|| last_segment.name.clone());
-                .alias
-                .clone()
-                .unwrap_or_else(|| last_segment.name.clone());
            log::debug!("resolved import {:?} ({:?}) to {:?}", name, import, def);
            // extern crates in the crate root are special-cased to insert entries into the extern prelude: rust-lang/rust#54658
@@ -330,10 +285,7 @@ where
                }
            }
            self.update(module_id, |items| {
-                let res = Resolution {
+                let res = Resolution { def, import: Some(import_id) };
-                    def,
-                    import: Some(import_id),
-                };
                items.items.insert(name, res);
            });
        }
@@ -358,12 +310,7 @@ impl ItemMap {
        let module_tree = db.module_tree(krate);
        let input = module_tree
            .modules()
-            .map(|module_id| {
+            .map(|module_id| (module_id, db.lower_module_module(Module { krate, module_id })))
-                (
-                    module_id,
-                    db.lower_module_module(Module { krate, module_id }),
-                )
-            })
            .collect::<FxHashMap<_, _>>();
        let resolver = Resolver::new(db, &input, krate);
diff --git a/crates/ra_hir/src/nameres/lower.rs b/crates/ra_hir/src/nameres/lower.rs
index 7e6e48ae0..7e9a3de2b 100644
--- a/crates/ra_hir/src/nameres/lower.rs
+++ b/crates/ra_hir/src/nameres/lower.rs
@@ -82,13 +82,9 @@ impl LoweredModule {
        let mut source_map = ImportSourceMap::default();
        let mut res = LoweredModule::default();
        match source {
-            ModuleSource::SourceFile(it) => res.fill(
+            ModuleSource::SourceFile(it) => {
-                &mut source_map,
+                res.fill(&mut source_map, db, module, file_id, &mut it.items_with_macros())
-                db,
+            }
-                module,
-                file_id,
-                &mut it.items_with_macros(),
-            ),
            ModuleSource::Module(it) => {
                if let Some(item_list) = it.item_list() {
                    res.fill(
@@ -121,10 +117,8 @@ impl LoweredModule {
                }
                ast::ItemOrMacro::Macro(macro_call) => {
                    let item_id = file_items.id_of_unchecked(macro_call.syntax());
-                    let loc = MacroCallLoc {
+                    let loc =
-                        module,
+                        MacroCallLoc { module, source_item_id: SourceItemId { file_id, item_id } };
-                        source_item_id: SourceItemId { file_id, item_id },
-                    };
                    let id = loc.id(db);
                    let file_id = HirFileId::from(id);
                    //FIXME: expand recursively
@@ -163,22 +157,19 @@ impl LoweredModule {
            ast::ModuleItemKind::FnDef(it) => {
                if let Some(name) = it.name() {
                    let func = Function { id: ctx.to_def(it) };
-                    self.declarations
+                    self.declarations.insert(name.as_name(), PerNs::values(func.into()));
-                        .insert(name.as_name(), PerNs::values(func.into()));
                }
            }
            ast::ModuleItemKind::TraitDef(it) => {
                if let Some(name) = it.name() {
                    let t = Trait { id: ctx.to_def(it) };
-                    self.declarations
+                    self.declarations.insert(name.as_name(), PerNs::types(t.into()));
-                        .insert(name.as_name(), PerNs::types(t.into()));
                }
            }
            ast::ModuleItemKind::TypeDef(it) => {
                if let Some(name) = it.name() {
                    let t = Type { id: ctx.to_def(it) };
-                    self.declarations
+                    self.declarations.insert(name.as_name(), PerNs::types(t.into()));
-                        .insert(name.as_name(), PerNs::types(t.into()));
                }
            }
            ast::ModuleItemKind::ImplBlock(_) => {
@@ -207,15 +198,13 @@ impl LoweredModule {
            ast::ModuleItemKind::ConstDef(it) => {
                if let Some(name) = it.name() {
                    let c = Const { id: ctx.to_def(it) };
-                    self.declarations
+                    self.declarations.insert(name.as_name(), PerNs::values(c.into()));
-                        .insert(name.as_name(), PerNs::values(c.into()));
                }
            }
            ast::ModuleItemKind::StaticDef(it) => {
                if let Some(name) = it.name() {
                    let s = Static { id: ctx.to_def(it) };
-                    self.declarations
+                    self.declarations.insert(name.as_name(), PerNs::values(s.into()));
-                        .insert(name.as_name(), PerNs::values(s.into()));
                }
            }
            ast::ModuleItemKind::Module(_) => {
diff --git a/crates/ra_hir/src/nameres/tests.rs b/crates/ra_hir/src/nameres/tests.rs
index 0654dbaa1..3dfad6bf2 100644
--- a/crates/ra_hir/src/nameres/tests.rs
+++ b/crates/ra_hir/src/nameres/tests.rs
@@ -42,19 +42,11 @@ fn check_module_item_map(map: &ItemMap, module_id: ModuleId, expected: &str) {
        .collect::<Vec<_>>();
    lines.sort();
    let actual = lines.join("\n");
-    let expected = expected
+    let expected = expected.trim().lines().map(|it| it.trim()).collect::<Vec<_>>().join("\n");
-        .trim()
-        .lines()
-        .map(|it| it.trim())
-        .collect::<Vec<_>>()
-        .join("\n");
    assert_eq_text!(&expected, &actual);
    fn dump_resolution(resolution: &Resolution) -> &'static str {
-        match (
+        match (resolution.def.types.is_some(), resolution.def.values.is_some()) {
-            resolution.def.types.is_some(),
-            resolution.def.values.is_some(),
-        ) {
            (true, true) => "t v",
            (true, false) => "t",
            (false, true) => "v",
@@ -314,9 +306,7 @@ fn item_map_across_crates() {
    let mut crate_graph = CrateGraph::default();
    let main_crate = crate_graph.add_crate_root(main_id);
    let lib_crate = crate_graph.add_crate_root(lib_id);
-    crate_graph
+    crate_graph.add_dep(main_crate, "test_crate".into(), lib_crate).unwrap();
-        .add_dep(main_crate, "test_crate".into(), lib_crate)
-        .unwrap();
    db.set_crate_graph(Arc::new(crate_graph));
@@ -357,9 +347,7 @@ fn extern_crate_rename() {
    let mut crate_graph = CrateGraph::default();
    let main_crate = crate_graph.add_crate_root(main_id);
    let lib_crate = crate_graph.add_crate_root(lib_id);
-    crate_graph
+    crate_graph.add_dep(main_crate, "alloc".into(), lib_crate).unwrap();
-        .add_dep(main_crate, "alloc".into(), lib_crate)
-        .unwrap();
    db.set_crate_graph(Arc::new(crate_graph));
@@ -406,9 +394,7 @@ fn import_across_source_roots() {
    let mut crate_graph = CrateGraph::default();
    let main_crate = crate_graph.add_crate_root(main_id);
    let lib_crate = crate_graph.add_crate_root(lib_id);
-    crate_graph
+    crate_graph.add_dep(main_crate, "test_crate".into(), lib_crate).unwrap();
-        .add_dep(main_crate, "test_crate".into(), lib_crate)
-        .unwrap();
    db.set_crate_graph(Arc::new(crate_graph));
@@ -447,9 +433,7 @@ fn reexport_across_crates() {
    let mut crate_graph = CrateGraph::default();
    let main_crate = crate_graph.add_crate_root(main_id);
    let lib_crate = crate_graph.add_crate_root(lib_id);
-    crate_graph
+    crate_graph.add_dep(main_crate, "test_crate".into(), lib_crate).unwrap();
-        .add_dep(main_crate, "test_crate".into(), lib_crate)
-        .unwrap();
    db.set_crate_graph(Arc::new(crate_graph));
@@ -482,11 +466,7 @@ fn check_item_map_is_not_recomputed(initial: &str, file_change: &str) {
        let events = db.log_executed(|| {
            db.item_map(krate);
        });
-        assert!(
+        assert!(!format!("{:?}", events).contains("item_map"), "{:#?}", events)
-            !format!("{:?}", events).contains("item_map"),
-            "{:#?}",
-            events
-        )
    }
 }
diff --git a/crates/ra_hir/src/path.rs b/crates/ra_hir/src/path.rs
index cb0a04500..6a24c8aa7 100644
--- a/crates/ra_hir/src/path.rs
+++ b/crates/ra_hir/src/path.rs
@@ -66,14 +66,9 @@ impl Path {
            match segment.kind()? {
                ast::PathSegmentKind::Name(name) => {
-                    let args = segment
+                    let args =
-                        .type_arg_list()
+                        segment.type_arg_list().and_then(GenericArgs::from_ast).map(Arc::new);
-                        .and_then(GenericArgs::from_ast)
+                    let segment = PathSegment { name: name.as_name(), args_and_bindings: args };
-                        .map(Arc::new);
-                    let segment = PathSegment {
-                        name: name.as_name(),
-                        args_and_bindings: args,
-                    };
                    segments.push(segment);
                }
                ast::PathSegmentKind::CrateKw => {
@@ -153,10 +148,7 @@ impl From<Name> for Path {
    fn from(name: Name) -> Path {
        Path {
            kind: PathKind::Plain,
-            segments: vec![PathSegment {
+            segments: vec![PathSegment { name, args_and_bindings: None }],
-                name,
-                args_and_bindings: None,
-            }],
        }
    }
 }
@@ -209,18 +201,13 @@ fn expand_use_tree<'a>(
 }
 fn convert_path(prefix: Option<Path>, path: &ast::Path) -> Option<Path> {
-    let prefix = if let Some(qual) = path.qualifier() {
+    let prefix =
-        Some(convert_path(prefix, qual)?)
+        if let Some(qual) = path.qualifier() { Some(convert_path(prefix, qual)?) } else { prefix };
-    } else {
-        prefix
-    };
    let segment = path.segment()?;
    let res = match segment.kind()? {
        ast::PathSegmentKind::Name(name) => {
-            let mut res = prefix.unwrap_or_else(|| Path {
+            let mut res = prefix
-                kind: PathKind::Plain,
+                .unwrap_or_else(|| Path { kind: PathKind::Plain, segments: Vec::with_capacity(1) });
-                segments: Vec::with_capacity(1),
-            });
            res.segments.push(PathSegment {
                name: name.as_name(),
                args_and_bindings: None, // no type args in use
@@ -231,28 +218,19 @@ fn convert_path(prefix: Option<Path>, path: &ast::Path) -> Option<Path> {
            if prefix.is_some() {
                return None;
            }
-            Path {
+            Path { kind: PathKind::Crate, segments: Vec::new() }
-                kind: PathKind::Crate,
-                segments: Vec::new(),
-            }
        }
        ast::PathSegmentKind::SelfKw => {
            if prefix.is_some() {
                return None;
            }
-            Path {
+            Path { kind: PathKind::Self_, segments: Vec::new() }
-                kind: PathKind::Self_,
-                segments: Vec::new(),
-            }
        }
        ast::PathSegmentKind::SuperKw => {
            if prefix.is_some() {
                return None;
            }
-            Path {
+            Path { kind: PathKind::Super, segments: Vec::new() }
-                kind: PathKind::Super,
-                segments: Vec::new(),
-            }
        }
    };
    Some(res)
diff --git a/crates/ra_hir/src/query_definitions.rs b/crates/ra_hir/src/query_definitions.rs
index b4d8da1e6..03113e7cc 100644
--- a/crates/ra_hir/src/query_definitions.rs
+++ b/crates/ra_hir/src/query_definitions.rs
@@ -23,7 +23,5 @@ pub(super) fn file_item(
    source_item_id: SourceItemId,
 ) -> TreeArc<SyntaxNode> {
    let source_file = db.hir_parse(source_item_id.file_id);
-    db.file_items(source_item_id.file_id)[source_item_id.item_id]
+    db.file_items(source_item_id.file_id)[source_item_id.item_id].to_node(&source_file).to_owned()
-        .to_node(&source_file)
-        .to_owned()
 }
diff --git a/crates/ra_hir/src/resolve.rs b/crates/ra_hir/src/resolve.rs
index 0f60d4742..3d7ec5683 100644
--- a/crates/ra_hir/src/resolve.rs
+++ b/crates/ra_hir/src/resolve.rs
@@ -138,10 +138,7 @@ impl Resolver {
        expr_scopes: Arc<ExprScopes>,
        scope_id: ScopeId,
    ) -> Resolver {
-        self.push_scope(Scope::ExprScope(ExprScope {
+        self.push_scope(Scope::ExprScope(ExprScope { expr_scopes, scope_id }))
-            expr_scopes,
-            scope_id,
-        }))
    }
 }
@@ -170,11 +167,8 @@ impl Scope {
                }
            }
            Scope::ExprScope(e) => {
-                let entry = e
+                let entry =
-                    .expr_scopes
+                    e.expr_scopes.entries(e.scope_id).iter().find(|entry| entry.name() == name);
-                    .entries(e.scope_id)
-                    .iter()
-                    .find(|entry| entry.name() == name);
                match entry {
                    Some(e) => PerNs::values(Resolution::LocalBinding(e.pat())),
                    None => PerNs::none(),
@@ -193,35 +187,24 @@ impl Scope {
                //         def: m.module.into(),
                //     }),
                // );
-                m.item_map[m.module.module_id]
+                m.item_map[m.module.module_id].entries().for_each(|(name, res)| {
-                    .entries()
+                    f(name.clone(), res.def.map(Resolution::Def));
-                    .for_each(|(name, res)| {
+                });
-                        f(name.clone(), res.def.map(Resolution::Def));
-                    });
                m.item_map.extern_prelude.iter().for_each(|(name, def)| {
                    f(name.clone(), PerNs::types(Resolution::Def(*def)));
                });
            }
            Scope::GenericParams(gp) => {
                for param in &gp.params {
-                    f(
+                    f(param.name.clone(), PerNs::types(Resolution::GenericParam(param.idx)))
-                        param.name.clone(),
-                        PerNs::types(Resolution::GenericParam(param.idx)),
-                    )
                }
            }
            Scope::ImplBlockScope(i) => {
-                f(
+                f(Name::self_type(), PerNs::types(Resolution::SelfType(i.clone())));
-                    Name::self_type(),
-                    PerNs::types(Resolution::SelfType(i.clone())),
-                );
            }
            Scope::ExprScope(e) => {
                e.expr_scopes.entries(e.scope_id).iter().for_each(|e| {
-                    f(
+                    f(e.name().clone(), PerNs::values(Resolution::LocalBinding(e.pat())));
-                        e.name().clone(),
-                        PerNs::values(Resolution::LocalBinding(e.pat())),
-                    );
                });
            }
        }
diff --git a/crates/ra_hir/src/source_binder.rs b/crates/ra_hir/src/source_binder.rs
index 59f782277..625a2ce45 100644
--- a/crates/ra_hir/src/source_binder.rs
+++ b/crates/ra_hir/src/source_binder.rs
@@ -65,11 +65,7 @@ pub fn module_from_child_node(
    file_id: FileId,
    child: &SyntaxNode,
 ) -> Option<Module> {
-    if let Some(m) = child
+    if let Some(m) = child.ancestors().filter_map(ast::Module::cast).find(|it| !it.has_semi()) {
-        .ancestors()
-        .filter_map(ast::Module::cast)
-        .find(|it| !it.has_semi())
-    {
        module_from_inline(db, file_id.into(), m)
    } else {
        module_from_file_id(db, file_id.into())
@@ -82,14 +78,13 @@ fn module_from_source(
    decl_id: Option<SourceFileItemId>,
 ) -> Option<Module> {
    let source_root_id = db.file_source_root(file_id.as_original_file());
-    db.source_root_crates(source_root_id)
+    db.source_root_crates(source_root_id).iter().map(|&crate_id| Crate { crate_id }).find_map(
-        .iter()
+        |krate| {
-        .map(|&crate_id| Crate { crate_id })
-        .find_map(|krate| {
            let module_tree = db.module_tree(krate);
            let module_id = module_tree.find_module_by_source(file_id, decl_id)?;
            Some(Module { krate, module_id })
-        })
+        },
+    )
 }
 pub fn function_from_position(db: &impl HirDatabase, position: FilePosition) -> Option<Function> {
@@ -116,9 +111,7 @@ pub fn function_from_module(
    let (file_id, _) = module.definition_source(db);
    let file_id = file_id.into();
    let ctx = LocationCtx::new(db, module, file_id);
-    Function {
+    Function { id: ctx.to_def(fn_def) }
-        id: ctx.to_def(fn_def),
-    }
 }
 pub fn function_from_child_node(
@@ -138,18 +131,14 @@ pub fn struct_from_module(
    let (file_id, _) = module.definition_source(db);
    let file_id = file_id.into();
    let ctx = LocationCtx::new(db, module, file_id);
-    Struct {
+    Struct { id: ctx.to_def(struct_def) }
-        id: ctx.to_def(struct_def),
-    }
 }
 pub fn enum_from_module(db: &impl HirDatabase, module: Module, enum_def: &ast::EnumDef) -> Enum {
    let (file_id, _) = module.definition_source(db);
    let file_id = file_id.into();
    let ctx = LocationCtx::new(db, module, file_id);
-    Enum {
+    Enum { id: ctx.to_def(enum_def) }
-        id: ctx.to_def(enum_def),
-    }
 }
 pub fn trait_from_module(
@@ -160,9 +149,7 @@ pub fn trait_from_module(
    let (file_id, _) = module.definition_source(db);
    let file_id = file_id.into();
    let ctx = LocationCtx::new(db, module, file_id);
-    Trait {
+    Trait { id: ctx.to_def(trait_def) }
-        id: ctx.to_def(trait_def),
-    }
 }
 pub fn macro_symbols(db: &impl HirDatabase, file_id: FileId) -> Vec<(SmolStr, TextRange)> {
diff --git a/crates/ra_hir/src/ty.rs b/crates/ra_hir/src/ty.rs
index 86a7f8b83..453520bbe 100644
--- a/crates/ra_hir/src/ty.rs
+++ b/crates/ra_hir/src/ty.rs
@@ -305,10 +305,8 @@ impl Ty {
        match type_ref {
            TypeRef::Never => Ty::Never,
            TypeRef::Tuple(inner) => {
-                let inner_tys = inner
+                let inner_tys =
-                    .iter()
+                    inner.iter().map(|tr| Ty::from_hir(db, resolver, tr)).collect::<Vec<_>>();
-                    .map(|tr| Ty::from_hir(db, resolver, tr))
-                    .collect::<Vec<_>>();
                Ty::Tuple(inner_tys.into())
            }
            TypeRef::Path(path) => Ty::from_hir_path(db, resolver, path),
@@ -330,17 +328,11 @@ impl Ty {
            }
            TypeRef::Placeholder => Ty::Unknown,
            TypeRef::Fn(params) => {
-                let mut inner_tys = params
+                let mut inner_tys =
-                    .iter()
+                    params.iter().map(|tr| Ty::from_hir(db, resolver, tr)).collect::<Vec<_>>();
-                    .map(|tr| Ty::from_hir(db, resolver, tr))
+                let return_ty =
-                    .collect::<Vec<_>>();
+                    inner_tys.pop().expect("TypeRef::Fn should always have at least return type");
-                let return_ty = inner_tys
+                let sig = FnSig { input: inner_tys, output: return_ty };
-                    .pop()
-                    .expect("TypeRef::Fn should always have at least return type");
-                let sig = FnSig {
-                    input: inner_tys,
-                    output: return_ty,
-                };
                Ty::FnPtr(Arc::new(sig))
            }
            TypeRef::Error => Ty::Unknown,
@@ -407,10 +399,7 @@ impl Ty {
        resolved: TypableDef,
    ) -> Substs {
        let mut substs = Vec::new();
-        let last = path
+        let last = path.segments.last().expect("path should have at least one segment");
-            .segments
-            .last()
-            .expect("path should have at least one segment");
        let (def_generics, segment) = match resolved {
            TypableDef::Function(func) => (func.generic_params(db), last),
            TypableDef::Struct(s) => (s.generic_params(db), last),
@@ -447,11 +436,8 @@ impl Ty {
        }
        // add placeholders for args that were not provided
        // TODO: handle defaults
-        let supplied_params = segment
+        let supplied_params =
-            .args_and_bindings
+            segment.args_and_bindings.as_ref().map(|ga| ga.args.len()).unwrap_or(0);
-            .as_ref()
-            .map(|ga| ga.args.len())
-            .unwrap_or(0);
        for _ in supplied_params..def_generics.params.len() {
            substs.push(Ty::Unknown);
        }
@@ -531,17 +517,8 @@ impl Ty {
    /// `Option<u32>` afterwards.)
    pub fn apply_substs(self, substs: Substs) -> Ty {
        match self {
-            Ty::Adt { def_id, name, .. } => Ty::Adt {
+            Ty::Adt { def_id, name, .. } => Ty::Adt { def_id, name, substs },
-                def_id,
+            Ty::FnDef { def, name, sig, .. } => Ty::FnDef { def, name, sig, substs },
-                name,
-                substs,
-            },
-            Ty::FnDef { def, name, sig, .. } => Ty::FnDef {
-                def,
-                name,
-                sig,
-                substs,
-            },
            _ => self,
        }
    }
@@ -591,42 +568,25 @@ impl fmt::Display for Ty {
                if ts.len() == 1 {
                    write!(f, "({},)", ts[0])
                } else {
-                    join(ts.iter())
+                    join(ts.iter()).surround_with("(", ")").separator(", ").to_fmt(f)
-                        .surround_with("(", ")")
-                        .separator(", ")
-                        .to_fmt(f)
                }
            }
            Ty::FnPtr(sig) => {
-                join(sig.input.iter())
+                join(sig.input.iter()).surround_with("fn(", ")").separator(", ").to_fmt(f)?;
-                    .surround_with("fn(", ")")
-                    .separator(", ")
-                    .to_fmt(f)?;
                write!(f, " -> {}", sig.output)
            }
-            Ty::FnDef {
+            Ty::FnDef { name, substs, sig, .. } => {
-                name, substs, sig, ..
-            } => {
                write!(f, "fn {}", name)?;
                if substs.0.len() > 0 {
-                    join(substs.0.iter())
+                    join(substs.0.iter()).surround_with("<", ">").separator(", ").to_fmt(f)?;
-                        .surround_with("<", ">")
-                        .separator(", ")
-                        .to_fmt(f)?;
                }
-                join(sig.input.iter())
+                join(sig.input.iter()).surround_with("(", ")").separator(", ").to_fmt(f)?;
-                    .surround_with("(", ")")
-                    .separator(", ")
-                    .to_fmt(f)?;
                write!(f, " -> {}", sig.output)
            }
            Ty::Adt { name, substs, .. } => {
                write!(f, "{}", name)?;
                if substs.0.len() > 0 {
-                    join(substs.0.iter())
+                    join(substs.0.iter()).surround_with("<", ">").separator(", ").to_fmt(f)?;
-                        .surround_with("<", ">")
-                        .separator(", ")
-                        .to_fmt(f)?;
                }
                Ok(())
            }
@@ -646,31 +606,16 @@ fn type_for_fn(db: &impl HirDatabase, def: Function) -> Ty {
    let resolver = def.resolver(db);
    let generics = def.generic_params(db);
    let name = def.name(db);
-    let input = signature
+    let input =
-        .params()
+        signature.params().iter().map(|tr| Ty::from_hir(db, &resolver, tr)).collect::<Vec<_>>();
-        .iter()
-        .map(|tr| Ty::from_hir(db, &resolver, tr))
-        .collect::<Vec<_>>();
    let output = Ty::from_hir(db, &resolver, signature.ret_type());
    let sig = Arc::new(FnSig { input, output });
    let substs = make_substs(&generics);
-    Ty::FnDef {
+    Ty::FnDef { def, sig, name, substs }
-        def,
-        sig,
-        name,
-        substs,
-    }
 }
 fn make_substs(generics: &GenericParams) -> Substs {
-    Substs(
+    Substs(generics.params.iter().map(|_p| Ty::Unknown).collect::<Vec<_>>().into())
-        generics
-            .params
-            .iter()
-            .map(|_p| Ty::Unknown)
-            .collect::<Vec<_>>()
-            .into(),
-    )
 }
 fn type_for_struct(db: &impl HirDatabase, s: Struct) -> Ty {
@@ -935,11 +880,7 @@ impl<'a, D: HirDatabase> InferenceContext<'a, D> {
    }
    fn unify_substs(&mut self, substs1: &Substs, substs2: &Substs) -> bool {
-        substs1
+        substs1.0.iter().zip(substs2.0.iter()).all(|(t1, t2)| self.unify(t1, t2))
-            .0
-            .iter()
-            .zip(substs2.0.iter())
-            .all(|(t1, t2)| self.unify(t1, t2))
    }
    fn unify(&mut self, ty1: &Ty, ty2: &Ty) -> bool {
@@ -961,25 +902,16 @@ impl<'a, D: HirDatabase> InferenceContext<'a, D> {
            },
            (Ty::Bool, _) | (Ty::Str, _) | (Ty::Never, _) | (Ty::Char, _) => ty1 == ty2,
            (
-                Ty::Adt {
+                Ty::Adt { def_id: def_id1, substs: substs1, .. },
-                    def_id: def_id1,
+                Ty::Adt { def_id: def_id2, substs: substs2, .. },
-                    substs: substs1,
-                    ..
-                },
-                Ty::Adt {
-                    def_id: def_id2,
-                    substs: substs2,
-                    ..
-                },
            ) if def_id1 == def_id2 => self.unify_substs(substs1, substs2),
            (Ty::Slice(t1), Ty::Slice(t2)) => self.unify(t1, t2),
            (Ty::RawPtr(t1, m1), Ty::RawPtr(t2, m2)) if m1 == m2 => self.unify(t1, t2),
            (Ty::Ref(t1, m1), Ty::Ref(t2, m2)) if m1 == m2 => self.unify(t1, t2),
            (Ty::FnPtr(sig1), Ty::FnPtr(sig2)) if sig1 == sig2 => true,
-            (Ty::Tuple(ts1), Ty::Tuple(ts2)) if ts1.len() == ts2.len() => ts1
+            (Ty::Tuple(ts1), Ty::Tuple(ts2)) if ts1.len() == ts2.len() => {
-                .iter()
+                ts1.iter().zip(ts2.iter()).all(|(t1, t2)| self.unify(t1, t2))
-                .zip(ts2.iter())
+            }
-                .all(|(t1, t2)| self.unify(t1, t2)),
            (Ty::Infer(InferTy::TypeVar(tv1)), Ty::Infer(InferTy::TypeVar(tv2)))
            | (Ty::Infer(InferTy::IntVar(tv1)), Ty::Infer(InferTy::IntVar(tv2)))
            | (Ty::Infer(InferTy::FloatVar(tv1)), Ty::Infer(InferTy::FloatVar(tv2))) => {
@@ -994,8 +926,7 @@ impl<'a, D: HirDatabase> InferenceContext<'a, D> {
            | (Ty::Infer(InferTy::FloatVar(tv)), other)
            | (other, Ty::Infer(InferTy::FloatVar(tv))) => {
                // the type var is unknown since we tried to resolve it
-                self.var_unification_table
+                self.var_unification_table.union_value(*tv, TypeVarValue::Known(other.clone()));
-                    .union_value(*tv, TypeVarValue::Known(other.clone()));
                true
            }
            _ => false,
@@ -1003,21 +934,15 @@ impl<'a, D: HirDatabase> InferenceContext<'a, D> {
    }
    fn new_type_var(&mut self) -> Ty {
-        Ty::Infer(InferTy::TypeVar(
+        Ty::Infer(InferTy::TypeVar(self.var_unification_table.new_key(TypeVarValue::Unknown)))
-            self.var_unification_table.new_key(TypeVarValue::Unknown),
-        ))
    }
    fn new_integer_var(&mut self) -> Ty {
-        Ty::Infer(InferTy::IntVar(
+        Ty::Infer(InferTy::IntVar(self.var_unification_table.new_key(TypeVarValue::Unknown)))
-            self.var_unification_table.new_key(TypeVarValue::Unknown),
-        ))
    }
    fn new_float_var(&mut self) -> Ty {
-        Ty::Infer(InferTy::FloatVar(
+        Ty::Infer(InferTy::FloatVar(self.var_unification_table.new_key(TypeVarValue::Unknown)))
-            self.var_unification_table.new_key(TypeVarValue::Unknown),
-        ))
    }
    /// Replaces Ty::Unknown by a new type var, so we can maybe still infer it.
@@ -1207,9 +1132,8 @@ impl<'a, D: HirDatabase> InferenceContext<'a, D> {
        for subpat in subpats {
            let matching_field = def.and_then(|it| it.field(self.db, &subpat.name));
-            let expected_ty = matching_field
+            let expected_ty =
-                .map_or(Ty::Unknown, |field| field.ty(self.db))
+                matching_field.map_or(Ty::Unknown, |field| field.ty(self.db)).subst(&substs);
-                .subst(&substs);
            self.infer_pat(subpat.pat, &expected_ty);
        }
@@ -1249,25 +1173,18 @@ impl<'a, D: HirDatabase> InferenceContext<'a, D> {
                let subty = self.infer_pat(*pat, expectation);
                Ty::Ref(subty.into(), *mutability)
            }
-            Pat::TupleStruct {
+            Pat::TupleStruct { path: ref p, args: ref subpats } => {
-                path: ref p,
+                self.infer_tuple_struct_pat(p.as_ref(), subpats, expected)
-                args: ref subpats,
+            }
-            } => self.infer_tuple_struct_pat(p.as_ref(), subpats, expected),
+            Pat::Struct { path: ref p, args: ref fields } => {
-            Pat::Struct {
+                self.infer_struct_pat(p.as_ref(), fields, expected)
-                path: ref p,
+            }
-                args: ref fields,
-            } => self.infer_struct_pat(p.as_ref(), fields, expected),
            Pat::Path(path) => {
                // TODO use correct resolver for the surrounding expression
                let resolver = self.resolver.clone();
-                self.infer_path_expr(&resolver, &path)
+                self.infer_path_expr(&resolver, &path).unwrap_or(Ty::Unknown)
-                    .unwrap_or(Ty::Unknown)
+            }
-            }
+            Pat::Bind { mode, name: _name, subpat } => {
-            Pat::Bind {
-                mode,
-                name: _name,
-                subpat,
-            } => {
                let subty = if let Some(subpat) = subpat {
                    self.infer_pat(*subpat, expected)
                } else {
@@ -1294,11 +1211,7 @@ impl<'a, D: HirDatabase> InferenceContext<'a, D> {
        let body = Arc::clone(&self.body); // avoid borrow checker problem
        let ty = match &body[tgt_expr] {
            Expr::Missing => Ty::Unknown,
-            Expr::If {
+            Expr::If { condition, then_branch, else_branch } => {
-                condition,
-                then_branch,
-                else_branch,
-            } => {
                // 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);
@@ -1325,21 +1238,13 @@ impl<'a, D: HirDatabase> InferenceContext<'a, D> {
                self.infer_expr(*body, &Expectation::has_type(Ty::unit()));
                Ty::unit()
            }
-            Expr::For {
+            Expr::For { iterable, body, pat } => {
-                iterable,
-                body,
-                pat,
-            } => {
                let _iterable_ty = self.infer_expr(*iterable, &Expectation::none());
                self.infer_pat(*pat, &Ty::Unknown);
                self.infer_expr(*body, &Expectation::has_type(Ty::unit()));
                Ty::unit()
            }
-            Expr::Lambda {
+            Expr::Lambda { body, args, arg_types } => {
-                body,
-                args,
-                arg_types,
-            } => {
                assert_eq!(args.len(), arg_types.len());
                for (arg_pat, arg_type) in args.iter().zip(arg_types.iter()) {
@@ -1362,11 +1267,8 @@ impl<'a, D: HirDatabase> InferenceContext<'a, D> {
                    Ty::FnPtr(sig) => (sig.input.clone(), sig.output.clone()),
                    Ty::FnDef { substs, sig, .. } => {
                        let ret_ty = sig.output.clone().subst(&substs);
-                        let param_tys = sig
+                        let param_tys =
-                            .input
+                            sig.input.iter().map(|ty| ty.clone().subst(&substs)).collect();
-                            .iter()
-                            .map(|ty| ty.clone().subst(&substs))
-                            .collect();
                        (param_tys, ret_ty)
                    }
                    _ => {
@@ -1381,11 +1283,7 @@ impl<'a, D: HirDatabase> InferenceContext<'a, D> {
                }
                ret_ty
            }
-            Expr::MethodCall {
+            Expr::MethodCall { receiver, args, method_name } => {
-                receiver,
-                args,
-                method_name,
-            } => {
                let receiver_ty = self.infer_expr(*receiver, &Expectation::none());
                let resolved = receiver_ty.clone().lookup_method(self.db, method_name);
                let method_ty = match resolved {
@@ -1399,11 +1297,7 @@ impl<'a, D: HirDatabase> InferenceContext<'a, D> {
                let (expected_receiver_ty, param_tys, ret_ty) = match &method_ty {
                    Ty::FnPtr(sig) => {
                        if !sig.input.is_empty() {
-                            (
+                            (sig.input[0].clone(), sig.input[1..].to_vec(), sig.output.clone())
-                                sig.input[0].clone(),
-                                sig.input[1..].to_vec(),
-                                sig.output.clone(),
-                            )
                        } else {
                            (Ty::Unknown, Vec::new(), sig.output.clone())
                        }
@@ -1469,11 +1363,7 @@ impl<'a, D: HirDatabase> InferenceContext<'a, D> {
                }
                Ty::Never
            }
-            Expr::StructLit {
+            Expr::StructLit { path, fields, spread } => {
-                path,
-                fields,
-                spread,
-            } => {
                let (ty, def_id) = self.resolve_variant(path.as_ref());
                let substs = ty.substs().unwrap_or_else(Substs::empty);
                for field in fields {
@@ -1497,14 +1387,12 @@ impl<'a, D: HirDatabase> InferenceContext<'a, D> {
                            let i = name.to_string().parse::<usize>().ok();
                            i.and_then(|i| fields.get(i).cloned())
                        }
-                        Ty::Adt {
+                        Ty::Adt { def_id: AdtDef::Struct(s), ref substs, .. } => {
-                            def_id: AdtDef::Struct(s),
+                            s.field(self.db, name).map(|field| {
-                            ref substs,
+                                self.write_field_resolution(tgt_expr, field);
-                            ..
+                                field.ty(self.db).subst(substs)
-                        } => s.field(self.db, name).map(|field| {
+                            })
-                            self.write_field_resolution(tgt_expr, field);
+                        }
-                            field.ty(self.db).subst(substs)
-                        }),
                        _ => None,
                    })
                    .unwrap_or(Ty::Unknown);
@@ -1635,15 +1523,9 @@ impl<'a, D: HirDatabase> InferenceContext<'a, D> {
    ) -> Ty {
        for stmt in statements {
            match stmt {
-                Statement::Let {
+                Statement::Let { pat, type_ref, initializer } => {
-                    pat,
+                    let decl_ty =
-                    type_ref,
+                        type_ref.as_ref().map(|tr| self.make_ty(tr)).unwrap_or(Ty::Unknown);
-                    initializer,
-                } => {
-                    let decl_ty = type_ref
-                        .as_ref()
-                        .map(|tr| self.make_ty(tr))
-                        .unwrap_or(Ty::Unknown);
                    let decl_ty = self.insert_type_vars(decl_ty);
                    let ty = if let Some(expr) = initializer {
                        let expr_ty = self.infer_expr(*expr, &Expectation::has_type(decl_ty));
@@ -1659,11 +1541,7 @@ impl<'a, D: HirDatabase> InferenceContext<'a, D> {
                }
            }
        }
-        let ty = if let Some(expr) = tail {
+        let ty = if let Some(expr) = tail { self.infer_expr(expr, expected) } else { Ty::unit() };
-            self.infer_expr(expr, expected)
-        } else {
-            Ty::unit()
-        };
        ty
    }
@@ -1678,10 +1556,7 @@ impl<'a, D: HirDatabase> InferenceContext<'a, D> {
    }
    fn infer_body(&mut self) {
-        self.infer_expr(
+        self.infer_expr(self.body.body_expr(), &Expectation::has_type(self.return_ty.clone()));
-            self.body.body_expr(),
-            &Expectation::has_type(self.return_ty.clone()),
-        );
    }
 }
diff --git a/crates/ra_hir/src/ty/method_resolution.rs b/crates/ra_hir/src/ty/method_resolution.rs
index a7d4517ee..da7587f01 100644
--- a/crates/ra_hir/src/ty/method_resolution.rs
+++ b/crates/ra_hir/src/ty/method_resolution.rs
@@ -46,18 +46,13 @@ impl CrateImplBlocks {
        ty: &Ty,
    ) -> impl Iterator<Item = (Module, ImplBlock)> + 'a {
        let fingerprint = TyFingerprint::for_impl(ty);
-        fingerprint
+        fingerprint.and_then(|f| self.impls.get(&f)).into_iter().flat_map(|i| i.iter()).map(
-            .and_then(|f| self.impls.get(&f))
+            move |(module_id, impl_id)| {
-            .into_iter()
+                let module = Module { krate: self.krate, module_id: *module_id };
-            .flat_map(|i| i.iter())
-            .map(move |(module_id, impl_id)| {
-                let module = Module {
-                    krate: self.krate,
-                    module_id: *module_id,
-                };
                let module_impl_blocks = db.impls_in_module(module);
                (module, ImplBlock::from_id(module_impl_blocks, *impl_id))
-            })
+            },
+        )
    }
    pub fn lookup_impl_blocks_for_trait<'a>(
@@ -66,18 +61,13 @@ impl CrateImplBlocks {
        tr: &Trait,
    ) -> impl Iterator<Item = (Module, ImplBlock)> + 'a {
        let id = tr.id;
-        self.impls_by_trait
+        self.impls_by_trait.get(&id).into_iter().flat_map(|i| i.iter()).map(
-            .get(&id)
+            move |(module_id, impl_id)| {
-            .into_iter()
+                let module = Module { krate: self.krate, module_id: *module_id };
-            .flat_map(|i| i.iter())
-            .map(move |(module_id, impl_id)| {
-                let module = Module {
-                    krate: self.krate,
-                    module_id: *module_id,
-                };
                let module_impl_blocks = db.impls_in_module(module);
                (module, ImplBlock::from_id(module_impl_blocks, *impl_id))
-            })
+            },
+        )
    }
    fn collect_recursive(&mut self, db: &impl HirDatabase, module: &Module) {
diff --git a/crates/ra_hir/src/ty/tests.rs b/crates/ra_hir/src/ty/tests.rs
index 30da8fc23..2621d1b55 100644
--- a/crates/ra_hir/src/ty/tests.rs
+++ b/crates/ra_hir/src/ty/tests.rs
@@ -634,11 +634,7 @@ fn infer(content: &str) -> String {
    let (db, _, file_id) = MockDatabase::with_single_file(content);
    let source_file = db.parse(file_id);
    let mut acc = String::new();
-    for fn_def in source_file
+    for fn_def in source_file.syntax().descendants().filter_map(ast::FnDef::cast) {
-        .syntax()
-        .descendants()
-        .filter_map(ast::FnDef::cast)
-    {
        let func = source_binder::function_from_source(&db, file_id, fn_def).unwrap();
        let inference_result = func.infer(&db);
        let body_syntax_mapping = func.body_syntax_mapping(&db);
@@ -725,8 +721,7 @@ fn typing_whitespace_inside_a_function_should_not_invalidate_types() {
    "
    .to_string();
-    db.query_mut(ra_db::FileTextQuery)
+    db.query_mut(ra_db::FileTextQuery).set(pos.file_id, Arc::new(new_text));
-        .set(pos.file_id, Arc::new(new_text));
    {
        let events = db.log_executed(|| {
diff --git a/crates/ra_hir/src/type_ref.rs b/crates/ra_hir/src/type_ref.rs
index c9db4e0a5..ee8b7376a 100644
--- a/crates/ra_hir/src/type_ref.rs
+++ b/crates/ra_hir/src/type_ref.rs
@@ -62,11 +62,9 @@ impl TypeRef {
            ParenType(inner) => TypeRef::from_ast_opt(inner.type_ref()),
            TupleType(inner) => TypeRef::Tuple(inner.fields().map(TypeRef::from_ast).collect()),
            NeverType(..) => TypeRef::Never,
-            PathType(inner) => inner
+            PathType(inner) => {
-                .path()
+                inner.path().and_then(Path::from_ast).map(TypeRef::Path).unwrap_or(TypeRef::Error)
-                .and_then(Path::from_ast)
+            }
-                .map(TypeRef::Path)
-                .unwrap_or(TypeRef::Error),
            PointerType(inner) => {
                let inner_ty = TypeRef::from_ast_opt(inner.type_ref());
                let mutability = Mutability::from_mutable(inner.is_mut());
@@ -83,10 +81,7 @@ impl TypeRef {
            FnPointerType(inner) => {
                let ret_ty = TypeRef::from_ast_opt(inner.ret_type().and_then(|rt| rt.type_ref()));
                let mut params = if let Some(pl) = inner.param_list() {
-                    pl.params()
+                    pl.params().map(|p| p.type_ref()).map(TypeRef::from_ast_opt).collect()
-                        .map(|p| p.type_ref())
-                        .map(TypeRef::from_ast_opt)
-                        .collect()
                } else {
                    Vec::new()
                };
diff --git a/crates/ra_ide_api/src/assists.rs b/crates/ra_ide_api/src/assists.rs
index 2a96fdf47..7a9c66681 100644
--- a/crates/ra_ide_api/src/assists.rs
+++ b/crates/ra_ide_api/src/assists.rs
@@ -7,10 +7,7 @@ pub(crate) fn assists(db: &RootDatabase, frange: FileRange) -> Vec<SourceChange>
        .into_iter()
        .map(|(label, action)| {
            let file_id = frange.file_id;
-            let file_edit = SourceFileEdit {
+            let file_edit = SourceFileEdit { file_id, edit: action.edit };
-                file_id,
-                edit: action.edit,
-            };
            SourceChange {
                label: label.label,
                source_file_edits: vec![file_edit],
diff --git a/crates/ra_ide_api/src/call_info.rs b/crates/ra_ide_api/src/call_info.rs
index a59ab7853..1b279615c 100644
--- a/crates/ra_ide_api/src/call_info.rs
+++ b/crates/ra_ide_api/src/call_info.rs
@@ -21,9 +21,7 @@ pub(crate) fn call_info(db: &RootDatabase, position: FilePosition) -> Option<Cal
    // Resolve the function's NameRef (NOTE: this isn't entirely accurate).
    let file_symbols = crate::symbol_index::index_resolve(db, name_ref);
-    let symbol = file_symbols
+    let symbol = file_symbols.into_iter().find(|it| it.ptr.kind() == FN_DEF)?;
-        .into_iter()
-        .find(|it| it.ptr.kind() == FN_DEF)?;
    let fn_file = db.parse(symbol.file_id);
    let fn_def = symbol.ptr.to_node(&fn_file);
    let fn_def = ast::FnDef::cast(fn_def).unwrap();
@@ -53,13 +51,8 @@ pub(crate) fn call_info(db: &RootDatabase, position: FilePosition) -> Option<Cal
            let start = arg_list_range.start();
            let range_search = TextRange::from_to(start, position.offset);
-            let mut commas: usize = arg_list
+            let mut commas: usize =
-                .syntax()
+                arg_list.syntax().text().slice(range_search).to_string().matches(',').count();
-                .text()
-                .slice(range_search)
-                .to_string()
-                .matches(',')
-                .count();
            // If we have a method call eat the first param since it's just self.
            if has_self {
@@ -96,11 +89,9 @@ impl<'a> FnCallNode<'a> {
                _ => return None,
            }),
-            FnCallNode::MethodCallExpr(call_expr) => call_expr
+            FnCallNode::MethodCallExpr(call_expr) => {
-                .syntax()
+                call_expr.syntax().children().filter_map(ast::NameRef::cast).nth(0)
-                .children()
+            }
-                .filter_map(ast::NameRef::cast)
-                .nth(0),
        }
    }
@@ -117,12 +108,7 @@ impl CallInfo {
        let label = crate::completion::function_label(node)?;
        let doc = function.docs(db);
-        Some(CallInfo {
+        Some(CallInfo { parameters: param_list(node), label, doc, active_parameter: None })
-            parameters: param_list(node),
-            label,
-            doc,
-            active_parameter: None,
-        })
    }
 }
@@ -136,10 +122,7 @@ fn param_list(node: &ast::FnDef) -> Vec<String> {
        // Maybe use param.pat here? See if we can just extract the name?
        //res.extend(param_list.params().map(|p| p.syntax().text().to_string()));
        res.extend(
-            param_list
+            param_list.params().filter_map(|p| p.pat()).map(|pat| pat.syntax().text().to_string()),
-                .params()
-                .filter_map(|p| p.pat())
-                .map(|pat| pat.syntax().text().to_string()),
        );
    }
    res
@@ -378,10 +361,7 @@ pub fn foo() {
 "#,
        );
-        assert_eq!(
+        assert_eq!(info.parameters, vec!["&mut self".to_string(), "ctx".to_string()]);
-            info.parameters,
-            vec!["&mut self".to_string(), "ctx".to_string()]
-        );
        assert_eq!(info.active_parameter, Some(1));
        assert_eq!(
            info.doc.map(|it| it.into()),
diff --git a/crates/ra_ide_api/src/change.rs b/crates/ra_ide_api/src/change.rs
index 992955740..3f041f9c3 100644
--- a/crates/ra_ide_api/src/change.rs
+++ b/crates/ra_ide_api/src/change.rs
@@ -65,16 +65,8 @@ impl AnalysisChange {
        path: RelativePathBuf,
        text: Arc<String>,
    ) {
-        let file = AddFile {
+        let file = AddFile { file_id, path, text };
-            file_id,
+        self.roots_changed.entry(root_id).or_default().added.push(file);
-            path,
-            text,
-        };
-        self.roots_changed
-            .entry(root_id)
-            .or_default()
-            .added
-            .push(file);
    }
    pub fn change_file(&mut self, file_id: FileId, new_text: Arc<String>) {
@@ -83,11 +75,7 @@ impl AnalysisChange {
    pub fn remove_file(&mut self, root_id: SourceRootId, file_id: FileId, path: RelativePathBuf) {
        let file = RemoveFile { file_id, path };
-        self.roots_changed
+        self.roots_changed.entry(root_id).or_default().removed.push(file);
-            .entry(root_id)
-            .or_default()
-            .removed
-            .push(file);
    }
    pub fn add_library(&mut self, data: LibraryData) {
@@ -155,17 +143,9 @@ impl LibraryData {
        let mut root_change = RootChange::default();
        root_change.added = files
            .into_iter()
-            .map(|(file_id, path, text)| AddFile {
+            .map(|(file_id, path, text)| AddFile { file_id, path, text })
-                file_id,
-                path,
-                text,
-            })
            .collect();
-        LibraryData {
+        LibraryData { root_id, root_change, symbol_index }
-            root_id,
-            root_change,
-            symbol_index,
-        }
    }
 }
@@ -226,10 +206,7 @@ impl RootDatabase {
            self.last_gc_check = time::Instant::now();
            let retained_trees = syntax_tree_stats(self).retained;
            if retained_trees > 100 {
-                log::info!(
+                log::info!("automatic garbadge collection, {} retained trees", retained_trees);
-                    "automatic garbadge collection, {} retained trees",
-                    retained_trees
-                );
                self.collect_garbage();
            }
        }
@@ -238,9 +215,7 @@ impl RootDatabase {
    pub(crate) fn collect_garbage(&mut self) {
        self.last_gc = time::Instant::now();
-        let sweep = SweepStrategy::default()
+        let sweep = SweepStrategy::default().discard_values().sweep_all_revisions();
-            .discard_values()
-            .sweep_all_revisions();
        self.query(ra_db::ParseQuery).sweep(sweep);
diff --git a/crates/ra_ide_api/src/completion/complete_dot.rs b/crates/ra_ide_api/src/completion/complete_dot.rs
index bad51cc51..a673dbdcf 100644
--- a/crates/ra_ide_api/src/completion/complete_dot.rs
+++ b/crates/ra_ide_api/src/completion/complete_dot.rs
@@ -25,9 +25,7 @@ pub(super) fn complete_dot(acc: &mut Completions, ctx: &CompletionContext) {
 fn complete_fields(acc: &mut Completions, ctx: &CompletionContext, receiver: Ty) {
    for receiver in receiver.autoderef(ctx.db) {
        match receiver {
-            Ty::Adt {
+            Ty::Adt { def_id, ref substs, .. } => {
-                def_id, ref substs, ..
-            } => {
                match def_id {
                    AdtDef::Struct(s) => {
                        for field in s.fields(ctx.db) {
diff --git a/crates/ra_ide_api/src/completion/complete_fn_param.rs b/crates/ra_ide_api/src/completion/complete_fn_param.rs
index 8d4df4ea1..43532226f 100644
--- a/crates/ra_ide_api/src/completion/complete_fn_param.rs
+++ b/crates/ra_ide_api/src/completion/complete_fn_param.rs
@@ -43,13 +43,12 @@ pub(super) fn complete_fn_param(acc: &mut Completions, ctx: &CompletionContext)
        node: &'a N,
        params: &mut FxHashMap<String, (u32, &'a ast::Param)>,
    ) {
-        node.functions()
+        node.functions().filter_map(|it| it.param_list()).flat_map(|it| it.params()).for_each(
-            .filter_map(|it| it.param_list())
+            |param| {
-            .flat_map(|it| it.params())
-            .for_each(|param| {
                let text = param.syntax().text().to_string();
                params.entry(text).or_insert((0, param)).0 += 1;
-            })
+            },
+        )
    }
 }
diff --git a/crates/ra_ide_api/src/completion/complete_path.rs b/crates/ra_ide_api/src/completion/complete_path.rs
index 0b9948d4b..c47a14e9f 100644
--- a/crates/ra_ide_api/src/completion/complete_path.rs
+++ b/crates/ra_ide_api/src/completion/complete_path.rs
@@ -31,14 +31,10 @@ pub(super) fn complete_path(acc: &mut Completions, ctx: &CompletionContext) {
        hir::ModuleDef::Enum(e) => {
            e.variants(ctx.db).into_iter().for_each(|variant| {
                if let Some(name) = variant.name(ctx.db) {
-                    let detail_types = variant
+                    let detail_types =
-                        .fields(ctx.db)
+                        variant.fields(ctx.db).into_iter().map(|field| field.ty(ctx.db));
-                        .into_iter()
+                    let detail =
-                        .map(|field| field.ty(ctx.db));
+                        join(detail_types).separator(", ").surround_with("(", ")").to_string();
-                    let detail = join(detail_types)
-                        .separator(", ")
-                        .surround_with("(", ")")
-                        .to_string();
                    CompletionItem::new(
                        CompletionKind::Reference,
diff --git a/crates/ra_ide_api/src/completion/complete_postfix.rs b/crates/ra_ide_api/src/completion/complete_postfix.rs
index e3a739d6d..10a3c8db7 100644
--- a/crates/ra_ide_api/src/completion/complete_postfix.rs
+++ b/crates/ra_ide_api/src/completion/complete_postfix.rs
@@ -17,11 +17,7 @@ use ra_text_edit::TextEditBuilder;
 fn postfix_snippet(ctx: &CompletionContext, label: &str, snippet: &str) -> Builder {
    let replace_range = ctx.source_range();
-    let receiver_range = ctx
+    let receiver_range = ctx.dot_receiver.expect("no receiver available").syntax().range();
-        .dot_receiver
-        .expect("no receiver available")
-        .syntax()
-        .range();
    let delete_range = TextRange::from_to(receiver_range.start(), replace_range.start());
    let mut builder = TextEditBuilder::default();
    builder.delete(delete_range);
diff --git a/crates/ra_ide_api/src/completion/complete_scope.rs b/crates/ra_ide_api/src/completion/complete_scope.rs
index 8674b1e66..445788407 100644
--- a/crates/ra_ide_api/src/completion/complete_scope.rs
+++ b/crates/ra_ide_api/src/completion/complete_scope.rs
@@ -7,13 +7,9 @@ pub(super) fn complete_scope(acc: &mut Completions, ctx: &CompletionContext) {
    let names = ctx.resolver.all_names();
    names.into_iter().for_each(|(name, res)| {
-        CompletionItem::new(
+        CompletionItem::new(CompletionKind::Reference, ctx.source_range(), name.to_string())
-            CompletionKind::Reference,
+            .from_resolution(ctx, &res)
-            ctx.source_range(),
+            .add_to(acc)
-            name.to_string(),
-        )
-        .from_resolution(ctx, &res)
-        .add_to(acc)
    });
 }
diff --git a/crates/ra_ide_api/src/completion/completion_context.rs b/crates/ra_ide_api/src/completion/completion_context.rs
index 8abab0221..82bd4d606 100644
--- a/crates/ra_ide_api/src/completion/completion_context.rs
+++ b/crates/ra_ide_api/src/completion/completion_context.rs
@@ -108,12 +108,8 @@ impl<'a> CompletionContext<'a> {
    }
    fn classify_name_ref(&mut self, original_file: &'a SourceFile, name_ref: &ast::NameRef) {
        let name_range = name_ref.syntax().range();
-        let top_node = name_ref
+        let top_node =
-            .syntax()
+            name_ref.syntax().ancestors().take_while(|it| it.range() == name_range).last().unwrap();
-            .ancestors()
-            .take_while(|it| it.range() == name_range)
-            .last()
-            .unwrap();
        match top_node.parent().map(|it| it.kind()) {
            Some(SOURCE_FILE) | Some(ITEM_LIST) => {
diff --git a/crates/ra_ide_api/src/completion/completion_item.rs b/crates/ra_ide_api/src/completion/completion_item.rs
index 92e6e78bf..7b8972af0 100644
--- a/crates/ra_ide_api/src/completion/completion_item.rs
+++ b/crates/ra_ide_api/src/completion/completion_item.rs
@@ -105,10 +105,7 @@ impl CompletionItem {
    }
    /// What string is used for filtering.
    pub fn lookup(&self) -> &str {
-        self.lookup
+        self.lookup.as_ref().map(|it| it.as_str()).unwrap_or_else(|| self.label())
-            .as_ref()
-            .map(|it| it.as_str())
-            .unwrap_or_else(|| self.label())
    }
    pub fn insert_text_format(&self) -> InsertTextFormat {
@@ -214,10 +211,7 @@ impl Builder {
    ) -> Builder {
        use hir::ModuleDef::*;
-        let def = resolution
+        let def = resolution.as_ref().take_types().or_else(|| resolution.as_ref().take_values());
-            .as_ref()
-            .take_types()
-            .or_else(|| resolution.as_ref().take_values());
        let def = match def {
            None => return self,
            Some(it) => it,
@@ -323,10 +317,8 @@ pub(crate) fn check_completion(test_name: &str, code: &str, kind: CompletionKind
    };
    let completions = completions(&analysis.db, position).unwrap();
    let completion_items: Vec<CompletionItem> = completions.into();
-    let mut kind_completions: Vec<CompletionItem> = completion_items
+    let mut kind_completions: Vec<CompletionItem> =
-        .into_iter()
+        completion_items.into_iter().filter(|c| c.completion_kind == kind).collect();
-        .filter(|c| c.completion_kind == kind)
-        .collect();
    kind_completions.sort_by_key(|c| c.label.clone());
    assert_debug_snapshot_matches!(test_name, kind_completions);
 }
diff --git a/crates/ra_ide_api/src/diagnostics.rs b/crates/ra_ide_api/src/diagnostics.rs
index a499ac7c6..53d95fb4c 100644
--- a/crates/ra_ide_api/src/diagnostics.rs
+++ b/crates/ra_ide_api/src/diagnostics.rs
@@ -21,10 +21,8 @@ pub(crate) fn diagnostics(db: &RootDatabase, file_id: FileId) -> Vec<Diagnostic>
            let source_root = db.file_source_root(file_id);
            let diag = match problem {
                Problem::UnresolvedModule { candidate } => {
-                    let create_file = FileSystemEdit::CreateFile {
+                    let create_file =
-                        source_root,
+                        FileSystemEdit::CreateFile { source_root, path: candidate.clone() };
-                        path: candidate.clone(),
-                    };
                    let fix = SourceChange {
                        label: "create module".to_string(),
                        source_file_edits: Vec::new(),
@@ -44,10 +42,8 @@ pub(crate) fn diagnostics(db: &RootDatabase, file_id: FileId) -> Vec<Diagnostic>
                        dst_source_root: source_root,
                        dst_path: move_to.clone(),
                    };
-                    let create_file = FileSystemEdit::CreateFile {
+                    let create_file =
-                        source_root,
+                        FileSystemEdit::CreateFile { source_root, path: move_to.join(candidate) };
-                        path: move_to.join(candidate),
-                    };
                    let fix = SourceChange {
                        label: "move file and create module".to_string(),
                        source_file_edits: Vec::new(),
diff --git a/crates/ra_ide_api/src/extend_selection.rs b/crates/ra_ide_api/src/extend_selection.rs
index f61feaf1b..4051728e1 100644
--- a/crates/ra_ide_api/src/extend_selection.rs
+++ b/crates/ra_ide_api/src/extend_selection.rs
@@ -31,9 +31,7 @@ fn extend_selection_in_macro(
 }
 fn find_macro_call(node: &SyntaxNode, range: TextRange) -> Option<&ast::MacroCall> {
-    find_covering_node(node, range)
+    find_covering_node(node, range).ancestors().find_map(ast::MacroCall::cast)
-        .ancestors()
-        .find_map(ast::MacroCall::cast)
 }
 #[cfg(test)]
diff --git a/crates/ra_ide_api/src/goto_definition.rs b/crates/ra_ide_api/src/goto_definition.rs
index 69f2d2bf6..413720960 100644
--- a/crates/ra_ide_api/src/goto_definition.rs
+++ b/crates/ra_ide_api/src/goto_definition.rs
@@ -50,18 +50,13 @@ pub(crate) fn reference_definition(
        hir::source_binder::function_from_child_node(db, file_id, name_ref.syntax())
    {
        // Check if it is a method
-        if let Some(method_call) = name_ref
+        if let Some(method_call) = name_ref.syntax().parent().and_then(ast::MethodCallExpr::cast) {
-            .syntax()
-            .parent()
-            .and_then(ast::MethodCallExpr::cast)
-        {
            tested_by!(goto_definition_works_for_methods);
            let infer_result = function.infer(db);
            let syntax_mapping = function.body_syntax_mapping(db);
            let expr = ast::Expr::cast(method_call.syntax()).unwrap();
-            if let Some(func) = syntax_mapping
+            if let Some(func) =
-                .node_expr(expr)
+                syntax_mapping.node_expr(expr).and_then(|it| infer_result.method_resolution(it))
-                .and_then(|it| infer_result.method_resolution(it))
            {
                return Exact(NavigationTarget::from_function(db, func));
            };
@@ -72,9 +67,8 @@ pub(crate) fn reference_definition(
            let infer_result = function.infer(db);
            let syntax_mapping = function.body_syntax_mapping(db);
            let expr = ast::Expr::cast(field_expr.syntax()).unwrap();
-            if let Some(field) = syntax_mapping
+            if let Some(field) =
-                .node_expr(expr)
+                syntax_mapping.node_expr(expr).and_then(|it| infer_result.field_resolution(it))
-                .and_then(|it| infer_result.field_resolution(it))
            {
                return Exact(NavigationTarget::from_field(db, field));
            };
@@ -82,29 +76,19 @@ pub(crate) fn reference_definition(
    }
    // Try name resolution
    let resolver = hir::source_binder::resolver_for_node(db, file_id, name_ref.syntax());
-    if let Some(path) = name_ref
+    if let Some(path) =
-        .syntax()
+        name_ref.syntax().ancestors().find_map(ast::Path::cast).and_then(hir::Path::from_ast)
-        .ancestors()
-        .find_map(ast::Path::cast)
-        .and_then(hir::Path::from_ast)
    {
        let resolved = resolver.resolve_path(db, &path);
-        match resolved
+        match resolved.clone().take_types().or_else(|| resolved.take_values()) {
-            .clone()
-            .take_types()
-            .or_else(|| resolved.take_values())
-        {
            Some(Resolution::Def(def)) => return Exact(NavigationTarget::from_def(db, def)),
            Some(Resolution::LocalBinding(pat)) => {
                let body = resolver.body().expect("no body for local binding");
                let syntax_mapping = body.syntax_mapping(db);
-                let ptr = syntax_mapping
+                let ptr =
-                    .pat_syntax(pat)
+                    syntax_mapping.pat_syntax(pat).expect("pattern not found in syntax mapping");
-                    .expect("pattern not found in syntax mapping");
+                let name =
-                let name = path
+                    path.as_ident().cloned().expect("local binding from a multi-segment path");
-                    .as_ident()
-                    .cloned()
-                    .expect("local binding from a multi-segment path");
                let nav = NavigationTarget::from_scope_entry(file_id, name, ptr);
                return Exact(nav);
            }
diff --git a/crates/ra_ide_api/src/hover.rs b/crates/ra_ide_api/src/hover.rs
index f993a461c..60b81567c 100644
--- a/crates/ra_ide_api/src/hover.rs
+++ b/crates/ra_ide_api/src/hover.rs
@@ -33,13 +33,9 @@ pub(crate) fn hover(db: &RootDatabase, position: FilePosition) -> Option<RangeIn
    }
    if range.is_none() {
        let node = find_leaf_at_offset(file.syntax(), position.offset).find_map(|leaf| {
-            leaf.ancestors()
+            leaf.ancestors().find(|n| ast::Expr::cast(*n).is_some() || ast::Pat::cast(*n).is_some())
-                .find(|n| ast::Expr::cast(*n).is_some() || ast::Pat::cast(*n).is_some())
        })?;
-        let frange = FileRange {
+        let frange = FileRange { file_id: position.file_id, range: node.range() };
-            file_id: position.file_id,
-            range: node.range(),
-        };
        res.extend(type_of(db, frange).map(Into::into));
        range = Some(node.range());
    };
@@ -126,10 +122,8 @@ impl NavigationTarget {
        where
            T: ast::NameOwner + ast::VisibilityOwner,
        {
-            let mut string = node
+            let mut string =
-                .visibility()
+                node.visibility().map(|v| format!("{} ", v.syntax().text())).unwrap_or_default();
-                .map(|v| format!("{} ", v.syntax().text()))
-                .unwrap_or_default();
            string.push_str(label);
            node.name()?.syntax().text().push_to(&mut string);
            Some(string)
diff --git a/crates/ra_ide_api/src/impls.rs b/crates/ra_ide_api/src/impls.rs
index 4fb054139..444c4aeb2 100644
--- a/crates/ra_ide_api/src/impls.rs
+++ b/crates/ra_ide_api/src/impls.rs
@@ -83,9 +83,7 @@ mod tests {
        let navs = analysis.goto_implementation(pos).unwrap().unwrap().info;
        assert_eq!(navs.len(), expected.len());
-        navs.into_iter()
+        navs.into_iter().enumerate().for_each(|(i, nav)| nav.assert_match(expected[i]));
-            .enumerate()
-            .for_each(|(i, nav)| nav.assert_match(expected[i]));
    }
    #[test]
@@ -109,10 +107,7 @@ mod tests {
            impl Foo {}
            impl Foo {}
            ",
-            &[
+            &["impl IMPL_BLOCK FileId(1) [12; 23)", "impl IMPL_BLOCK FileId(1) [24; 35)"],
-                "impl IMPL_BLOCK FileId(1) [12; 23)",
-                "impl IMPL_BLOCK FileId(1) [24; 35)",
-            ],
        );
    }
@@ -129,10 +124,7 @@ mod tests {
                impl super::Foo {}
            }
            ",
-            &[
+            &["impl IMPL_BLOCK FileId(1) [24; 42)", "impl IMPL_BLOCK FileId(1) [57; 75)"],
-                "impl IMPL_BLOCK FileId(1) [24; 42)",
-                "impl IMPL_BLOCK FileId(1) [57; 75)",
-            ],
        );
    }
@@ -149,10 +141,7 @@ mod tests {
            //- /b.rs
            impl crate::Foo {}
            ",
-            &[
+            &["impl IMPL_BLOCK FileId(2) [0; 18)", "impl IMPL_BLOCK FileId(3) [0; 18)"],
-                "impl IMPL_BLOCK FileId(2) [0; 18)",
-                "impl IMPL_BLOCK FileId(3) [0; 18)",
-            ],
        );
    }
@@ -183,10 +172,7 @@ mod tests {
            //- /b.rs
            impl crate::T for crate::Foo {}
            ",
-            &[
+            &["impl IMPL_BLOCK FileId(2) [0; 31)", "impl IMPL_BLOCK FileId(3) [0; 31)"],
-                "impl IMPL_BLOCK FileId(2) [0; 31)",
-                "impl IMPL_BLOCK FileId(3) [0; 31)",
-            ],
        );
    }
 }
diff --git a/crates/ra_ide_api/src/lib.rs b/crates/ra_ide_api/src/lib.rs
index 1f43b7623..2d090d9b4 100644
--- a/crates/ra_ide_api/src/lib.rs
+++ b/crates/ra_ide_api/src/lib.rs
@@ -90,15 +90,8 @@ pub struct SourceFileEdit {
 #[derive(Debug)]
 pub enum FileSystemEdit {
-    CreateFile {
+    CreateFile { source_root: SourceRootId, path: RelativePathBuf },
-        source_root: SourceRootId,
+    MoveFile { src: FileId, dst_source_root: SourceRootId, dst_path: RelativePathBuf },
-        path: RelativePathBuf,
-    },
-    MoveFile {
-        src: FileId,
-        dst_source_root: SourceRootId,
-        dst_path: RelativePathBuf,
-    },
 }
 #[derive(Debug)]
@@ -179,9 +172,7 @@ impl AnalysisHost {
    /// Returns a snapshot of the current state, which you can query for
    /// semantic information.
    pub fn analysis(&self) -> Analysis {
-        Analysis {
+        Analysis { db: self.db.snapshot() }
-            db: self.db.snapshot(),
-        }
    }
    /// Applies changes to the current state of the world. If there are
@@ -401,17 +392,12 @@ impl Analysis {
 impl SourceChange {
    pub(crate) fn from_local_edit(file_id: FileId, edit: LocalEdit) -> SourceChange {
-        let file_edit = SourceFileEdit {
+        let file_edit = SourceFileEdit { file_id, edit: edit.edit };
-            file_id,
-            edit: edit.edit,
-        };
        SourceChange {
            label: edit.label,
            source_file_edits: vec![file_edit],
            file_system_edits: vec![],
-            cursor_position: edit
+            cursor_position: edit.cursor_position.map(|offset| FilePosition { offset, file_id }),
-                .cursor_position
-                .map(|offset| FilePosition { offset, file_id }),
        }
    }
 }
diff --git a/crates/ra_ide_api/src/mock_analysis.rs b/crates/ra_ide_api/src/mock_analysis.rs
index 834b30541..8d8603062 100644
--- a/crates/ra_ide_api/src/mock_analysis.rs
+++ b/crates/ra_ide_api/src/mock_analysis.rs
@@ -41,10 +41,7 @@ impl MockAnalysis {
        let mut res = MockAnalysis::new();
        for entry in parse_fixture(fixture) {
            if entry.text.contains(CURSOR_MARKER) {
-                assert!(
+                assert!(position.is_none(), "only one marker (<|>) per fixture is allowed");
-                    position.is_none(),
-                    "only one marker (<|>) per fixture is allowed"
-                );
                position = Some(res.add_file_with_position(&entry.meta, &entry.text));
            } else {
                res.add_file(&entry.meta, &entry.text);
@@ -97,9 +94,7 @@ impl MockAnalysis {
                let other_crate = crate_graph.add_crate_root(file_id);
                let crate_name = path.parent().unwrap().file_name().unwrap();
                if let Some(root_crate) = root_crate {
-                    crate_graph
+                    crate_graph.add_dep(root_crate, crate_name.into(), other_crate).unwrap();
-                        .add_dep(root_crate, crate_name.into(), other_crate)
-                        .unwrap();
                }
            }
            change.add_file(source_root, file_id, path, Arc::new(contents));
diff --git a/crates/ra_ide_api/src/navigation_target.rs b/crates/ra_ide_api/src/navigation_target.rs
index 617908aed..a2e4b6506 100644
--- a/crates/ra_ide_api/src/navigation_target.rs
+++ b/crates/ra_ide_api/src/navigation_target.rs
@@ -72,10 +72,7 @@ impl NavigationTarget {
    pub(crate) fn from_module(db: &RootDatabase, module: hir::Module) -> NavigationTarget {
        let (file_id, source) = module.definition_source(db);
-        let name = module
+        let name = module.name(db).map(|it| it.to_string().into()).unwrap_or_default();
-            .name(db)
-            .map(|it| it.to_string().into())
-            .unwrap_or_default();
        match source {
            ModuleSource::SourceFile(node) => {
                NavigationTarget::from_syntax(file_id, name, None, node.syntax())
@@ -87,10 +84,7 @@ impl NavigationTarget {
    }
    pub(crate) fn from_module_to_decl(db: &RootDatabase, module: hir::Module) -> NavigationTarget {
-        let name = module
+        let name = module.name(db).map(|it| it.to_string().into()).unwrap_or_default();
-            .name(db)
-            .map(|it| it.to_string().into())
-            .unwrap_or_default();
        if let Some((file_id, source)) = module.declaration_source(db) {
            return NavigationTarget::from_syntax(file_id, name, None, source.syntax());
        }
diff --git a/crates/ra_ide_api/src/references.rs b/crates/ra_ide_api/src/references.rs
index b129f3134..2cb1cc9be 100644
--- a/crates/ra_ide_api/src/references.rs
+++ b/crates/ra_ide_api/src/references.rs
@@ -305,9 +305,7 @@ mod tests {
                }
            }
        }
-        let result = text_edit_bulder
+        let result = text_edit_bulder.finish().apply(&*analysis.file_text(file_id.unwrap()));
-            .finish()
-            .apply(&*analysis.file_text(file_id.unwrap()));
        assert_eq_text!(expected, &*result);
    }
 }
diff --git a/crates/ra_ide_api/src/runnables.rs b/crates/ra_ide_api/src/runnables.rs
index dc8c40ea6..d64b5a4e0 100644
--- a/crates/ra_ide_api/src/runnables.rs
+++ b/crates/ra_ide_api/src/runnables.rs
@@ -23,11 +23,7 @@ pub enum RunnableKind {
 pub(crate) fn runnables(db: &RootDatabase, file_id: FileId) -> Vec<Runnable> {
    let source_file = db.parse(file_id);
-    source_file
+    source_file.syntax().descendants().filter_map(|i| runnable(db, file_id, i)).collect()
-        .syntax()
-        .descendants()
-        .filter_map(|i| runnable(db, file_id, i))
-        .collect()
 }
 fn runnable(db: &RootDatabase, file_id: FileId, item: &SyntaxNode) -> Option<Runnable> {
@@ -45,20 +41,13 @@ fn runnable_fn(fn_def: &ast::FnDef) -> Option<Runnable> {
    let kind = if name == "main" {
        RunnableKind::Bin
    } else if fn_def.has_atom_attr("test") {
-        RunnableKind::Test {
+        RunnableKind::Test { name: name.to_string() }
-            name: name.to_string(),
-        }
    } else if fn_def.has_atom_attr("bench") {
-        RunnableKind::Bench {
+        RunnableKind::Bench { name: name.to_string() }
-            name: name.to_string(),
-        }
    } else {
        return None;
    };
-    Some(Runnable {
+    Some(Runnable { range: fn_def.syntax().range(), kind })
-        range: fn_def.syntax().range(),
-        kind,
-    })
 }
 fn runnable_mod(db: &RootDatabase, file_id: FileId, module: &ast::Module) -> Option<Runnable> {
@@ -77,16 +66,8 @@ fn runnable_mod(db: &RootDatabase, file_id: FileId, module: &ast::Module) -> Opt
    let module = hir::source_binder::module_from_child_node(db, file_id, module.syntax())?;
    // FIXME: thread cancellation instead of `.ok`ing
-    let path = module
+    let path = module.path_to_root(db).into_iter().rev().filter_map(|it| it.name(db)).join("::");
-        .path_to_root(db)
+    Some(Runnable { range, kind: RunnableKind::TestMod { path } })
-        .into_iter()
-        .rev()
-        .filter_map(|it| it.name(db))
-        .join("::");
-    Some(Runnable {
-        range,
-        kind: RunnableKind::TestMod { path },
-    })
 }
 #[cfg(test)]
diff --git a/crates/ra_ide_api/src/status.rs b/crates/ra_ide_api/src/status.rs
index bd355dd78..e0fc1c123 100644
--- a/crates/ra_ide_api/src/status.rs
+++ b/crates/ra_ide_api/src/status.rs
@@ -22,9 +22,7 @@ pub(crate) fn syntax_tree_stats(db: &RootDatabase) -> SyntaxTreeStats {
 pub(crate) fn status(db: &RootDatabase) -> String {
    let files_stats = db.query(FileTextQuery).entries::<FilesStats>();
    let syntax_tree_stats = syntax_tree_stats(db);
-    let symbols_stats = db
+    let symbols_stats = db.query(LibrarySymbolsQuery).entries::<LibrarySymbolsStats>();
-        .query(LibrarySymbolsQuery)
-        .entries::<LibrarySymbolsStats>();
    let n_defs = {
        let interner: &hir::HirInterner = db.as_ref();
        interner.len()
@@ -75,11 +73,7 @@ pub(crate) struct SyntaxTreeStats {
 impl fmt::Display for SyntaxTreeStats {
    fn fmt(&self, fmt: &mut fmt::Formatter) -> fmt::Result {
-        write!(
+        write!(fmt, "{} trees, {} ({}) retained", self.total, self.retained, self.retained_size,)
-            fmt,
-            "{} trees, {} ({}) retained",
-            self.total, self.retained, self.retained_size,
-        )
    }
 }
@@ -144,20 +138,13 @@ impl MemoryStats {
    #[cfg(not(feature = "jemalloc"))]
    fn current() -> MemoryStats {
-        MemoryStats {
+        MemoryStats { allocated: Bytes(0), resident: Bytes(0) }
-            allocated: Bytes(0),
-            resident: Bytes(0),
-        }
    }
 }
 impl fmt::Display for MemoryStats {
    fn fmt(&self, fmt: &mut fmt::Formatter) -> fmt::Result {
-        write!(
+        write!(fmt, "{} allocated {} resident", self.allocated, self.resident,)
-            fmt,
-            "{} allocated {} resident",
-            self.allocated, self.resident,
-        )
    }
 }
diff --git a/crates/ra_ide_api/src/symbol_index.rs b/crates/ra_ide_api/src/symbol_index.rs
index 3d0b2369e..de0f46134 100644
--- a/crates/ra_ide_api/src/symbol_index.rs
+++ b/crates/ra_ide_api/src/symbol_index.rs
@@ -101,10 +101,7 @@ pub(crate) fn world_symbols(db: &RootDatabase, query: Query) -> Vec<FileSymbol>
        }
        let snap = Snap(db.snapshot());
-        files
+        files.par_iter().map_with(snap, |db, &file_id| db.0.file_symbols(file_id)).collect()
-            .par_iter()
-            .map_with(snap, |db, &file_id| db.0.file_symbols(file_id))
-            .collect()
    };
    query.search(&buf)
 }
diff --git a/crates/ra_ide_api/src/syntax_highlighting.rs b/crates/ra_ide_api/src/syntax_highlighting.rs
index 6c4391e1e..a435fe56e 100644
--- a/crates/ra_ide_api/src/syntax_highlighting.rs
+++ b/crates/ra_ide_api/src/syntax_highlighting.rs
@@ -9,20 +9,12 @@ use crate::{
 pub(crate) fn highlight(db: &RootDatabase, file_id: FileId) -> Vec<HighlightedRange> {
    let source_file = db.parse(file_id);
    let mut res = ra_ide_api_light::highlight(source_file.syntax());
-    for macro_call in source_file
+    for macro_call in source_file.syntax().descendants().filter_map(ast::MacroCall::cast) {
-        .syntax()
-        .descendants()
-        .filter_map(ast::MacroCall::cast)
-    {
        if let Some((off, exp)) = hir::MacroDef::ast_expand(macro_call) {
-            let mapped_ranges = ra_ide_api_light::highlight(&exp.syntax())
+            let mapped_ranges =
-                .into_iter()
+                ra_ide_api_light::highlight(&exp.syntax()).into_iter().filter_map(|r| {
-                .filter_map(|r| {
                    let mapped_range = exp.map_range_back(r.range)?;
-                    let res = HighlightedRange {
+                    let res = HighlightedRange { range: mapped_range + off, tag: r.tag };
-                        range: mapped_range + off,
-                        tag: r.tag,
-                    };
                    Some(res)
                });
            res.extend(mapped_ranges);
diff --git a/crates/ra_ide_api_light/src/diagnostics.rs b/crates/ra_ide_api_light/src/diagnostics.rs
index 2b695dfdf..7c383ca2a 100644
--- a/crates/ra_ide_api_light/src/diagnostics.rs
+++ b/crates/ra_ide_api_light/src/diagnostics.rs
@@ -72,14 +72,7 @@ fn text_edit_for_remove_unnecessary_braces_with_self_in_use_statement(
    single_use_tree: &ast::UseTree,
 ) -> Option<TextEdit> {
    let use_tree_list_node = single_use_tree.syntax().parent()?;
-    if single_use_tree
+    if single_use_tree.path()?.segment()?.syntax().first_child()?.kind() == SyntaxKind::SELF_KW {
-        .path()?
-        .segment()?
-        .syntax()
-        .first_child()?
-        .kind()
-        == SyntaxKind::SELF_KW
-    {
        let start = use_tree_list_node.prev_sibling()?.range().start();
        let end = use_tree_list_node.range().end();
        let range = TextRange::from_to(start, end);
@@ -145,9 +138,8 @@ mod tests {
        for node in file.syntax().descendants() {
            func(&mut diagnostics, node);
        }
-        let diagnostic = diagnostics
+        let diagnostic =
-            .pop()
+            diagnostics.pop().unwrap_or_else(|| panic!("no diagnostics for:\n{}\n", before));
-            .unwrap_or_else(|| panic!("no diagnostics for:\n{}\n", before));
        let fix = diagnostic.fix.unwrap();
        let actual = fix.edit.apply(&before);
        assert_eq_text!(after, &actual);
@@ -162,21 +154,9 @@ mod tests {
        ",
            check_unnecessary_braces_in_use_statement,
        );
-        check_apply(
+        check_apply("use {b};", "use b;", check_unnecessary_braces_in_use_statement);
-            "use {b};",
+        check_apply("use a::{c};", "use a::c;", check_unnecessary_braces_in_use_statement);
-            "use b;",
+        check_apply("use a::{self};", "use a;", check_unnecessary_braces_in_use_statement);
-            check_unnecessary_braces_in_use_statement,
-        );
-        check_apply(
-            "use a::{c};",
-            "use a::c;",
-            check_unnecessary_braces_in_use_statement,
-        );
-        check_apply(
-            "use a::{self};",
-            "use a;",
-            check_unnecessary_braces_in_use_statement,
-        );
        check_apply(
            "use a::{c, d::{e}};",
            "use a::{c, d::e};",
diff --git a/crates/ra_ide_api_light/src/extend_selection.rs b/crates/ra_ide_api_light/src/extend_selection.rs
index f396dfe3f..28d62f290 100644
--- a/crates/ra_ide_api_light/src/extend_selection.rs
+++ b/crates/ra_ide_api_light/src/extend_selection.rs
@@ -43,11 +43,7 @@ pub fn extend_selection(root: &SyntaxNode, range: TextRange) -> Option<TextRange
    let node = find_covering_node(root, range);
    // Using shallowest node with same range allows us to traverse siblings.
-    let node = node
+    let node = node.ancestors().take_while(|n| n.range() == node.range()).last().unwrap();
-        .ancestors()
-        .take_while(|n| n.range() == node.range())
-        .last()
-        .unwrap();
    if range == node.range() {
        if string_kinds.contains(&node.kind()) {
@@ -145,10 +141,7 @@ fn extend_list_item(node: &SyntaxNode) -> Option<TextRange> {
    }
    if let Some(comma_node) = nearby_comma(node, Direction::Prev) {
-        return Some(TextRange::from_to(
+        return Some(TextRange::from_to(comma_node.range().start(), node.range().end()));
-            comma_node.range().start(),
-            node.range().end(),
-        ));
    }
    if let Some(comma_node) = nearby_comma(node, Direction::Next) {
@@ -160,10 +153,7 @@ fn extend_list_item(node: &SyntaxNode) -> Option<TextRange> {
            .filter(|node| is_single_line_ws(node))
            .unwrap_or(comma_node);
-        return Some(TextRange::from_to(
+        return Some(TextRange::from_to(node.range().start(), final_node.range().end()));
-            node.range().start(),
-            final_node.range().end(),
-        ));
    }
    return None;
@@ -217,36 +207,15 @@ mod tests {
    #[test]
    fn test_extend_selection_list() {
        do_check(r#"fn foo(<|>x: i32) {}"#, &["x", "x: i32"]);
-        do_check(
+        do_check(r#"fn foo(<|>x: i32, y: i32) {}"#, &["x", "x: i32", "x: i32, "]);
-            r#"fn foo(<|>x: i32, y: i32) {}"#,
+        do_check(r#"fn foo(<|>x: i32,y: i32) {}"#, &["x", "x: i32", "x: i32,"]);
-            &["x", "x: i32", "x: i32, "],
+        do_check(r#"fn foo(x: i32, <|>y: i32) {}"#, &["y", "y: i32", ", y: i32"]);
-        );
+        do_check(r#"fn foo(x: i32, <|>y: i32, ) {}"#, &["y", "y: i32", ", y: i32"]);
-        do_check(
+        do_check(r#"fn foo(x: i32,<|>y: i32) {}"#, &["y", "y: i32", ",y: i32"]);
-            r#"fn foo(<|>x: i32,y: i32) {}"#,
-            &["x", "x: i32", "x: i32,"],
-        );
-        do_check(
-            r#"fn foo(x: i32, <|>y: i32) {}"#,
-            &["y", "y: i32", ", y: i32"],
-        );
-        do_check(
-            r#"fn foo(x: i32, <|>y: i32, ) {}"#,
-            &["y", "y: i32", ", y: i32"],
-        );
-        do_check(
-            r#"fn foo(x: i32,<|>y: i32) {}"#,
-            &["y", "y: i32", ",y: i32"],
-        );
-        do_check(
+        do_check(r#"const FOO: [usize; 2] = [ 22<|> , 33];"#, &["22", "22 , "]);
-            r#"const FOO: [usize; 2] = [ 22<|> , 33];"#,
-            &["22", "22 , "],
-        );
        do_check(r#"const FOO: [usize; 2] = [ 22 , 33<|>];"#, &["33", ", 33"]);
-        do_check(
+        do_check(r#"const FOO: [usize; 2] = [ 22 , 33<|> ,];"#, &["33", ", 33"]);
-            r#"const FOO: [usize; 2] = [ 22 , 33<|> ,];"#,
-            &["33", ", 33"],
-        );
        do_check(
            r#"
@@ -292,11 +261,7 @@ struct B {
    <|>
 }
            "#,
-            &[
+            &["\n    \n", "{\n    \n}", "/// bla\n/// bla\nstruct B {\n    \n}"],
-                "\n    \n",
-                "{\n    \n}",
-                "/// bla\n/// bla\nstruct B {\n    \n}",
-            ],
        )
    }
diff --git a/crates/ra_ide_api_light/src/folding_ranges.rs b/crates/ra_ide_api_light/src/folding_ranges.rs
index c73637323..357a7dee1 100644
--- a/crates/ra_ide_api_light/src/folding_ranges.rs
+++ b/crates/ra_ide_api_light/src/folding_ranges.rs
@@ -30,30 +30,21 @@ pub fn folding_ranges(file: &SourceFile) -> Vec<Fold> {
        // Fold items that span multiple lines
        if let Some(kind) = fold_kind(node.kind()) {
            if node.text().contains('\n') {
-                res.push(Fold {
+                res.push(Fold { range: node.range(), kind });
-                    range: node.range(),
-                    kind,
-                });
            }
        }
        // Fold groups of comments
        if node.kind() == COMMENT && !visited_comments.contains(&node) {
            if let Some(range) = contiguous_range_for_comment(node, &mut visited_comments) {
-                res.push(Fold {
+                res.push(Fold { range, kind: FoldKind::Comment })
-                    range,
-                    kind: FoldKind::Comment,
-                })
            }
        }
        // Fold groups of imports
        if node.kind() == USE_ITEM && !visited_imports.contains(&node) {
            if let Some(range) = contiguous_range_for_group(node, &mut visited_imports) {
-                res.push(Fold {
+                res.push(Fold { range, kind: FoldKind::Imports })
-                    range,
-                    kind: FoldKind::Imports,
-                })
            }
        }
@@ -62,10 +53,7 @@ pub fn folding_ranges(file: &SourceFile) -> Vec<Fold> {
            if let Some(range) =
                contiguous_range_for_group_unless(node, has_visibility, &mut visited_mods)
            {
-                res.push(Fold {
+                res.push(Fold { range, kind: FoldKind::Mods })
-                    range,
-                    kind: FoldKind::Mods,
-                })
            }
        }
    }
@@ -84,9 +72,7 @@ fn fold_kind(kind: SyntaxKind) -> Option<FoldKind> {
 }
 fn has_visibility(node: &SyntaxNode) -> bool {
-    ast::Module::cast(node)
+    ast::Module::cast(node).and_then(|m| m.visibility()).is_some()
-        .and_then(|m| m.visibility())
-        .is_some()
 }
 fn contiguous_range_for_group<'a>(
@@ -125,10 +111,7 @@ fn contiguous_range_for_group_unless<'a>(
    }
    if first != last {
-        Some(TextRange::from_to(
+        Some(TextRange::from_to(first.range().start(), last.range().end()))
-            first.range().start(),
-            last.range().end(),
-        ))
    } else {
        // The group consists of only one element, therefore it cannot be folded
        None
@@ -169,10 +152,7 @@ fn contiguous_range_for_comment<'a>(
    }
    if first != last {
-        Some(TextRange::from_to(
+        Some(TextRange::from_to(first.range().start(), last.range().end()))
-            first.range().start(),
-            last.range().end(),
-        ))
    } else {
        // The group consists of only one element, therefore it cannot be folded
        None
@@ -199,10 +179,8 @@ mod tests {
            fold_kinds.len(),
            "The amount of fold kinds is different than the expected amount"
        );
-        for ((fold, range), fold_kind) in folds
+        for ((fold, range), fold_kind) in
-            .into_iter()
+            folds.into_iter().zip(ranges.into_iter()).zip(fold_kinds.into_iter())
-            .zip(ranges.into_iter())
-            .zip(fold_kinds.into_iter())
        {
            assert_eq!(fold.range.start(), range.start());
            assert_eq!(fold.range.end(), range.end());
@@ -280,12 +258,7 @@ mod with_attribute_next;</fold>
 fn main() <fold>{
 }</fold>"#;
-        let folds = &[
+        let folds = &[FoldKind::Mods, FoldKind::Mods, FoldKind::Mods, FoldKind::Block];
-            FoldKind::Mods,
-            FoldKind::Mods,
-            FoldKind::Mods,
-            FoldKind::Block,
-        ];
        do_check(text, folds);
    }
diff --git a/crates/ra_ide_api_light/src/formatting.rs b/crates/ra_ide_api_light/src/formatting.rs
index 46ffa7d96..8bc03f974 100644
--- a/crates/ra_ide_api_light/src/formatting.rs
+++ b/crates/ra_ide_api_light/src/formatting.rs
@@ -32,10 +32,7 @@ fn prev_leaves(node: &SyntaxNode) -> impl Iterator<Item = &SyntaxNode> {
 }
 fn prev_leaf(node: &SyntaxNode) -> Option<&SyntaxNode> {
-    generate(node.ancestors().find_map(SyntaxNode::prev_sibling), |it| {
+    generate(node.ancestors().find_map(SyntaxNode::prev_sibling), |it| it.last_child()).last()
-        it.last_child()
-    })
-    .last()
 }
 pub fn extract_trivial_expression(block: &ast::Block) -> Option<&ast::Expr> {
diff --git a/crates/ra_ide_api_light/src/join_lines.rs b/crates/ra_ide_api_light/src/join_lines.rs
index ab7c5b4b5..03770c52e 100644
--- a/crates/ra_ide_api_light/src/join_lines.rs
+++ b/crates/ra_ide_api_light/src/join_lines.rs
@@ -50,11 +50,7 @@ pub fn join_lines(file: &SourceFile, range: TextRange) -> LocalEdit {
        }
    }
-    LocalEdit {
+    LocalEdit { label: "join lines".to_string(), edit: edit.finish(), cursor_position: None }
-        label: "join lines".to_string(),
-        edit: edit.finish(),
-        cursor_position: None,
-    }
 }
 fn remove_newline(
@@ -71,10 +67,7 @@ fn remove_newline(
        )];
        let spaces = suff.bytes().take_while(|&b| b == b' ').count();
-        edit.replace(
+        edit.replace(TextRange::offset_len(offset, ((spaces + 1) as u32).into()), " ".to_string());
-            TextRange::offset_len(offset, ((spaces + 1) as u32).into()),
-            " ".to_string(),
-        );
        return;
    }
@@ -109,11 +102,7 @@ fn remove_newline(
        edit.delete(TextRange::from_to(prev.range().start(), node.range().end()));
    } else if prev.kind() == COMMA && next.kind() == R_CURLY {
        // Removes: comma, newline (incl. surrounding whitespace)
-        let space = if let Some(left) = prev.prev_sibling() {
+        let space = if let Some(left) = prev.prev_sibling() { compute_ws(left, next) } else { " " };
-            compute_ws(left, next)
-        } else {
-            " "
-        };
        edit.replace(
            TextRange::from_to(prev.range().start(), node.range().end()),
            space.to_string(),
@@ -134,20 +123,14 @@ fn join_single_expr_block(edit: &mut TextEditBuilder, node: &SyntaxNode) -> Opti
    let block = ast::Block::cast(node.parent()?)?;
    let block_expr = ast::BlockExpr::cast(block.syntax().parent()?)?;
    let expr = extract_trivial_expression(block)?;
-    edit.replace(
+    edit.replace(block_expr.syntax().range(), expr.syntax().text().to_string());
-        block_expr.syntax().range(),
-        expr.syntax().text().to_string(),
-    );
    Some(())
 }
 fn join_single_use_tree(edit: &mut TextEditBuilder, node: &SyntaxNode) -> Option<()> {
    let use_tree_list = ast::UseTreeList::cast(node.parent()?)?;
    let (tree,) = use_tree_list.use_trees().collect_tuple()?;
-    edit.replace(
+    edit.replace(use_tree_list.syntax().range(), tree.syntax().text().to_string());
-        use_tree_list.syntax().range(),
-        tree.syntax().text().to_string(),
-    );
    Some(())
 }
diff --git a/crates/ra_ide_api_light/src/lib.rs b/crates/ra_ide_api_light/src/lib.rs
index 17044270c..f3078f51e 100644
--- a/crates/ra_ide_api_light/src/lib.rs
+++ b/crates/ra_ide_api_light/src/lib.rs
@@ -63,9 +63,8 @@ pub struct Diagnostic {
 }
 pub fn matching_brace(file: &SourceFile, offset: TextUnit) -> Option<TextUnit> {
-    const BRACES: &[SyntaxKind] = &[
+    const BRACES: &[SyntaxKind] =
-        L_CURLY, R_CURLY, L_BRACK, R_BRACK, L_PAREN, R_PAREN, L_ANGLE, R_ANGLE,
+        &[L_CURLY, R_CURLY, L_BRACK, R_BRACK, L_PAREN, R_PAREN, L_ANGLE, R_ANGLE];
-    ];
    let (brace_node, brace_idx) = find_leaf_at_offset(file.syntax(), offset)
        .filter_map(|node| {
            let idx = BRACES.iter().position(|&brace| brace == node.kind())?;
@@ -74,9 +73,7 @@ pub fn matching_brace(file: &SourceFile, offset: TextUnit) -> Option<TextUnit> {
        .next()?;
    let parent = brace_node.parent()?;
    let matching_kind = BRACES[brace_idx ^ 1];
-    let matching_node = parent
+    let matching_node = parent.children().find(|node| node.kind() == matching_kind)?;
-        .children()
-        .find(|node| node.kind() == matching_kind)?;
    Some(matching_node.range().start())
 }
@@ -122,10 +119,7 @@ pub fn highlight(root: &SyntaxNode) -> Vec<HighlightedRange> {
                continue;
            }
        };
-        res.push(HighlightedRange {
+        res.push(HighlightedRange { range: node.range(), tag })
-            range: node.range(),
-            tag,
-        })
    }
    res
 }
diff --git a/crates/ra_ide_api_light/src/line_index.rs b/crates/ra_ide_api_light/src/line_index.rs
index 131737743..bf004c33a 100644
--- a/crates/ra_ide_api_light/src/line_index.rs
+++ b/crates/ra_ide_api_light/src/line_index.rs
@@ -54,10 +54,7 @@ impl LineIndex {
            let char_len = TextUnit::of_char(c);
            if char_len.to_usize() > 1 {
-                utf16_chars.push(Utf16Char {
+                utf16_chars.push(Utf16Char { start: curr_col, end: curr_col + char_len });
-                    start: curr_col,
-                    end: curr_col + char_len,
-                });
            }
            curr_col += char_len;
@@ -68,10 +65,7 @@ impl LineIndex {
            utf16_lines.insert(line, utf16_chars);
        }
-        LineIndex {
+        LineIndex { newlines, utf16_lines }
-            newlines,
-            utf16_lines,
-        }
    }