2 files changed, 9 insertions, 5 deletions

diff --git a/crates/ra_cli/src/analysis_bench.rs b/crates/ra_cli/src/analysis_bench.rs
index 9e76bcebf..01b96ec58 100644
--- a/crates/ra_cli/src/analysis_bench.rs
+++ b/crates/ra_cli/src/analysis_bench.rs
@@ -34,10 +34,11 @@ pub(crate) fn run(verbose: bool, path: &Path, op: Op) -> Result<()> {
             .iter()
             .find_map(|(source_root_id, project_root)| {
                 if project_root.is_member() {
-                    for (rel_path, file_id) in &db.source_root(*source_root_id).files {
+                    for file_id in db.source_root(*source_root_id).walk() {
+                        let rel_path = db.file_relative_path(file_id);
                         let abs_path = rel_path.to_path(project_root.path());
                         if abs_path == path {
-                            return Some(*file_id);
+                            return Some(file_id);
                         }
                     }
                 }
diff --git a/crates/ra_cli/src/analysis_stats.rs b/crates/ra_cli/src/analysis_stats.rs
index d355fa2e8..1fad5b233 100644
--- a/crates/ra_cli/src/analysis_stats.rs
+++ b/crates/ra_cli/src/analysis_stats.rs
@@ -1,7 +1,7 @@
 use std::{collections::HashSet, fmt::Write, path::Path, time::Instant};
 
 use ra_db::SourceDatabase;
-use ra_hir::{Crate, HasBodySource, HasSource, HirDisplay, ImplItem, ModuleDef, Ty};
+use ra_hir::{Crate, HasBodySource, HasSource, HirDisplay, ImplItem, ModuleDef, Ty, TypeWalk};
 use ra_syntax::AstNode;
 
 use crate::Result;
@@ -110,9 +110,12 @@ pub fn run(verbose: bool, memory_usage: bool, path: &Path, only: Option<&str>) -
                         let original_file = src.file_id.original_file(db);
                         let path = db.file_relative_path(original_file);
                         let line_index = host.analysis().file_line_index(original_file).unwrap();
+                        let text_range = src
+                            .ast
+                            .either(|it| it.syntax().text_range(), |it| it.syntax().text_range());
                         let (start, end) = (
-                            line_index.line_col(src.ast.syntax().text_range().start()),
-                            line_index.line_col(src.ast.syntax().text_range().end()),
+                            line_index.line_col(text_range.start()),
+                            line_index.line_col(text_range.end()),
                         );
                         bar.println(format!(
                             "{} {}:{}-{}:{}: Expected {}, got {}",