rename to doc(notable)

Author: conradludgate

compiler/rustc_ast_passes/src/feature_gate.rs

@@ -204,7 +204,7 @@ impl<'a> Visitor<'a> for PostExpansionVisitor<'a> {
                     cfg => doc_cfg
                     cfg_hide => doc_cfg_hide
                     masked => doc_masked
-                    notable_trait => doc_notable_trait
+                    notable => doc_notable_trait
                 );
 
                 if nested_meta.has_name(sym::keyword) {

compiler/rustc_feature/src/removed.rs

@@ -81,7 +81,7 @@ declare_features! (
     (removed, doc_primitive, "1.56.0", Some(88070), None,
      Some("merged into `#![feature(rustdoc_internals)]`")),
     /// Allows `#[doc(spotlight)]`.
-    /// The attribute was renamed to `#[doc(notable_trait)]`
+    /// The attribute was renamed to `#[doc(notable)]`
     /// and the feature to `doc_notable_trait`.
     (removed, doc_spotlight, "1.22.0", Some(45040), None,
      Some("renamed to `doc_notable_trait`")),

compiler/rustc_feature/src/unstable.rs

@@ -231,7 +231,7 @@ declare_features! (
     (unstable, auto_traits, "1.50.0", Some(13231), None),
     /// Allows using `box` in patterns (RFC 469).
     (unstable, box_patterns, "1.0.0", Some(29641), None),
-    /// Allows `#[doc(notable_trait)]`.
+    /// Allows `#[doc(notable)]`.
     /// Renamed from `doc_spotlight`.
     (unstable, doc_notable_trait, "1.52.0", Some(45040), None),
     /// Allows using the `may_dangle` attribute (RFC 1327).

compiler/rustc_middle/src/query/mod.rs

@@ -1215,9 +1215,9 @@ rustc_queries! {
         separate_provide_extern
     }
 
-    /// Determines whether an item is annotated with `doc(notable_trait)`.
-    query is_doc_notable_trait(def_id: DefId) -> bool {
-        desc { |tcx| "checking whether `{}` is `doc(notable_trait)`", tcx.def_path_str(def_id) }
+    /// Determines whether an item is annotated with `doc(notable)`.
+    query is_doc_notable(def_id: DefId) -> bool {
+        desc { |tcx| "checking whether `{}` is `doc(notable)`", tcx.def_path_str(def_id) }
     }
 
     /// Returns the attributes on the item at `def_id`.

compiler/rustc_middle/src/ty/util.rs

@@ -1432,11 +1432,11 @@ fn is_doc_hidden(tcx: TyCtxt<'_>, def_id: LocalDefId) -> bool {
         .any(|items| items.iter().any(|item| item.has_name(sym::hidden)))
 }
 
-/// Determines whether an item is annotated with `doc(notable_trait)`.
-pub fn is_doc_notable_trait(tcx: TyCtxt<'_>, def_id: DefId) -> bool {
+/// Determines whether an item is annotated with `doc(notable)`.
+pub fn is_doc_notable(tcx: TyCtxt<'_>, def_id: DefId) -> bool {
     tcx.get_attrs(def_id, sym::doc)
         .filter_map(|attr| attr.meta_item_list())
-        .any(|items| items.iter().any(|item| item.has_name(sym::notable_trait)))
+        .any(|items| items.iter().any(|item| item.has_name(sym::notable)))
 }
 
 /// Determines whether an item is an intrinsic by Abi.
@@ -1448,7 +1448,7 @@ pub fn provide(providers: &mut Providers) {
     *providers = Providers {
         reveal_opaque_types_in_bounds,
         is_doc_hidden,
-        is_doc_notable_trait,
+        is_doc_notable,
         is_intrinsic,
         ..*providers
     }

compiler/rustc_passes/messages.ftl

@@ -252,10 +252,16 @@ passes_doc_test_unknown_include =
     unknown `doc` attribute `{$path}`
     .suggestion = use `doc = include_str!` instead
 
+passes_doc_test_unknown_notable_trait =
+    unknown `doc` attribute `{$path}`
+    .note = `doc(notable_trait)` was renamed to `doc(notable)`
+    .suggestion = use `notable` instead
+    .no_op_note = `doc(notable_trait)` is now a no-op
+
 passes_doc_test_unknown_spotlight =
     unknown `doc` attribute `{$path}`
-    .note = `doc(spotlight)` was renamed to `doc(notable_trait)`
-    .suggestion = use `notable_trait` instead
+    .note = `doc(spotlight)` was renamed to `doc(notable)`
+    .suggestion = use `notable` instead
     .no_op_note = `doc(spotlight)` is now a no-op
 
 passes_duplicate_diagnostic_item_in_crate =

compiler/rustc_passes/src/check_attr.rs

@@ -1157,7 +1157,7 @@ impl CheckAttrVisitor<'_> {
                         | sym::masked
                         | sym::no_default_passes
                         | sym::no_inline
-                        | sym::notable_trait
+                        | sym::notable
                         | sym::passes
                         | sym::plugins
                         | sym::fake_variadic => {}
@@ -1189,6 +1189,13 @@ impl CheckAttrVisitor<'_> {
                                     i_meta.span,
                                     errors::DocTestUnknownSpotlight { path, span: i_meta.span },
                                 );
+                            } else if i_meta.has_name(sym::notable_trait) {
+                                self.tcx.emit_spanned_lint(
+                                    INVALID_DOC_ATTRIBUTES,
+                                    hir_id,
+                                    i_meta.span,
+                                    errors::DocTestUnknownNotableTrait { path, span: i_meta.span },
+                                );
                             } else if i_meta.has_name(sym::include)
                                 && let Some(value) = i_meta.value_str()
                             {

compiler/rustc_passes/src/errors.rs

@@ -318,13 +318,23 @@ pub struct DocTestUnknownAny {
     pub path: String,
 }
 
+#[derive(LintDiagnostic)]
+#[diag(passes_doc_test_unknown_notable_trait)]
+#[note]
+#[note(passes_no_op_note)]
+pub struct DocTestUnknownNotableTrait {
+    pub path: String,
+    #[suggestion(style = "short", applicability = "machine-applicable", code = "notable")]
+    pub span: Span,
+}
+
 #[derive(LintDiagnostic)]
 #[diag(passes_doc_test_unknown_spotlight)]
 #[note]
 #[note(passes_no_op_note)]
 pub struct DocTestUnknownSpotlight {
     pub path: String,
-    #[suggestion(style = "short", applicability = "machine-applicable", code = "notable_trait")]
+    #[suggestion(style = "short", applicability = "machine-applicable", code = "notable")]
     pub span: Span,
 }
 

compiler/rustc_span/src/symbol.rs

@@ -1097,6 +1097,7 @@ symbols! {
         noreturn,
         nostack,
         not,
+        notable,
         notable_trait,
         note,
         object_safe_for_dispatch,

library/core/src/fmt/mod.rs

@@ -2260,7 +2260,7 @@ impl<'a> Formatter<'a> {
 }
 
 #[stable(since = "1.2.0", feature = "formatter_write")]
-#[doc(notable_trait)]
+#[cfg_attr(not(bootstrap), doc(notable))]
 impl Write for Formatter<'_> {
     fn write_str(&mut self, s: &str) -> Result {
         self.buf.write_str(s)