From a7f4f7bfcc524a55ba559e0141a70aa799a8686d Mon Sep 17 00:00:00 2001
From: Aleksey Kladov <aleksey.kladov@gmail.com>
Date: Sun, 6 Jan 2019 15:58:45 +0300
Subject: split module source into decl/defin

---
 crates/ra_analysis/src/lib.rs       | 2 +-
 crates/ra_analysis/src/runnables.rs | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'crates/ra_analysis')

diff --git a/crates/ra_analysis/src/lib.rs b/crates/ra_analysis/src/lib.rs
index 390c31c3f..77f77e9a8 100644
--- a/crates/ra_analysis/src/lib.rs
+++ b/crates/ra_analysis/src/lib.rs
@@ -397,7 +397,7 @@ impl Analysis {
     }
     /// Returns the root file of the given crate.
     pub fn crate_root(&self, crate_id: CrateId) -> Cancelable<FileId> {
-        Ok(self.db.crate_root(crate_id))
+        Ok(self.db.crate_graph().crate_root(crate_id))
     }
     /// Returns the set of possible targets to run for the current file.
     pub fn runnables(&self, file_id: FileId) -> Cancelable<Vec<Runnable>> {
diff --git a/crates/ra_analysis/src/runnables.rs b/crates/ra_analysis/src/runnables.rs
index 474267605..f24aa514a 100644
--- a/crates/ra_analysis/src/runnables.rs
+++ b/crates/ra_analysis/src/runnables.rs
@@ -73,11 +73,11 @@ fn runnable_mod(db: &RootDatabase, file_id: FileId, module: ast::Module) -> Opti
     let module =
         hir::source_binder::module_from_child_node(db, file_id, module.syntax()).ok()??;
     let path = module
-        .path_to_root()
+        .path_to_root(db)
+        .ok()?
         .into_iter()
         .rev()
-        .into_iter()
-        .filter_map(|it| it.name().map(Clone::clone))
+        .filter_map(|it| it.name(db).map(Clone::clone))
         .join("::");
     Some(Runnable {
         range,
-- 
cgit v1.2.3