From 6ab6d1eaa036f8620542ad9c12764957e868b7e0 Mon Sep 17 00:00:00 2001
From: gfreezy <gfreezy@gmail.com>
Date: Thu, 17 Jan 2019 19:57:24 +0800
Subject: fix comments

---
 crates/ra_ide_api/src/imp.rs    | 5 -----
 crates/ra_ide_api/src/lib.rs    | 2 +-
 crates/ra_ide_api/src/rename.rs | 4 +---
 3 files changed, 2 insertions(+), 9 deletions(-)

(limited to 'crates/ra_ide_api/src')

diff --git a/crates/ra_ide_api/src/imp.rs b/crates/ra_ide_api/src/imp.rs
index b52a3f4d5..fa79908a1 100644
--- a/crates/ra_ide_api/src/imp.rs
+++ b/crates/ra_ide_api/src/imp.rs
@@ -19,7 +19,6 @@ use crate::{
     CrateId, db, Diagnostic, FileId, FilePosition, FileRange, FileSystemEdit,
     Query, RootChange, SourceChange, SourceFileEdit,
     symbol_index::{FileSymbol, LibrarySymbolsQuery},
-    rename::rename
 };
 
 impl db::RootDatabase {
@@ -232,10 +231,6 @@ impl db::RootDatabase {
             .collect()
     }
 
-    pub(crate) fn rename(&self, position: FilePosition, new_name: &str) -> Option<SourceChange> {
-        rename(self, position, new_name)
-    }
-
     pub(crate) fn index_resolve(&self, name_ref: &ast::NameRef) -> Vec<FileSymbol> {
         let name = name_ref.text();
         let mut query = Query::new(name.to_string());
diff --git a/crates/ra_ide_api/src/lib.rs b/crates/ra_ide_api/src/lib.rs
index 1845bf443..33bef178a 100644
--- a/crates/ra_ide_api/src/lib.rs
+++ b/crates/ra_ide_api/src/lib.rs
@@ -466,7 +466,7 @@ impl Analysis {
         position: FilePosition,
         new_name: &str,
     ) -> Cancelable<Option<SourceChange>> {
-        self.with_db(|db| db.rename(position, new_name))
+        self.with_db(|db| rename::rename(db, position, new_name))
     }
 
     fn with_db<F: FnOnce(&db::RootDatabase) -> T + std::panic::UnwindSafe, T>(
diff --git a/crates/ra_ide_api/src/rename.rs b/crates/ra_ide_api/src/rename.rs
index 9f8a00ae7..9ab6f2a77 100644
--- a/crates/ra_ide_api/src/rename.rs
+++ b/crates/ra_ide_api/src/rename.rs
@@ -40,9 +40,7 @@ fn find_name_and_module_at_offset(
     position: FilePosition,
 ) -> Option<(&ast::Name, &ast::Module)> {
     let ast_name = find_node_at_offset::<ast::Name>(syntax, position.offset);
-    let ast_name_parent = ast_name
-        .and_then(|n| n.syntax().parent())
-        .and_then(|p| ast::Module::cast(p));
+    let ast_name_parent = ast::Module::cast(ast_name?.syntax().parent()?);
 
     if let (Some(ast_module), Some(name)) = (ast_name_parent, ast_name) {
         return Some((name, ast_module));
-- 
cgit v1.2.3