language-servers/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-10-02 22:54:58 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

fix compilation

Browse source
This commit is contained in:
Aleksey Kladov 2019-06-11 18:11:17 +03:00
parent 14b1f87634
commit f6c227babd
2 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

8
crates/ra_cli/src/analysis_stats.rs
View file

@ -2,7 +2,7 @@ use std::{collections::HashSet, time::Instant, fmt::Write};
use ra_db::SourceDatabase; use ra_db::SourceDatabase;
use ra_batch::BatchDatabase; use ra_batch::BatchDatabase;
use ra_hir::{Crate, ModuleDef, Ty, ImplItem}; use ra_hir::{Crate, ModuleDef, Ty, ImplItem, HasSource};
use ra_syntax::AstNode; use ra_syntax::AstNode;
use crate::Result; use crate::Result;
@ -64,10 +64,10 @@ pub fn run(verbose: bool, path: &str, only: Option<&str>) -> Result<()> {
let name = f.name(&db); let name = f.name(&db);
let mut msg = format!("processing: {}", name); let mut msg = format!("processing: {}", name);
if verbose { if verbose {
let (file_id, source) = f.source(&db); let src = f.source(&db);
let original_file = file_id.original_file(&db); let original_file = src.file_id.original_file(&db);
let path = db.file_relative_path(original_file); let path = db.file_relative_path(original_file);
let syntax_range = source.syntax().range(); let syntax_range = src.ast.syntax().range();
write!(msg, " ({:?} {})", path, syntax_range).unwrap(); write!(msg, " ({:?} {})", path, syntax_range).unwrap();
} }
bar.set_message(&msg); bar.set_message(&msg);

2
crates/ra_hir/src/code_model/src.rs
View file

@ -16,7 +16,7 @@ pub trait HasSource {
fn source(self, db: &(impl DefDatabase + AstDatabase)) -> Source<Self::Ast>; fn source(self, db: &(impl DefDatabase + AstDatabase)) -> Source<Self::Ast>;
} }
/// NB: Module is !HasSource, becase it has two source nodes at the same time: /// NB: Module is !HasSource, because it has two source nodes at the same time:
/// definition and declaration. /// definition and declaration.
impl Module { impl Module {
/// Returns a node which defines this module. That is, a file or a `mod foo {}` with items. /// Returns a node which defines this module. That is, a file or a `mod foo {}` with items.