diff options
| author | Guillaume Gomez <guillaume1.gomez@gmail.com> | 2017-09-01 23:09:11 +0200 |
|---|---|---|
| committer | Guillaume Gomez <guillaume1.gomez@gmail.com> | 2017-09-12 21:55:24 +0200 |
| commit | 742ff5a4896e476f52be5c2fc0ceee25cfc469bf (patch) | |
| tree | 7ec217b0335f6d19984342608e4f6b79c926f238 /src/librustdoc | |
| parent | efa3ec67e28ab8a4c3377a039095cd464713cdfd (diff) | |
| download | rust-742ff5a4896e476f52be5c2fc0ceee25cfc469bf.tar.gz rust-742ff5a4896e476f52be5c2fc0ceee25cfc469bf.zip | |
Fix rendering of const keyword for functions
Diffstat (limited to 'src/librustdoc')
| -rw-r--r-- | src/librustdoc/html/render.rs | 21 |
1 files changed, 4 insertions, 17 deletions
diff --git a/src/librustdoc/html/render.rs b/src/librustdoc/html/render.rs index 49d4bd23240..1e9dd6dc57d 100644 --- a/src/librustdoc/html/render.rs +++ b/src/librustdoc/html/render.rs @@ -54,13 +54,11 @@ use externalfiles::ExternalHtml; use serialize::json::{ToJson, Json, as_json}; use syntax::{abi, ast}; -use syntax::feature_gate::UnstableFeatures; use rustc::hir::def_id::{CrateNum, CRATE_DEF_INDEX, DefId}; use rustc::middle::privacy::AccessLevels; use rustc::middle::stability; use rustc::hir; use rustc::util::nodemap::{FxHashMap, FxHashSet}; -use rustc::session::config::nightly_options::is_nightly_build; use rustc_data_structures::flock; use clean::{self, AttributesExt, GetDefId, SelfTy, Mutability, Span}; @@ -2192,14 +2190,9 @@ fn item_static(w: &mut fmt::Formatter, cx: &Context, it: &clean::Item, fn item_function(w: &mut fmt::Formatter, cx: &Context, it: &clean::Item, f: &clean::Function) -> fmt::Result { - // FIXME(#24111): remove when `const_fn` is stabilized - let vis_constness = match UnstableFeatures::from_environment() { - UnstableFeatures::Allow => f.constness, - _ => hir::Constness::NotConst - }; let name_len = format!("{}{}{}{:#}fn {}{:#}", VisSpace(&it.visibility), - ConstnessSpace(vis_constness), + ConstnessSpace(f.constness), UnsafetySpace(f.unsafety), AbiSpace(f.abi), it.name.as_ref().unwrap(), @@ -2209,7 +2202,7 @@ fn item_function(w: &mut fmt::Formatter, cx: &Context, it: &clean::Item, write!(w, "{vis}{constness}{unsafety}{abi}fn \ {name}{generics}{decl}{where_clause}</pre>", vis = VisSpace(&it.visibility), - constness = ConstnessSpace(vis_constness), + constness = ConstnessSpace(f.constness), unsafety = UnsafetySpace(f.unsafety), abi = AbiSpace(f.abi), name = it.name.as_ref().unwrap(), @@ -2591,14 +2584,8 @@ fn render_assoc_item(w: &mut fmt::Formatter, href(did).map(|p| format!("{}#{}.{}", p.0, ty, name)).unwrap_or(anchor) } }; - // FIXME(#24111): remove when `const_fn` is stabilized - let vis_constness = if is_nightly_build() { - constness - } else { - hir::Constness::NotConst - }; let mut head_len = format!("{}{}{:#}fn {}{:#}", - ConstnessSpace(vis_constness), + ConstnessSpace(constness), UnsafetySpace(unsafety), AbiSpace(abi), name, @@ -2611,7 +2598,7 @@ fn render_assoc_item(w: &mut fmt::Formatter, }; write!(w, "{}{}{}fn <a href='{href}' class='fnname'>{name}</a>\ {generics}{decl}{where_clause}", - ConstnessSpace(vis_constness), + ConstnessSpace(constness), UnsafetySpace(unsafety), AbiSpace(abi), href = href, |