---

yaml
---
r: 173439
b: refs/heads/snap-stage3
c: 33fd10d
h: refs/heads/master
i:
  173437: e859187
  173435: 99e1af6
  173431: fe20b24
  173423: 3196813
  173407: d7854d1
  173375: 851da16
  173311: 60f4a58
v: v3

Author: nrc

[refs]

@@ -1,7 +1,7 @@
 ---
 refs/heads/master: 896cb36ecab3eaeb7f101087e030e43771eca5ca
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
-refs/heads/snap-stage3: 32690b586d6bbe2541ec94adbdc7c226978332c5
+refs/heads/snap-stage3: 33fd10d5e0bac969b522b0a9b1bcc1518d1554b2
 refs/heads/try: 957472483d3a2f43c0e4f7c2056280a1022af93c
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d

branches/snap-stage3/src/librustc_trans/save/mod.rs

@@ -278,7 +278,7 @@ impl <'l, 'tcx> DxrVisitor<'l, 'tcx> {
         // The qualname for a method is the trait name or name of the struct in an impl in
         // which the method is declared in followed by the method's name.
         let mut qualname = match ty::impl_of_method(&self.analysis.ty_cx,
-                                                ast_util::local_def(method.id)) {
+                                                    ast_util::local_def(method.id)) {
             Some(impl_id) => match self.analysis.ty_cx.map.get(impl_id.node) {
                 NodeItem(item) => {
                     scope_id = item.id;
@@ -349,7 +349,7 @@ impl <'l, 'tcx> DxrVisitor<'l, 'tcx> {
             .and_then(|def_id| {
                 if match def_id {
                     ty::MethodTraitItemId(def_id) => {
-                        method.id != 0 && def_id.node == 0
+                        def_id.node != 0 && def_id != ast_util::local_def(method.id)
                     }
                     ty::TypeTraitItemId(_) => false,
                 } {