X-Git-Url: https://git.lizzy.rs/?a=blobdiff_plain;f=src%2Flibrustdoc%2Fhtml%2Frender%2Fmod.rs;h=eb606178d244d3127f50cf53fe2de931a200d0d6;hb=3009dd7c5a6da3c36c61ce89d5320ed8c0922a22;hp=166e084012724e18999eb920770880617556c5ad;hpb=d26fc45e5bf170907cefcaa83c5b8e6cf6cb1351;p=rust.git
diff --git a/src/librustdoc/html/render/mod.rs b/src/librustdoc/html/render/mod.rs
index 166e0840127..eb606178d24 100644
--- a/src/librustdoc/html/render/mod.rs
+++ b/src/librustdoc/html/render/mod.rs
@@ -567,7 +567,7 @@ fn document_full_inner(
is_collapsible: bool,
heading_offset: HeadingOffset,
) {
- if let Some(s) = cx.shared.maybe_collapsed_doc_value(item) {
+ if let Some(s) = item.collapsed_doc_value() {
debug!("Doc block: =====\n{}\n=====", s);
if is_collapsible {
w.write_str(
@@ -640,9 +640,9 @@ fn short_item_info(
// We display deprecation messages for #[deprecated] and #[rustc_deprecated]
// but only display the future-deprecation messages for #[rustc_deprecated].
let mut message = if let Some(since) = since {
- let since = &since.as_str();
+ let since = since.as_str();
if !stability::deprecation_in_effect(&depr) {
- if *since == "TBD" {
+ if since == "TBD" {
String::from("Deprecating in a future Rust version")
} else {
format!("Deprecating in {}", Escape(since))
@@ -658,7 +658,7 @@ fn short_item_info(
let note = note.as_str();
let mut ids = cx.id_map.borrow_mut();
let html = MarkdownHtml(
- ¬e,
+ note,
&mut ids,
error_codes,
cx.shared.edition(),
@@ -683,7 +683,7 @@ fn short_item_info(
let mut message =
"ð¬ This is a nightly-only experimental API.".to_owned();
- let mut feature = format!("{}
", Escape(&feature.as_str()));
+ let mut feature = format!("{}
", Escape(feature.as_str()));
if let (Some(url), Some(issue)) = (&cx.shared.issue_tracker_base_url, issue) {
feature.push_str(&format!(
" #{issue}",
@@ -762,7 +762,6 @@ fn assoc_const(
w: &mut Buffer,
it: &clean::Item,
ty: &clean::Type,
- _default: Option<&String>,
link: AssocItemLink<'_>,
extra: &str,
cx: &Context<'_>,
@@ -958,15 +957,9 @@ fn method(
clean::MethodItem(ref m, _) => {
method(w, item, m.header, &m.generics, &m.decl, link, parent, cx, render_mode)
}
- clean::AssocConstItem(ref ty, ref default) => assoc_const(
- w,
- item,
- ty,
- default.as_ref(),
- link,
- if parent == ItemType::Trait { " " } else { "" },
- cx,
- ),
+ clean::AssocConstItem(ref ty, _) => {
+ assoc_const(w, item, ty, link, if parent == ItemType::Trait { " " } else { "" }, cx)
+ }
clean::AssocTypeItem(ref bounds, ref default) => assoc_type(
w,
item,
@@ -989,7 +982,7 @@ fn attributes(it: &clean::Item) -> Vec {
.iter()
.filter_map(|attr| {
if ALLOWED_ATTRIBUTES.contains(&attr.name_or_empty()) {
- Some(pprust::attribute_to_string(attr).replace("\n", "").replace(" ", " "))
+ Some(pprust::attribute_to_string(attr).replace('\n', "").replace(" ", " "))
} else {
None
}
@@ -1421,7 +1414,7 @@ fn doc_impl_item(
let source_id = trait_
.and_then(|trait_| {
trait_.items.iter().find(|item| {
- item.name.map(|n| n.as_str().eq(&name.as_str())).unwrap_or(false)
+ item.name.map(|n| n.as_str().eq(name.as_str())).unwrap_or(false)
})
})
.map(|item| format!("{}.{}", item.type_(), name));
@@ -1467,7 +1460,7 @@ fn doc_impl_item(
w.write_str("");
w.write_str("");
}
- clean::AssocConstItem(ref ty, ref default) => {
+ clean::AssocConstItem(ref ty, _) => {
let source_id = format!("{}.{}", item_type, name);
let id = cx.derive_id(source_id.clone());
write!(
@@ -1482,7 +1475,6 @@ fn doc_impl_item(
w,
item,
ty,
- default.as_ref(),
link.anchor(if trait_.is_some() { &source_id } else { &id }),
"",
cx,
@@ -1620,7 +1612,7 @@ fn render_default_items(
write!(w, "")
}
- if let Some(ref dox) = cx.shared.maybe_collapsed_doc_value(&i.impl_item) {
+ if let Some(ref dox) = i.impl_item.collapsed_doc_value() {
let mut ids = cx.id_map.borrow_mut();
write!(
w,