From 1cfe3b1c8c19e2092dd533ee6952b817476feaa6 Mon Sep 17 00:00:00 2001 From: Nick Cameron Date: Mon, 9 Jan 2017 15:07:07 +1300 Subject: [PATCH] save-analysis: fix over-zealous filter on generated code --- src/librustc_save_analysis/dump_visitor.rs | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/src/librustc_save_analysis/dump_visitor.rs b/src/librustc_save_analysis/dump_visitor.rs index 424017ebd12..06e1a492b4d 100644 --- a/src/librustc_save_analysis/dump_visitor.rs +++ b/src/librustc_save_analysis/dump_visitor.rs @@ -1343,18 +1343,19 @@ fn visit_ty(&mut self, t: &'l ast::Ty) { self.process_macro_use(t.span, t.id); match t.node { ast::TyKind::Path(_, ref path) => { - if self.span.filter_generated(None, t.span) { + if generated_code(t.span) { return; } if let Some(id) = self.lookup_def_id(t.id) { - let sub_span = self.span.sub_span_for_type_name(t.span); - self.dumper.type_ref(TypeRefData { - span: sub_span.expect("No span found for type ref"), - ref_id: Some(id), - scope: self.cur_scope, - qualname: String::new() - }.lower(self.tcx)); + if let Some(sub_span) = self.span.sub_span_for_type_name(t.span) { + self.dumper.type_ref(TypeRefData { + span: sub_span, + ref_id: Some(id), + scope: self.cur_scope, + qualname: String::new() + }.lower(self.tcx)); + } } self.write_sub_paths_truncated(path); -- 2.44.0