rollup merge of #17355 : gamazeps/issue17210

[rust.git] / src / librustc / middle / save / mod.rs

diff --git a/src/librustc/middle/save/mod.rs b/src/librustc/middle/save/mod.rs
index a2debe61e5f60f2240918dbabc229a166ca25d9d..0f4ed202ec20750c9b80030fd92db4b841d4d188 100644 (file)
--- a/src/librustc/middle/save/mod.rs
+++ b/src/librustc/middle/save/mod.rs
@@ -71,7 +71,7 @@ fn escape(s: String) -> String {
 
 // If the expression is a macro expansion or other generated code, run screaming and don't index.
 fn generated_code(span: Span) -> bool {
-    span.expn_info.is_some() || span  == DUMMY_SP
+    span.expn_id != NO_EXPANSION || span  == DUMMY_SP
 }
 
 struct DxrVisitor<'l, 'tcx: 'l> {
@@ -895,14 +895,14 @@ fn process_method_call(&mut self,
                 };
                 (Some(def_id), decl_id)
             }
-            typeck::MethodParam(ref mp) => {
+            typeck::MethodTypeParam(ref mp) => {
                 // method invoked on a type parameter
                 let trait_item = ty::trait_item(&self.analysis.ty_cx,
                                                 mp.trait_ref.def_id,
                                                 mp.method_num);
                 (None, Some(trait_item.def_id()))
             }
-            typeck::MethodObject(ref mo) => {
+            typeck::MethodTraitObject(ref mo) => {
                 // method invoked on a trait instance
                 let trait_item = ty::trait_item(&self.analysis.ty_cx,
                                                 mo.trait_ref.def_id,