Allow emitting diagnostics from the #[diagnostic] namespace without a

weiznich · weiznich · commit 5d63f5d8d1a7 · 2023-12-21T14:02:58.000+01:00
nightly feature

(Using this attribute still requires a nightly feature, this just
enables that this feature does not need to be enabled on the child crate
as well)
diff --git a/compiler/rustc_trait_selection/src/traits/error_reporting/on_unimplemented.rs b/compiler/rustc_trait_selection/src/traits/error_reporting/on_unimplemented.rs
@@ -550,7 +550,7 @@ impl<'tcx> OnUnimplementedDirective {
     pub fn of_item(tcx: TyCtxt<'tcx>, item_def_id: DefId) -> Result<Option<Self>, ErrorGuaranteed> {
         if let Some(attr) = tcx.get_attr(item_def_id, sym::rustc_on_unimplemented) {
             return Self::parse_attribute(attr, false, tcx, item_def_id);
-        } else if tcx.features().diagnostic_namespace {
+        } else {
             tcx.get_attrs_by_path(item_def_id, &[sym::diagnostic, sym::on_unimplemented])
                 .filter_map(|attr| Self::parse_attribute(attr, true, tcx, item_def_id).transpose())
                 .try_fold(None, |aggr: Option<Self>, directive| {
@@ -621,8 +621,6 @@ impl<'tcx> OnUnimplementedDirective {
                         Ok(Some(directive))
                     }
                 })
-        } else {
-            Ok(None)
         }
     }
 

Original file line number	Diff line number	Diff line change
`@@ -550,7 +550,7 @@ impl<'tcx> OnUnimplementedDirective {`
`550`	`550`	`pub fn of_item(tcx: TyCtxt<'tcx>, item_def_id: DefId) -> Result<Option<Self>, ErrorGuaranteed> {`
`551`	`551`	`if let Some(attr) = tcx.get_attr(item_def_id, sym::rustc_on_unimplemented) {`
`552`	`552`	`return Self::parse_attribute(attr, false, tcx, item_def_id);`
`553`		`- } else if tcx.features().diagnostic_namespace {`
	`553`	`+ } else {`
`554`	`554`	`tcx.get_attrs_by_path(item_def_id, &[sym::diagnostic, sym::on_unimplemented])`
`555`	`555`	`.filter_map(\|attr\| Self::parse_attribute(attr, true, tcx, item_def_id).transpose())`
`556`	`556`	`.try_fold(None, \|aggr: Option<Self>, directive\| {`
`@@ -621,8 +621,6 @@ impl<'tcx> OnUnimplementedDirective {`
`621`	`621`	`Ok(Some(directive))`
`622`	`622`	`}`
`623`	`623`	`})`
`624`		`- } else {`
`625`		`- Ok(None)`
`626`	`624`	`}`
`627`	`625`	`}`
`628`	`626`