Auto merge of #150727 - Bryntet:test_err_should_panic, r=<try>

[DONT MERGE] crater run for FCW on `#[should_panic]`

Author: bors

compiler/rustc_ast_pretty/src/pprust/state.rs

@@ -655,7 +655,7 @@ pub trait PrintState<'a>: std::ops::Deref<Target = pp::Printer> + std::ops::Dere
     }
 
     fn print_attribute_inline(&mut self, attr: &ast::Attribute, is_inline: bool) -> bool {
-        if attr.has_name(sym::cfg_trace) || attr.has_name(sym::cfg_attr_trace) {
+        if attr.has_any_name(&[sym::cfg_trace, sym::cfg_attr_trace, sym::test_trace]) {
             // It's not a valid identifier, so avoid printing it
             // to keep the printed code reasonably parse-able.
             return false;

compiler/rustc_attr_parsing/src/attributes/codegen_attrs.rs

@@ -264,6 +264,7 @@ impl<S: Stage> AttributeParser<S> for NakedParser {
             sym::cfg_attr_trace,
             // testing (allowed here so better errors can be generated in `rustc_builtin_macros::test`)
             sym::test,
+            sym::test_trace,
             sym::ignore,
             sym::should_panic,
             sym::bench,

compiler/rustc_attr_parsing/src/attributes/mod.rs

@@ -63,6 +63,7 @@ pub(crate) mod rustc_internal;
 pub(crate) mod semantics;
 pub(crate) mod stability;
 pub(crate) mod test_attrs;
+pub(crate) mod trace;
 pub(crate) mod traits;
 pub(crate) mod transparency;
 pub(crate) mod util;

compiler/rustc_attr_parsing/src/attributes/trace.rs

@@ -0,0 +1,13 @@
+use super::prelude::*;
+
+pub(crate) struct TestTraceParser;
+
+impl<S: Stage> NoArgsAttributeParser<S> for TestTraceParser {
+    const PATH: &[Symbol] = &[sym::test_trace];
+
+    const ON_DUPLICATE: OnDuplicate<S> = OnDuplicate::Ignore;
+
+    const ALLOWED_TARGETS: AllowedTargets = AllowedTargets::AllowList(&[Allow(Target::Fn)]);
+
+    const CREATE: fn(Span) -> AttributeKind = |_| AttributeKind::TestTrace;
+}

compiler/rustc_attr_parsing/src/context.rs

@@ -82,6 +82,7 @@ use crate::attributes::stability::{
     BodyStabilityParser, ConstStabilityIndirectParser, ConstStabilityParser, StabilityParser,
 };
 use crate::attributes::test_attrs::{IgnoreParser, ShouldPanicParser};
+use crate::attributes::trace::TestTraceParser;
 use crate::attributes::traits::{
     AllowIncoherentImplParser, CoinductiveParser, DenyExplicitImplParser,
     DoNotImplementViaObjectParser, FundamentalParser, MarkerParser, ParenSugarParser,
@@ -291,6 +292,7 @@ attribute_parsers!(
         Single<WithoutArgs<RustcShouldNotBeCalledOnConstItems>>,
         Single<WithoutArgs<SpecializationTraitParser>>,
         Single<WithoutArgs<StdInternalSymbolParser>>,
+        Single<WithoutArgs<TestTraceParser>>,
         Single<WithoutArgs<ThreadLocalParser>>,
         Single<WithoutArgs<TrackCallerParser>>,
         Single<WithoutArgs<TypeConstParser>>,

compiler/rustc_attr_parsing/src/validate_attr.rs

@@ -22,7 +22,8 @@ use rustc_span::{Span, Symbol, sym};
 use crate::{AttributeParser, Late, session_diagnostics as errors};
 
 pub fn check_attr(psess: &ParseSess, attr: &Attribute) {
-    if attr.is_doc_comment() || attr.has_name(sym::cfg_trace) || attr.has_name(sym::cfg_attr_trace)
+    if attr.is_doc_comment()
+        || attr.has_any_name(&[sym::cfg_trace, sym::cfg_attr_trace, sym::test_trace])
     {
         return;
     }

compiler/rustc_builtin_macros/src/test.rs

@@ -9,6 +9,7 @@ use rustc_ast_pretty::pprust;
 use rustc_attr_parsing::AttributeParser;
 use rustc_errors::{Applicability, Diag, Level};
 use rustc_expand::base::*;
+use rustc_expand::config::attr_into_trace;
 use rustc_hir::Attribute;
 use rustc_hir::attrs::AttributeKind;
 use rustc_span::{ErrorGuaranteed, Ident, RemapPathScopeComponents, Span, Symbol, sym};
@@ -113,7 +114,7 @@ pub(crate) fn expand_test_or_bench(
     item: Annotatable,
     is_bench: bool,
 ) -> Vec<Annotatable> {
-    let (item, is_stmt) = match item {
+    let (mut item, is_stmt) = match item {
         Annotatable::Item(i) => (i, false),
         Annotatable::Stmt(box ast::Stmt { kind: ast::StmtKind::Item(i), .. }) => (i, true),
         other => {
@@ -136,6 +137,14 @@ pub(crate) fn expand_test_or_bench(
         return vec![];
     }
 
+    // Add a trace to the originating test function, so that we can
+    // check if attributes that have `#[test]` or `#[bench]` as a requirement
+    // actually are annotated with said attributes
+    item.attrs.push(attr_into_trace(
+        cx.attr_word(sym::test_trace, cx.with_def_site_ctxt(attr_sp)),
+        sym::test_trace,
+    ));
+
     if let Some(attr) = attr::find_by_name(&item.attrs, sym::naked) {
         cx.dcx().emit_err(errors::NakedFunctionTestingAttribute {
             testing_span: attr_sp,

compiler/rustc_expand/src/config.rs

@@ -169,7 +169,7 @@ pub fn pre_configure_attrs(sess: &Session, attrs: &[Attribute]) -> ast::AttrVec
         .collect()
 }
 
-pub(crate) fn attr_into_trace(mut attr: Attribute, trace_name: Symbol) -> Attribute {
+pub fn attr_into_trace(mut attr: Attribute, trace_name: Symbol) -> Attribute {
     match &mut attr.kind {
         AttrKind::Normal(normal) => {
             let NormalAttr { item, tokens } = &mut **normal;

compiler/rustc_feature/src/builtin_attrs.rs

@@ -1140,6 +1140,10 @@ pub static BUILTIN_ATTRIBUTES: &[BuiltinAttribute] = &[
         cfg_attr_trace, Normal, template!(Word /* irrelevant */), DuplicatesOk,
         EncodeCrossCrate::No
     ),
+    ungated!(
+        test_trace, Normal, template!(Word), ErrorFollowing,
+        EncodeCrossCrate::No
+    ),
 
     // ==========================================================================
     // Internal attributes, Diagnostics related:

compiler/rustc_hir/src/attrs/data_structures.rs

@@ -1021,6 +1021,9 @@ pub enum AttributeKind {
     /// `#[unsafe(force_target_feature(enable = "...")]`.
     TargetFeature { features: ThinVec<(Symbol, Span)>, attr_span: Span, was_forced: bool },
 
+    /// Represents `#[<test_trace>]`
+    TestTrace,
+
     /// Represents `#[thread_local]`
     ThreadLocal,