language-servers/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-10-01 06:11:35 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

use Source for statics and consts

Browse source
This commit is contained in:
Aleksey Kladov 2019-06-11 17:13:20 +03:00
parent 4f94af3c4a
commit 46bc8675ed
6 changed files with 41 additions and 56 deletions
Download patch file Download diff file Expand all files Collapse all files

12
crates/ra_hir/src/expr.rs
View file

@ -1018,9 +1018,9 @@ pub(crate) fn body_with_source_map_query(
match def {
DefWithBody::Const(ref c) => {
let (file_id, src) = c.source(db);
collector = ExprCollector::new(def, file_id, def.resolver(db), db);
collector.collect_const_body(&src)
let src = c.source(db);
collector = ExprCollector::new(def, src.file_id, def.resolver(db), db);
collector.collect_const_body(&src.ast)
}
DefWithBody::Function(ref f) => {
let src = f.source(db);
@ -1028,9 +1028,9 @@ pub(crate) fn body_with_source_map_query(
collector.collect_fn_body(&src.ast)
}
DefWithBody::Static(ref s) => {
let (file_id, src) = s.source(db);
collector = ExprCollector::new(def, file_id, def.resolver(db), db);
collector.collect_static_body(&src)
let src = s.source(db);
collector = ExprCollector::new(def, src.file_id, def.resolver(db), db);
collector.collect_static_body(&src.ast)
}
}