4 files changed, 7 insertions, 6 deletions

diff --git a/crates/ra_ide_api/src/diagnostics.rs b/crates/ra_ide_api/src/diagnostics.rs
index 855a3ff0f..e23d178b0 100644
--- a/crates/ra_ide_api/src/diagnostics.rs
+++ b/crates/ra_ide_api/src/diagnostics.rs
@@ -54,7 +54,7 @@ pub(crate) fn diagnostics(db: &RootDatabase, file_id: FileId) -> Vec<Diagnostic>
         let file_id = d.file().original_file(db);
         let source_file = db.parse(file_id);
         let syntax_node = d.syntax_node_ptr();
-        let node = NamedFieldList::cast(syntax_node.to_node(&source_file)).unwrap();
+        let node = NamedFieldList::cast(syntax_node.to_node(source_file.syntax())).unwrap();
         let mut ast_editor = AstEditor::new(node);
         for f in d.missed_fields.iter() {
             ast_editor.append_field(&AstBuilder::<NamedField>::from_name(f));
@@ -281,7 +281,7 @@ mod tests {
                 one: i32,
                 two: i64,
             }
-            
+
             fn test_fn() {
                 let one = 1;
                 let s = TestStruct{ one, two: 2 };
@@ -298,7 +298,7 @@ mod tests {
                 one: i32,
                 two: i64,
             }
-            
+
             fn test_fn() {
                 let one = 1;
                 let s = TestStruct{ ..a };
diff --git a/crates/ra_ide_api/src/display/navigation_target.rs b/crates/ra_ide_api/src/display/navigation_target.rs
index 765cf883b..7ea336c50 100644
--- a/crates/ra_ide_api/src/display/navigation_target.rs
+++ b/crates/ra_ide_api/src/display/navigation_target.rs
@@ -81,7 +81,7 @@ impl NavigationTarget {
     ) -> NavigationTarget {
         let file = db.parse(file_id);
         let (name, full_range) = match pat {
-            Either::A(pat) => match pat.to_node(&file).kind() {
+            Either::A(pat) => match pat.to_node(file.syntax()).kind() {
                 ast::PatKind::BindPat(pat) => {
                     return NavigationTarget::from_bind_pat(file_id, &pat)
                 }
diff --git a/crates/ra_ide_api/src/extend_selection.rs b/crates/ra_ide_api/src/extend_selection.rs
index 7293ba359..163fa8c3c 100644
--- a/crates/ra_ide_api/src/extend_selection.rs
+++ b/crates/ra_ide_api/src/extend_selection.rs
@@ -4,6 +4,7 @@ use ra_syntax::{
     algo::{find_covering_element, find_token_at_offset, TokenAtOffset},
     SyntaxKind::*, SyntaxToken,
     ast::{self, AstNode, AstToken},
+    T
 };
 
 use crate::{FileRange, db::RootDatabase};
@@ -135,7 +136,7 @@ fn pick_best<'a>(l: SyntaxToken<'a>, r: SyntaxToken<'a>) -> SyntaxToken<'a> {
     fn priority(n: SyntaxToken) -> usize {
         match n.kind() {
             WHITESPACE => 0,
-            IDENT | SELF_KW | SUPER_KW | CRATE_KW | LIFETIME => 2,
+            IDENT | T![self] | T![super] | T![crate] | LIFETIME => 2,
             _ => 1,
         }
     }
diff --git a/crates/ra_ide_api/src/references.rs b/crates/ra_ide_api/src/references.rs
index 9f655d83c..d5c2b08ca 100644
--- a/crates/ra_ide_api/src/references.rs
+++ b/crates/ra_ide_api/src/references.rs
@@ -86,7 +86,7 @@ pub(crate) fn find_all_refs(
         let analyzer = hir::SourceAnalyzer::new(db, position.file_id, name_ref.syntax(), None);
         let resolved = analyzer.resolve_local_name(name_ref)?;
         if let Either::A(ptr) = resolved.ptr() {
-            if let ast::PatKind::BindPat(binding) = ptr.to_node(source_file).kind() {
+            if let ast::PatKind::BindPat(binding) = ptr.to_node(source_file.syntax()).kind() {
                 return Some((binding, analyzer));
             }
         }