diff --git a/src/librustdoc/html/layout.rs b/src/librustdoc/html/layout.rs index ec04c94dc11..7c2be0fd6fa 100644 --- a/src/librustdoc/html/layout.rs +++ b/src/librustdoc/html/layout.rs @@ -235,6 +235,7 @@ crate fn redirect(url: &str) -> String {
+Redirecting to {url}...
diff --git a/src/librustdoc/html/render/mod.rs b/src/librustdoc/html/render/mod.rs index fa63286e4f5..21d588e42f8 100644 --- a/src/librustdoc/html/render/mod.rs +++ b/src/librustdoc/html/render/mod.rs @@ -1369,7 +1369,11 @@ fn render_impl( }) }) .map(|item| format!("{}.{}", item.type_(), name)); - write!(w, "");
render_assoc_item(
w,
@@ -1388,13 +1392,17 @@ fn render_impl(
);
write!(w, "", id);
write_srclink(cx, item, w);
- w.write_str("");
+ w.write_str("
", id, item_type, in_trait_class);
+ write!(
+ w,
+ "",
+ id, item_type, in_trait_class
+ );
assoc_type(
w,
item,
@@ -1406,12 +1414,16 @@ fn render_impl(
);
w.write_str("
");
write!(w, "", id);
- w.write_str("");
+ w.write_str("");
}
clean::AssocConstItem(ref ty, ref default) => {
let source_id = format!("{}.{}", item_type, name);
let id = cx.derive_id(source_id.clone());
- write!(w, "", id, item_type, in_trait_class);
+ write!(
+ w,
+ "",
+ id, item_type, in_trait_class
+ );
assoc_const(
w,
item,
@@ -1431,12 +1443,12 @@ fn render_impl(
);
write!(w, "", id);
write_srclink(cx, item, w);
- w.write_str("");
+ w.write_str("
");
}
clean::AssocTypeItem(ref bounds, ref default) => {
let source_id = format!("{}.{}", item_type, name);
let id = cx.derive_id(source_id.clone());
- write!(w, "", id, item_type, in_trait_class);
+ write!(w, "", id, item_type, in_trait_class,);
assoc_type(
w,
item,
@@ -1448,7 +1460,7 @@ fn render_impl(
);
w.write_str("
");
write!(w, "", id);
- w.write_str("");
+ w.write_str("");
}
clean::StrippedItem(..) => return,
_ => panic!("can't make docs for trait item with name {:?}", item.name),
@@ -1577,7 +1589,8 @@ fn render_impl(
if let Some(use_absolute) = use_absolute {
write!(
w,
- "{}",
+ "{}\
+ ",
open_details(&mut close_tags, is_implementing_trait),
id,
aliases
@@ -1604,7 +1617,8 @@ fn render_impl(
} else {
write!(
w,
- "{}{}
",
+ "{}\
+ {}
",
open_details(&mut close_tags, is_implementing_trait),
id,
aliases,
@@ -1621,9 +1635,9 @@ fn render_impl(
);
write_srclink(cx, &i.impl_item, w);
if !toggled {
- w.write_str("");
+ w.write_str("");
} else {
- w.write_str("
");
+ w.write_str("
");
}
if trait_.is_some() {
@@ -1649,10 +1663,12 @@ fn render_impl(
);
}
}
- w.write_str("");
- w.push_buffer(default_impl_items);
- w.push_buffer(impl_items);
- close_tags.insert_str(0, "");
+ if !default_impl_items.is_empty() || !impl_items.is_empty() {
+ w.write_str("");
+ w.push_buffer(default_impl_items);
+ w.push_buffer(impl_items);
+ close_tags.insert_str(0, "");
+ }
w.write_str(&close_tags);
}
diff --git a/src/librustdoc/html/render/print_item.rs b/src/librustdoc/html/render/print_item.rs
index 42d7e9c8c93..61b6833c2b2 100644
--- a/src/librustdoc/html/render/print_item.rs
+++ b/src/librustdoc/html/render/print_item.rs
@@ -75,7 +75,7 @@ pub(super) fn print_item(cx: &Context<'_>, item: &clean::Item, buf: &mut Buffer,
);
}
}
- write!(buf, "{}", item.type_(), item.name.as_ref().unwrap());
+ write!(buf, "{}", item.type_(), item.name.as_ref().unwrap());
write!(
buf,
"