diff --git a/src/librustdoc/clean/mod.rs b/src/librustdoc/clean/mod.rs index 76994f2ee1712..97062656b9a60 100644 --- a/src/librustdoc/clean/mod.rs +++ b/src/librustdoc/clean/mod.rs @@ -1382,7 +1382,8 @@ impl Clean for hir::Ty<'_> { let length = match length { hir::ArrayLen::Infer(_, _) => "_".to_string(), hir::ArrayLen::Body(anon_const) => { - let def_id = cx.tcx.hir().local_def_id(anon_const.hir_id); + let tcx = cx.tcx; + let def_id = tcx.hir().local_def_id(anon_const.hir_id); // NOTE(min_const_generics): We can't use `const_eval_poly` for constants // as we currently do not supply the parent generics to anonymous constants // but do allow `ConstKind::Param`. @@ -1390,9 +1391,9 @@ impl Clean for hir::Ty<'_> { // `const_eval_poly` tries to to first substitute generic parameters which // results in an ICE while manually constructing the constant and using `eval` // does nothing for `ConstKind::Param`. - let ct = ty::Const::from_anon_const(cx.tcx, def_id); - let param_env = cx.tcx.param_env(def_id); - print_const(cx, ct.eval(cx.tcx, param_env)) + let ct = ty::Const::from_anon_const(tcx, def_id); + let param_env = tcx.param_env(def_id); + print_const(tcx, ct.eval(tcx, param_env)) } }; @@ -1468,7 +1469,7 @@ impl<'tcx> Clean for Ty<'tcx> { ty::Array(ty, n) => { let mut n = cx.tcx.lift(n).expect("array lift failed"); n = n.eval(cx.tcx, ty::ParamEnv::reveal_all()); - let n = print_const(cx, n); + let n = print_const(cx.tcx, n); Array(box ty.clean(cx), n) } ty::RawPtr(mt) => RawPointer(mt.mutbl, box mt.ty.clean(cx)), diff --git a/src/librustdoc/clean/types.rs b/src/librustdoc/clean/types.rs index 74184427dd573..8cf5fb9a936d9 100644 --- a/src/librustdoc/clean/types.rs +++ b/src/librustdoc/clean/types.rs @@ -2124,7 +2124,26 @@ impl Constant { } crate fn value(&self, tcx: TyCtxt<'_>) -> Option { - self.kind.value(tcx) + use super::utils::print_const; + + match self.kind { + ConstantKind::TyConst { .. } => None, + ConstantKind::Anonymous { body } => { + let def_id = tcx.hir().body_owner_def_id(body).to_def_id().as_local().unwrap(); + let ct = ty::Const::from_anon_const(tcx, def_id); + let param_env = tcx.param_env(def_id); + let s = print_const(tcx, ct.eval(tcx, param_env)); + if s.starts_with('"') && s.ends_with('"') && s[1..s.len() - 1].contains('"') { + // If it's a string containing `"`, better show the original. + Some(print_const_expr(tcx, body)) + } else { + Some(s) + } + } + ConstantKind::Extern { def_id } | ConstantKind::Local { def_id, .. } => { + print_evaluated_const(tcx, def_id) + } + } } crate fn is_literal(&self, tcx: TyCtxt<'_>) -> bool { @@ -2143,15 +2162,6 @@ impl ConstantKind { } } - crate fn value(&self, tcx: TyCtxt<'_>) -> Option { - match *self { - ConstantKind::TyConst { .. } | ConstantKind::Anonymous { .. } => None, - ConstantKind::Extern { def_id } | ConstantKind::Local { def_id, .. } => { - print_evaluated_const(tcx, def_id) - } - } - } - crate fn is_literal(&self, tcx: TyCtxt<'_>) -> bool { match *self { ConstantKind::TyConst { .. } => false, diff --git a/src/librustdoc/clean/utils.rs b/src/librustdoc/clean/utils.rs index 20eea32560b27..d3d23b25131b4 100644 --- a/src/librustdoc/clean/utils.rs +++ b/src/librustdoc/clean/utils.rs @@ -226,14 +226,14 @@ crate fn name_from_pat(p: &hir::Pat<'_>) -> Symbol { }) } -crate fn print_const(cx: &DocContext<'_>, n: ty::Const<'_>) -> String { +crate fn print_const(tcx: TyCtxt<'_>, n: ty::Const<'_>) -> String { match n.val() { ty::ConstKind::Unevaluated(ty::Unevaluated { def, substs: _, promoted }) => { let mut s = if let Some(def) = def.as_local() { - let hir_id = cx.tcx.hir().local_def_id_to_hir_id(def.did); - print_const_expr(cx.tcx, cx.tcx.hir().body_owned_by(hir_id)) + let hir_id = tcx.hir().local_def_id_to_hir_id(def.did); + print_const_expr(tcx, tcx.hir().body_owned_by(hir_id)) } else { - inline::print_inlined_const(cx.tcx, def.did) + inline::print_inlined_const(tcx, def.did) }; if let Some(promoted) = promoted { s.push_str(&format!("::{:?}", promoted)) diff --git a/src/librustdoc/html/format.rs b/src/librustdoc/html/format.rs index c0115bfc6d4fa..56ecfc9c5577a 100644 --- a/src/librustdoc/html/format.rs +++ b/src/librustdoc/html/format.rs @@ -374,12 +374,10 @@ impl clean::Lifetime { impl clean::Constant { crate fn print(&self, tcx: TyCtxt<'_>) -> impl fmt::Display + '_ { - let expr = self.expr(tcx); - display_fn( - move |f| { - if f.alternate() { f.write_str(&expr) } else { write!(f, "{}", Escape(&expr)) } - }, - ) + let value = self.value(tcx).unwrap_or_else(|| self.expr(tcx)); + display_fn(move |f| { + if f.alternate() { f.write_str(&value) } else { write!(f, "{}", Escape(&value)) } + }) } } diff --git a/src/test/rustdoc/const-generics/const-impl.rs b/src/test/rustdoc/const-generics/const-impl.rs index a3ef084165a8a..e73373245a372 100644 --- a/src/test/rustdoc/const-generics/const-impl.rs +++ b/src/test/rustdoc/const-generics/const-impl.rs @@ -15,14 +15,14 @@ pub struct VSet { inner: Vec, } -// @has foo/struct.VSet.html '//*[@id="impl"]/h3[@class="code-header in-band"]' 'impl VSet' +// @has foo/struct.VSet.html '//*[@id="impl"]/h3[@class="code-header in-band"]' 'impl VSet' impl VSet { pub fn new() -> Self { Self { inner: Vec::new() } } } -// @has foo/struct.VSet.html '//*[@id="impl-1"]/h3[@class="code-header in-band"]' 'impl VSet' +// @has foo/struct.VSet.html '//*[@id="impl-1"]/h3[@class="code-header in-band"]' 'impl VSet' impl VSet { pub fn new() -> Self { Self { inner: Vec::new() } diff --git a/src/test/rustdoc/const-values-display.rs b/src/test/rustdoc/const-values-display.rs new file mode 100644 index 0000000000000..180e807a47385 --- /dev/null +++ b/src/test/rustdoc/const-values-display.rs @@ -0,0 +1,39 @@ +#![crate_name = "foo"] + +pub trait Test {} +pub struct Array([T; N]); + +// @has 'foo/trait.Test.html' +// @has - '//*[@class="code-header in-band"]' 'impl Test for [u8; 2]' +impl Test for [u8; 1 + 1] {} +// @has - '//*[@class="code-header in-band"]' 'impl Test for Array' +impl Test for Array {} + +type ArrayType = [T; N]; + +// @has 'foo/type.A0.html' +// @has - '//*[@class="docblock item-decl"]' 'pub type A0 = [i32; 5];' +pub type A0 = [i32; 3 + 2]; +// @has 'foo/type.A1.html' +// @has - '//*[@class="docblock item-decl"]' 'pub type A1 = Array;' +pub type A1 = Array; +// @has 'foo/struct.B0.html' +// @has - '//*[@class="docblock item-decl"]' 'pub struct B0(pub [i32; 6]);' +// @has - '//*[@id="structfield.0"]' '0: [i32; 6]' +pub struct B0(pub [i32; 3 * 2]); +// @has 'foo/struct.B1.html' +// @has - '//*[@class="docblock item-decl"]' 'pub struct B1(pub Array);' +// @has - '//*[@id="structfield.0"]' '0: Array' +pub struct B1(pub Array); +// @has 'foo/struct.C0.html' +// @has - '//*[@class="docblock item-decl"]' 'pub foo: [i32; 6],' +// @has - '//*[@id="structfield.foo"]' 'foo: [i32; 6]' +pub struct C0 { pub foo: [i32; 3 * 2] } +// @has 'foo/struct.C1.html' +// @has - '//*[@class="docblock item-decl"]' 'pub foo: Array,' +// @has - '//*[@id="structfield.foo"]' 'foo: Array' +pub struct C1 { pub foo: Array } + +// @has 'foo/constant.X.html' +// @has - '//*[@class="docblock item-decl"]' 'pub const X: u32 = 14 * 2; // 28u32' +pub const X: u32 = 14 * 2;