From a6943d9d66d6dc8b7be9db556e28dbc8125f7336 Mon Sep 17 00:00:00 2001 From: Guillaume Gomez Date: Tue, 18 Dec 2018 22:24:20 +0100 Subject: [PATCH] Set constness correctly --- src/librustdoc/clean/mod.rs | 10 ++++++++-- src/test/rustdoc/const-display.rs | 8 ++++---- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/src/librustdoc/clean/mod.rs b/src/librustdoc/clean/mod.rs index f08b594a8e4..44ea3d1ac2d 100644 --- a/src/librustdoc/clean/mod.rs +++ b/src/librustdoc/clean/mod.rs @@ -1674,6 +1674,12 @@ fn clean(&self, cx: &DocContext) -> Item { (self.generics.clean(cx), (&self.decl, self.body).clean(cx)) }); + let did = cx.tcx.hir().local_def_id(self.id); + let constness = if cx.tcx.is_min_const_fn(did) { + hir::Constness::Const + } else { + hir::Constness::NotConst + }; Item { name: Some(self.name.clean(cx)), attrs: self.attrs.clean(cx), @@ -1681,11 +1687,11 @@ fn clean(&self, cx: &DocContext) -> Item { visibility: self.vis.clean(cx), stability: self.stab.clean(cx), deprecation: self.depr.clean(cx), - def_id: cx.tcx.hir().local_def_id(self.id), + def_id: did, inner: FunctionItem(Function { decl, generics, - header: self.header, + header: hir::FnHeader { constness, ..self.header }, }), } } diff --git a/src/test/rustdoc/const-display.rs b/src/test/rustdoc/const-display.rs index 0b727190913..8ac0d07ceef 100644 --- a/src/test/rustdoc/const-display.rs +++ b/src/test/rustdoc/const-display.rs @@ -18,12 +18,12 @@ #![feature(min_const_unsafe_fn)] #![feature(staged_api)] -// @has 'foo/fn.foo.html' '//pre' 'pub const unsafe fn foo() -> u32' +// @has 'foo/fn.foo.html' '//pre' 'pub unsafe fn foo() -> u32' #[stable(feature = "rust1", since = "1.0.0")] #[rustc_const_unstable(feature="foo")] pub const unsafe fn foo() -> u32 { 42 } -// @has 'foo/fn.foo2.html' '//pre' 'pub const fn foo2() -> u32' +// @has 'foo/fn.foo2.html' '//pre' 'pub fn foo2() -> u32' #[unstable(feature = "humans", issue="0")] pub const fn foo2() -> u32 { 42 } @@ -31,7 +31,7 @@ pub const fn foo2() -> u32 { 42 } #[stable(feature = "rust1", since = "1.0.0")] pub const fn bar2() -> u32 { 42 } -// @has 'foo/fn.foo2_gated.html' '//pre' 'pub const unsafe fn foo2_gated() -> u32' +// @has 'foo/fn.foo2_gated.html' '//pre' 'pub unsafe fn foo2_gated() -> u32' #[unstable(feature = "foo2", issue="0")] pub const unsafe fn foo2_gated() -> u32 { 42 } @@ -39,5 +39,5 @@ pub const fn bar2() -> u32 { 42 } #[stable(feature = "rust1", since = "1.0.0")] pub const unsafe fn bar2_gated() -> u32 { 42 } -// @has 'foo/fn.bar_not_gated.html' '//pre' 'pub const unsafe fn bar_not_gated() -> u32' +// @has 'foo/fn.bar_not_gated.html' '//pre' 'pub unsafe fn bar_not_gated() -> u32' pub const unsafe fn bar_not_gated() -> u32 { 42 } -- 2.44.0