pr feedbacks + x tidy pass

Author: ThierryBerger

compiler/rustc_feature/src/unstable.rs

@@ -316,7 +316,7 @@ declare_features! (
     /// Allows builtin # foo() syntax
     (internal, builtin_syntax, "1.71.0", Some(110680)),
     /// Allows `#[doc(label_trait)]`.
-    (unstable, doc_label_trait, "1.97.0", Some(156865)),
+    (unstable, doc_label_trait, "CURRENT_RUSTC_VERSION", Some(156865)),
     /// Allows `#[doc(notable_trait)]`.
     /// Renamed from `doc_spotlight`.
     (unstable, doc_notable_trait, "1.52.0", Some(45040)),

src/doc/rustdoc/src/unstable-features.md

@@ -63,9 +63,7 @@ and enabled with a `#![feature(...)]` attribute in your crate.
 Important traits can be difficult to discover when lost in the noise.
 This `#![feature(doc_label_trait)]` allows you to tag traits important for your code base.
 
-The traits with the attribute #![doc(label_trait)]` are rendered with a colored badge on top of their dedicated page, and accompanied with a smaller badge when referenced from elsewhere.
-
-To customize the color: `#[doc(notable_trait)].
+The traits with the attribute #![doc(label_trait)]` are rendered with a colored badge at the top of their dedicated page.
 
 Consider lookint into the `notable_trait` unstable attribure, which help with
 discoverability in other ways.

src/doc/unstable-book/src/language-features/doc-label_trait.md

@@ -10,7 +10,7 @@ use rustc_ast::join_path_syms;
 use rustc_data_structures::fx::{FxHashMap, FxHashSet, FxIndexMap, FxIndexSet};
 use rustc_hir::Attribute;
 use rustc_hir::attrs::AttributeKind;
-use rustc_hir::def_id::{DefId, DefIdMap, LOCAL_CRATE};
+use rustc_hir::def_id::{DefIdMap, LOCAL_CRATE};
 use rustc_middle::ty::TyCtxt;
 use rustc_session::Session;
 use rustc_span::edition::Edition;
@@ -67,7 +67,6 @@ pub(crate) struct Context<'tcx> {
     pub(crate) shared: SharedContext<'tcx>,
     /// Collection of all types with notable traits referenced in the current module.
     pub(crate) types_with_notable_traits: RefCell<FxIndexSet<clean::Type>>,
-    pub(crate) types_with_label_traits: RefCell<FxIndexMap<DefId, Vec<String>>>,
     /// Contains information that needs to be saved and reset after rendering an item which is
     /// not a module.
     pub(crate) info: ContextInfo,
@@ -630,7 +629,6 @@ impl<'tcx> Context<'tcx> {
             deref_id_map: Default::default(),
             shared: scx,
             types_with_notable_traits: RefCell::new(FxIndexSet::default()),
-            types_with_label_traits: RefCell::default(),
             info: ContextInfo::new(include_sources),
         };
 
@@ -658,7 +656,6 @@ impl<'tcx> FormatRenderer<'tcx> for Context<'tcx> {
         self.deref_id_map.borrow_mut().clear();
         self.id_map.borrow_mut().clear();
         self.types_with_notable_traits.borrow_mut().clear();
-        self.types_with_label_traits.borrow_mut().clear();
         self.info
     }
 

src/librustdoc/html/render/context.rs

@@ -40,7 +40,7 @@ mod type_layout;
 mod write_shared;
 
 use std::borrow::Cow;
-use std::collections::VecDeque;
+use std::collections::{BTreeMap, VecDeque};
 use std::fmt::{self, Display as _, Write};
 use std::iter::Peekable;
 use std::path::PathBuf;
