Skip to content

Commit 0439556

Browse files
Check basic constness before unstable constness
1 parent 9500067 commit 0439556

File tree

1 file changed

+3
-2
lines changed

1 file changed

+3
-2
lines changed

src/librustdoc/clean/mod.rs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ use rustc_middle::middle::stability;
2323
use rustc_middle::ty::fold::TypeFolder;
2424
use rustc_middle::ty::subst::InternalSubsts;
2525
use rustc_middle::ty::{self, AdtKind, Lift, Ty, TyCtxt};
26-
use rustc_mir::const_eval::{is_min_const_fn, is_unstable_const_fn};
26+
use rustc_mir::const_eval::{is_const_fn, is_min_const_fn, is_unstable_const_fn};
2727
use rustc_span::hygiene::MacroKind;
2828
use rustc_span::symbol::{kw, sym, Ident, Symbol};
2929
use rustc_span::{self, Pos};
@@ -900,7 +900,8 @@ impl Clean<Item> for doctree::Function<'_> {
900900
enter_impl_trait(cx, || (self.generics.clean(cx), (self.decl, self.body).clean(cx)));
901901

902902
let did = cx.tcx.hir().local_def_id(self.id);
903-
let constness = if !is_unstable_const_fn(cx.tcx, did.to_def_id()).is_some() {
903+
let constness = if is_const_fn(cx.tcx, did.to_def_id())
904+
&& !is_unstable_const_fn(cx.tcx, did.to_def_id()).is_some() {
904905
hir::Constness::Const
905906
} else {
906907
hir::Constness::NotConst

0 commit comments

Comments
 (0)