From b88775af7fdfb06df922325ab48237592d5afecb Mon Sep 17 00:00:00 2001 From: Aleksey Kladov Date: Mon, 7 Jan 2019 16:53:24 +0300 Subject: migrate ra_editor to rowan 0.2 --- crates/ra_editor/src/assists/add_derive.rs | 2 +- crates/ra_editor/src/assists/change_visibility.rs | 2 +- crates/ra_editor/src/assists/introduce_variable.rs | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) (limited to 'crates/ra_editor/src/assists') diff --git a/crates/ra_editor/src/assists/add_derive.rs b/crates/ra_editor/src/assists/add_derive.rs index 1e2cd4f30..6e964d011 100644 --- a/crates/ra_editor/src/assists/add_derive.rs +++ b/crates/ra_editor/src/assists/add_derive.rs @@ -28,7 +28,7 @@ pub fn add_derive(ctx: AssistCtx) -> Option { } // Insert `derive` after doc comments. -fn derive_insertion_offset(nominal: ast::NominalDef) -> Option { +fn derive_insertion_offset(nominal: &ast::NominalDef) -> Option { let non_ws_child = nominal .syntax() .children() diff --git a/crates/ra_editor/src/assists/change_visibility.rs b/crates/ra_editor/src/assists/change_visibility.rs index 6c8466394..89729e2c2 100644 --- a/crates/ra_editor/src/assists/change_visibility.rs +++ b/crates/ra_editor/src/assists/change_visibility.rs @@ -46,7 +46,7 @@ fn add_vis(ctx: AssistCtx) -> Option { }) } -fn change_vis(ctx: AssistCtx, vis: ast::Visibility) -> Option { +fn change_vis(ctx: AssistCtx, vis: &ast::Visibility) -> Option { if vis.syntax().text() != "pub" { return None; } diff --git a/crates/ra_editor/src/assists/introduce_variable.rs b/crates/ra_editor/src/assists/introduce_variable.rs index 782861023..523ec7034 100644 --- a/crates/ra_editor/src/assists/introduce_variable.rs +++ b/crates/ra_editor/src/assists/introduce_variable.rs @@ -1,7 +1,7 @@ use ra_syntax::{ ast::{self, AstNode}, SyntaxKind::WHITESPACE, - SyntaxNodeRef, TextUnit, + SyntaxNode, TextUnit, }; use crate::assists::{AssistCtx, Assist}; @@ -39,7 +39,7 @@ pub fn introduce_variable<'a>(ctx: AssistCtx) -> Option { /// Statement or last in the block expression, which will follow /// the freshly introduced var. -fn anchor_stmt(expr: ast::Expr) -> Option { +fn anchor_stmt(expr: &ast::Expr) -> Option<&SyntaxNode> { expr.syntax().ancestors().find(|&node| { if ast::Stmt::cast(node).is_some() { return true; -- cgit v1.2.3