X-Git-Url: https://git.lizzy.rs/?a=blobdiff_plain;f=src%2Flibrustdoc%2Fhtml%2Frender%2Fmod.rs;h=3e7711181f730b7c5210639ddd48d2d449635b7a;hb=60a1abe4c5b6399e62144fc94d236b6f7eefcdf0;hp=2432f5cc085ef6d88479f6fa01b62b30aadb78e6;hpb=44ff0f75d9b6eb3894594c984c535d6742b1aebe;p=rust.git
diff --git a/src/librustdoc/html/render/mod.rs b/src/librustdoc/html/render/mod.rs
index 2432f5cc085..3e7711181f7 100644
--- a/src/librustdoc/html/render/mod.rs
+++ b/src/librustdoc/html/render/mod.rs
@@ -23,7 +23,7 @@
//! These threads are not parallelized (they haven't been a bottleneck yet), and
//! both occur before the crate is rendered.
-crate mod cache;
+crate mod search_index;
#[cfg(test)]
mod tests;
@@ -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}",
@@ -1414,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));
@@ -1612,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,