user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Auto merge of #56845 - GuillaumeGomez:const-docs, r=oli-obk

Browse source 
Don't render const keyword on stable

Fixes #55246.

Continuation of #55327.

r? @oli-obk
This commit is contained in:
bors 2018-12-20 19:26:12 +00:00
commit 09d6ab90e5
3 changed files with 53 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/librustdoc/clean/inline.rs
View file

@ -207,7 +207,7 @@ pub fn build_external_trait(cx: &DocContext, did: DefId) -> clean::Trait {
fn build_external_function(cx: &DocContext, did: DefId) -> clean::Function {
let sig = cx.tcx.fn_sig(did);
let constness = if cx.tcx.is_const_fn(did) {
let constness = if cx.tcx.is_min_const_fn(did) {
hir::Constness::Const
} else {
hir::Constness::NotConst

12
src/librustdoc/clean/mod.rs
View file

@ -1674,6 +1674,12 @@ impl Clean<Item> for doctree::Function {
(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 @@ impl Clean<Item> for doctree::Function {
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 },
}),
}
}
@ -2009,7 +2015,7 @@ impl<'tcx> Clean<Item> for ty::AssociatedItem {
ty::TraitContainer(_) => self.defaultness.has_value()
};
if provided {
let constness = if cx.tcx.is_const_fn(self.def_id) {
let constness = if cx.tcx.is_min_const_fn(self.def_id) {
hir::Constness::Const
} else {
hir::Constness::NotConst