@@ -54,13 +54,11 @@ use externalfiles::ExternalHtml;
54
54
55
55
use serialize:: json:: { ToJson , Json , as_json} ;
56
56
use syntax:: { abi, ast} ;
57
- use syntax:: feature_gate:: UnstableFeatures ;
58
57
use rustc:: hir:: def_id:: { CrateNum , CRATE_DEF_INDEX , DefId } ;
59
58
use rustc:: middle:: privacy:: AccessLevels ;
60
59
use rustc:: middle:: stability;
61
60
use rustc:: hir;
62
61
use rustc:: util:: nodemap:: { FxHashMap , FxHashSet } ;
63
- use rustc:: session:: config:: nightly_options:: is_nightly_build;
64
62
use rustc_data_structures:: flock;
65
63
66
64
use clean:: { self , AttributesExt , GetDefId , SelfTy , Mutability , Span } ;
@@ -2192,14 +2190,9 @@ fn item_static(w: &mut fmt::Formatter, cx: &Context, it: &clean::Item,
2192
2190
2193
2191
fn item_function ( w : & mut fmt:: Formatter , cx : & Context , it : & clean:: Item ,
2194
2192
f : & clean:: Function ) -> fmt:: Result {
2195
- // FIXME(#24111): remove when `const_fn` is stabilized
2196
- let vis_constness = match UnstableFeatures :: from_environment ( ) {
2197
- UnstableFeatures :: Allow => f. constness ,
2198
- _ => hir:: Constness :: NotConst
2199
- } ;
2200
2193
let name_len = format ! ( "{}{}{}{:#}fn {}{:#}" ,
2201
2194
VisSpace ( & it. visibility) ,
2202
- ConstnessSpace ( vis_constness ) ,
2195
+ ConstnessSpace ( f . constness ) ,
2203
2196
UnsafetySpace ( f. unsafety) ,
2204
2197
AbiSpace ( f. abi) ,
2205
2198
it. name. as_ref( ) . unwrap( ) ,
@@ -2209,7 +2202,7 @@ fn item_function(w: &mut fmt::Formatter, cx: &Context, it: &clean::Item,
2209
2202
write ! ( w, "{vis}{constness}{unsafety}{abi}fn \
2210
2203
{name}{generics}{decl}{where_clause}</pre>",
2211
2204
vis = VisSpace ( & it. visibility) ,
2212
- constness = ConstnessSpace ( vis_constness ) ,
2205
+ constness = ConstnessSpace ( f . constness ) ,
2213
2206
unsafety = UnsafetySpace ( f. unsafety) ,
2214
2207
abi = AbiSpace ( f. abi) ,
2215
2208
name = it. name. as_ref( ) . unwrap( ) ,
@@ -2591,14 +2584,8 @@ fn render_assoc_item(w: &mut fmt::Formatter,
2591
2584
href ( did) . map ( |p| format ! ( "{}#{}.{}" , p. 0 , ty, name) ) . unwrap_or ( anchor)
2592
2585
}
2593
2586
} ;
2594
- // FIXME(#24111): remove when `const_fn` is stabilized
2595
- let vis_constness = if is_nightly_build ( ) {
2596
- constness
2597
- } else {
2598
- hir:: Constness :: NotConst
2599
- } ;
2600
2587
let mut head_len = format ! ( "{}{}{:#}fn {}{:#}" ,
2601
- ConstnessSpace ( vis_constness ) ,
2588
+ ConstnessSpace ( constness ) ,
2602
2589
UnsafetySpace ( unsafety) ,
2603
2590
AbiSpace ( abi) ,
2604
2591
name,
@@ -2611,7 +2598,7 @@ fn render_assoc_item(w: &mut fmt::Formatter,
2611
2598
} ;
2612
2599
write ! ( w, "{}{}{}fn <a href='{href}' class='fnname'>{name}</a>\
2613
2600
{generics}{decl}{where_clause}",
2614
- ConstnessSpace ( vis_constness ) ,
2601
+ ConstnessSpace ( constness ) ,
2615
2602
UnsafetySpace ( unsafety) ,
2616
2603
AbiSpace ( abi) ,
2617
2604
href = href,
0 commit comments