@@ -1772,7 +1772,6 @@ fn notable_traits_json<'a>(tys: impl Iterator<Item = &'a clean::Type>, cx: &Cont
 
 pub(crate) struct LabelTraitInfo {
     pub name: String,
-    pub def_id: DefId,
     pub full_path: String,
     /// Relative URL to the trait page, or `None` if it cannot be linked.
     pub href: Option<String>,
@@ -1790,35 +1789,26 @@ pub(crate) fn label_traits_for_item(item: &clean::Item, cx: &Context<'_>) -> Vec
 
     let Some(impls) = cx.cache().impls.get(&did) else { return Vec::new() };
 
-    let mut out: Vec<LabelTraitInfo> = impls
+    impls
         .iter()
         .map(Impl::inner_impl)
         .filter(|impl_| impl_.polarity == ty::ImplPolarity::Positive)
-        .filter_map(|impl_| impl_.trait_.as_ref())
-        .filter_map(|trait_| {
-            let trait_did = trait_.def_id();
-            let t = cx.cache().traits.get(&trait_did)?;
-            if !t.is_label_trait(cx.tcx()) {
+        .filter_map(|impl_| {
+            let path_ = impl_.trait_.as_ref()?;
+            let trait_did = path_.def_id();
+            if !cx.cache().traits.get(&trait_did)?.is_label_trait(cx.tcx()) {
                 return None;
             }
             let name = cx.tcx().item_name(trait_did).to_string();
             let (full_path, href) = match href(trait_did, cx) {
                 Ok(info) => (join_path_syms(&info.rust_path), Some(info.url)),
                 Err(_) => (cx.tcx().def_path_str(trait_did), None),
             };
-            Some(LabelTraitInfo { name, def_id: trait_did, full_path, href })
+            Some((name.clone(), LabelTraitInfo { name, full_path, href }))
         })
-        .collect();
-
-    out.sort_by(|a, b| a.name.cmp(&b.name));
-    out.dedup_by(|a, b| a.def_id == b.def_id);
-
-    if !out.is_empty() {
-        cx.types_with_label_traits
-            .borrow_mut()
-            .insert(did, out.iter().map(|i| i.name.clone()).collect());
-    }
-    out
+        .collect::<BTreeMap<String, LabelTraitInfo>>()
+        .into_values()
+        .collect()
 }
 
 #[derive(Clone, Copy, Debug)]

src/librustdoc/html/render/mod.rs

@@ -130,7 +130,7 @@ pub(super) fn print_item(cx: &Context<'_>, item: &clean::Item) -> impl fmt::Disp
                 // trait gets the same badge color across pages.
                 // This won't be stable between releases though.
                 let mut h = DefaultHasher::new();
-                info.def_id.hash(&mut h);
+                info.full_path.hash(&mut h);
                 let v = h.finish();
                 let style_attr = format!(
                     "style=\"background: rgb({}, {}, {})\"",

src/librustdoc/html/render/print_item.rs

@@ -1645,22 +1645,22 @@ so that we can apply CSS-filters to change the arrow color in themes */
 }
 
 .impl-label-trait-full-badge-container {
-  padding: 0.5rem 0;
-  display: flex;
-  flex-wrap: wrap;
-  gap: 0.5rem;
+	padding: 0.5rem 0;
+	display: flex;
+	flex-wrap: wrap;
+	gap: 0.5rem;
 }
 
 .impl-label-trait-full-badge {
-  display: flex;
-  align-items: center;
-  width: fit-content;
-  height: 1.5rem;
-  padding: 0 0.5rem;
-  border-radius: 0.75rem;
-  font-size: 1rem;
-  font-weight: normal;
-  color: white;
+	display: flex;
+	align-items: center;
+	width: fit-content;
+	height: 1.5rem;
+	padding: 0 0.5rem;
+	border-radius: 0.75rem;
+	font-size: 1rem;
+	font-weight: normal;
+	color: white;
 }
 
 .rightside {

src/librustdoc/html/static/css/rustdoc.css

@@ -2,21 +2,21 @@
     {% if !path_components.is_empty() %}
     <div class="rustdoc-breadcrumbs">
         {% for (i, component) in path_components.iter().enumerate() %}
-        {% if i != 0 %}
-        ::<wbr>
+            {% if i != 0 %}
+         ::<wbr>
             {% endif %}
-        <a href="{{component.path|safe}}index.html">{{component.name}}</a>
+            <a href="{{component.path|safe}}index.html">{{component.name}}</a>
         {% endfor %}
     </div>
     {% endif %}
     <h1>
         {{typ}}
         <span{% if item_type !="mod" +%} class="{{item_type}}" {% endif %}>
-            {{name|wrapped|safe}}
-            </span>&nbsp;{# #}
-            <button id="copy-path" title="Copy item path to clipboard"> {# #}
-                Copy item path {# #}
-            </button> {# #}
+        {{name|wrapped|safe}}
+        </span>&nbsp;{# #}
+        <button id="copy-path" title="Copy item path to clipboard"> {# #}
+            Copy item path {# #}
+        </button> {# #}
     </h1> {# #}
     <rustdoc-toolbar></rustdoc-toolbar> {# #}
     <span class="sub-heading">
@@ -33,10 +33,10 @@ <h1>
         {{ stability_since_raw|safe +}}
         {% endif %}
         {% match src_href %}
-        {% when Some with (href) %}
-        {% if !stability_since_raw.is_empty() +%} · {%+ endif %}
-        <a class="src" href="{{href|safe}}">Source</a> {#+ #}
-        {% else %}
+            {% when Some with (href) %}
+                {% if !stability_since_raw.is_empty() +%} · {%+ endif %}
+                <a class="src" href="{{href|safe}}">Source</a> {#+ #}
+            {% else %}
         {% endmatch %}
     </span> {# #}
-</div> {# #}
+</div> {# #}

src/librustdoc/html/templates/print_item.html

@@ -348,6 +348,7 @@ bitflags::bitflags! {
         const IS_MUST_USE = 1 << 50;
 
         const DIAGNOSTIC_DO_NOT_RECOMMEND = 1 << 51;
+        const IS_DOC_LABEL_TRAIT = 1 << 52;
     }
 }
 

src/tools/rust-analyzer/crates/hir-def/src/attrs.rs

@@ -7,4 +7,4 @@ pub trait Labeled {}
 // A negative impl must not produce a badge.
 //@ count 'foo/struct.Neg.html' '//div[@class="impl-label-trait-full-badge-container"]' 0
 pub struct Neg;
-impl !Labeled for Neg {}
+impl !Labeled for Neg {}