diff options
| -rw-r--r-- | src/librustdoc/passes/collect_intra_doc_links.rs | 29 |
1 files changed, 13 insertions, 16 deletions
diff --git a/src/librustdoc/passes/collect_intra_doc_links.rs b/src/librustdoc/passes/collect_intra_doc_links.rs index ba355107ed6..27d8b8f2e3b 100644 --- a/src/librustdoc/passes/collect_intra_doc_links.rs +++ b/src/librustdoc/passes/collect_intra_doc_links.rs @@ -684,27 +684,24 @@ impl<'a, 'tcx> LinkCollector<'a, 'tcx> { if ns != Namespace::ValueNS { return None; } - debug!("looking for variants or fields named {} for {:?}", item_name, did); + debug!("looking for fields named {} for {:?}", item_name, did); // FIXME: this doesn't really belong in `associated_item` (maybe `variant_field` is better?) - // NOTE: it's different from variant_field because it resolves fields and variants, + // NOTE: it's different from variant_field because it only resolves struct fields, // not variant fields (2 path segments, not 3). let def = match tcx.type_of(did).kind() { - ty::Adt(def, _) => def, + ty::Adt(def, _) if !def.is_enum() => def, _ => return None, }; - let field = if def.is_enum() { - def.all_fields().find(|item| item.ident.name == item_name) - } else { - def.non_enum_variant().fields.iter().find(|item| item.ident.name == item_name) - }?; - let kind = if def.is_enum() { DefKind::Variant } else { DefKind::Field }; - let fragment = if def.is_enum() { - // FIXME: how can the field be a variant? - UrlFragment::Variant(field.ident.name) - } else { - UrlFragment::StructField(field.ident.name) - }; - Some((root_res, fragment, Some((kind, field.did)))) + let field = def + .non_enum_variant() + .fields + .iter() + .find(|item| item.ident.name == item_name)?; + Some(( + root_res, + UrlFragment::StructField(field.ident.name), + Some((DefKind::Field, field.did)), + )) } Res::Def(DefKind::Trait, did) => tcx .associated_items(did) |