bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

save-analysis: handle types in turbofish

Browse source 
fixes https://github.com/nrc/rls-analysis/issues/52
This commit is contained in:
Nick Cameron 2017-11-02 09:22:44 +13:00
parent c1d3e441a8
commit 82a8968ce0
1 changed files with 15 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

17
src/librustc_save_analysis/dump_visitor.rs
View file

@ -775,6 +775,7 @@ impl<'l, 'tcx: 'l, 'll, O: DumpOutput + 'll> DumpVisitor<'l, 'tcx, 'll, O> {
} }
fn process_path(&mut self, id: NodeId, path: &'l ast::Path) { fn process_path(&mut self, id: NodeId, path: &'l ast::Path) {
debug!("process_path {:?}", path);
let path_data = self.save_ctxt.get_path_data(id, path); let path_data = self.save_ctxt.get_path_data(id, path);
if generated_code(path.span) && path_data.is_none() { if generated_code(path.span) && path_data.is_none() {
return; return;
@ -862,7 +863,10 @@ impl<'l, 'tcx: 'l, 'll, O: DumpOutput + 'll> DumpVisitor<'l, 'tcx, 'll, O> {
walk_list!(self, visit_expr, base); walk_list!(self, visit_expr, base);
} }
fn process_method_call(&mut self, ex: &'l ast::Expr, args: &'l [P<ast::Expr>]) { fn process_method_call(&mut self,
ex: &'l ast::Expr,
seg: &'l ast::PathSegment,
args: &'l [P<ast::Expr>]) {
if let Some(mcd) = self.save_ctxt.get_expr_data(ex) { if let Some(mcd) = self.save_ctxt.get_expr_data(ex) {
down_cast_data!(mcd, RefData, ex.span); down_cast_data!(mcd, RefData, ex.span);
if !generated_code(ex.span) { if !generated_code(ex.span) {
@ -870,6 +874,15 @@ impl<'l, 'tcx: 'l, 'll, O: DumpOutput + 'll> DumpVisitor<'l, 'tcx, 'll, O> {
} }
} }
// Explicit types in the turbo-fish.
if let Some(ref params) = seg.parameters {
if let ast::PathParameters::AngleBracketed(ref data) = **params {
for t in &data.types {
self.visit_ty(t);
}
}
}
// walk receiver and args // walk receiver and args
walk_list!(self, visit_expr, args); walk_list!(self, visit_expr, args);
} }
@ -1330,7 +1343,7 @@ impl<'l, 'tcx: 'l, 'll, O: DumpOutput + 'll> Visitor<'l> for DumpVisitor<'l, 'tc
let def = self.save_ctxt.get_path_def(hir_expr.id); let def = self.save_ctxt.get_path_def(hir_expr.id);
self.process_struct_lit(ex, path, fields, adt.variant_of_def(def), base) self.process_struct_lit(ex, path, fields, adt.variant_of_def(def), base)
} }
ast::ExprKind::MethodCall(.., ref args) => self.process_method_call(ex, args), ast::ExprKind::MethodCall(ref seg, ref args) => self.process_method_call(ex, seg, args),
ast::ExprKind::Field(ref sub_ex, _) => { ast::ExprKind::Field(ref sub_ex, _) => {
self.visit_expr(&sub_ex); self.visit_expr(&sub_ex);