From d94bdf8c66932b0cecc0024508316131c797dc2a Mon Sep 17 00:00:00 2001 From: Guillaume Gomez Date: Tue, 31 Jul 2018 21:43:29 +0200 Subject: [PATCH] Put back original field discovery --- src/librustdoc/clean/mod.rs | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/librustdoc/clean/mod.rs b/src/librustdoc/clean/mod.rs index e019b26dd1dd9..2d4f365c7d78e 100644 --- a/src/librustdoc/clean/mod.rs +++ b/src/librustdoc/clean/mod.rs @@ -1211,8 +1211,14 @@ fn resolve(cx: &DocContext, path_str: &str, is_val: bool) -> Result<(Def, Option } else { match cx.tcx.type_of(did).sty { ty::TyAdt(def, _) => { - if let Some(item) = def.all_fields() - .find(|item| item.ident.name == item_name) { + if let Some(item) = 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) + } { Ok((ty.def, Some(format!("{}.{}", if def.is_enum() {