From 51e22be682e4ed5864e36400cbbc10836ee52c7e Mon Sep 17 00:00:00 2001
From: "Alexis (Poliorcetics) Bourget" <ab_github@poliorcetiq.eu>
Date: Sat, 1 Jul 2023 19:13:00 +0200
Subject: feat: render Object Safety informations non-object safe traits

---
 src/librustdoc/html/render/print_item.rs | 14 ++++++++++++++
 src/librustdoc/html/render/sidebar.rs    |  8 ++++++++
 2 files changed, 22 insertions(+)

(limited to 'src/librustdoc/html/render')

diff --git a/src/librustdoc/html/render/print_item.rs b/src/librustdoc/html/render/print_item.rs
index fdf45569061..4d518a3e20b 100644
--- a/src/librustdoc/html/render/print_item.rs
+++ b/src/librustdoc/html/render/print_item.rs
@@ -959,6 +959,20 @@ fn item_trait(w: &mut Buffer, cx: &mut Context<'_>, it: &clean::Item, t: &clean:
     let cloned_shared = Rc::clone(&cx.shared);
     let cache = &cloned_shared.cache;
     let mut extern_crates = FxHashSet::default();
+
+    if !t.is_object_safe(cx.tcx()) {
+        write_small_section_header(
+            w,
+            "object-safety",
+            "Object Safety",
+            &format!("<div class=\"object-safety-info\">This trait is <b>not</b> \
+                <a href=\"{base}/reference/items/traits.html#object-safety\">\
+                object safe</a>.</div>",
+                base = crate::clean::utils::DOC_RUST_LANG_ORG_CHANNEL
+            ),
+        );
+    }
+
     if let Some(implementors) = cache.implementors.get(&it.item_id.expect_def_id()) {
         // The DefId is for the first Type found with that name. The bool is
         // if any Types with the same name but different DefId have been found.
diff --git a/src/librustdoc/html/render/sidebar.rs b/src/librustdoc/html/render/sidebar.rs
index 4e8d88c55b6..ba4aaaff5a7 100644
--- a/src/librustdoc/html/render/sidebar.rs
+++ b/src/librustdoc/html/render/sidebar.rs
@@ -218,6 +218,14 @@ fn sidebar_trait<'a>(
     .map(|(id, title, items)| LinkBlock::new(Link::new(id, title), "", items))
     .collect();
     sidebar_assoc_items(cx, it, &mut blocks);
+
+    if !t.is_object_safe(cx.tcx()) {
+        blocks.push(LinkBlock::forced(
+            Link::new("object-safety", "Object Safety"),
+            "object-safety-note",
+        ));
+    }
+
     blocks.push(LinkBlock::forced(Link::new("implementors", "Implementors"), "impl"));
     if t.is_auto(cx.tcx()) {
         blocks.push(LinkBlock::forced(
-- 
cgit 1.4.1-3-g733a5


From 40556b968ca044108d5f28d7a8810821c8be7d9d Mon Sep 17 00:00:00 2001
From: "Alexis (Poliorcetics) Bourget" <ab_github@poliorcetiq.eu>
Date: Sat, 8 Jul 2023 17:29:05 +0200
Subject: feat: Add 'object-safety' ID to init_id_map() in rustdoc

---
 src/librustdoc/html/markdown.rs          | 1 +
 src/librustdoc/html/render/print_item.rs | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

(limited to 'src/librustdoc/html/render')

diff --git a/src/librustdoc/html/markdown.rs b/src/librustdoc/html/markdown.rs
index d24e6e5faf5..aa728c26afc 100644
--- a/src/librustdoc/html/markdown.rs
+++ b/src/librustdoc/html/markdown.rs
@@ -2024,6 +2024,7 @@ fn init_id_map() -> FxHashMap<Cow<'static, str>, usize> {
     map.insert("required-associated-consts".into(), 1);
     map.insert("required-methods".into(), 1);
     map.insert("provided-methods".into(), 1);
+    map.insert("object-safety".into(), 1);
     map.insert("implementors".into(), 1);
     map.insert("synthetic-implementors".into(), 1);
     map.insert("implementations-list".into(), 1);
diff --git a/src/librustdoc/html/render/print_item.rs b/src/librustdoc/html/render/print_item.rs
index 4d518a3e20b..c852f01f450 100644
--- a/src/librustdoc/html/render/print_item.rs
+++ b/src/librustdoc/html/render/print_item.rs
@@ -965,7 +965,8 @@ fn item_trait(w: &mut Buffer, cx: &mut Context<'_>, it: &clean::Item, t: &clean:
             w,
             "object-safety",
             "Object Safety",
-            &format!("<div class=\"object-safety-info\">This trait is <b>not</b> \
+            &format!(
+                "<div class=\"object-safety-info\">This trait is <b>not</b> \
                 <a href=\"{base}/reference/items/traits.html#object-safety\">\
                 object safe</a>.</div>",
                 base = crate::clean::utils::DOC_RUST_LANG_ORG_CHANNEL
-- 
cgit 1.4.1-3-g733a5