Skip to content

Commit 250ce84

Browse files
committed
Port #[rustc_test_marker] to the attribute parser
1 parent 47611e1 commit 250ce84

5 files changed

Lines changed: 39 additions & 1 deletion

File tree

compiler/rustc_attr_parsing/src/attributes/test_attrs.rs

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -257,3 +257,36 @@ impl<S: Stage> SingleAttributeParser<S> for TestRunnerParser {
257257
Some(AttributeKind::TestRunner(meta.path().0.clone()))
258258
}
259259
}
260+
261+
pub(crate) struct RustcTestMarkerParser;
262+
263+
impl<S: Stage> SingleAttributeParser<S> for RustcTestMarkerParser {
264+
const PATH: &[Symbol] = &[sym::rustc_test_marker];
265+
const ATTRIBUTE_ORDER: AttributeOrder = AttributeOrder::KeepOutermost;
266+
const ON_DUPLICATE: OnDuplicate<S> = OnDuplicate::Warn;
267+
const ALLOWED_TARGETS: AllowedTargets = AllowedTargets::AllowList(&[
268+
Allow(Target::Const),
269+
Allow(Target::Fn),
270+
Allow(Target::Static),
271+
]);
272+
const TEMPLATE: AttributeTemplate = template!(NameValueStr: "test_path");
273+
274+
fn convert(cx: &mut AcceptContext<'_, '_, S>, args: &ArgParser) -> Option<AttributeKind> {
275+
let Some(name_value) = args.name_value() else {
276+
cx.expected_name_value(cx.attr_span, Some(sym::rustc_test_marker));
277+
return None;
278+
};
279+
280+
let Some(value_str) = name_value.value_as_str() else {
281+
cx.expected_string_literal(name_value.value_span, None);
282+
return None;
283+
};
284+
285+
if value_str.as_str().trim().is_empty() {
286+
cx.expected_non_empty_string_literal(name_value.value_span);
287+
return None;
288+
}
289+
290+
Some(AttributeKind::RustcTestMarker(value_str))
291+
}
292+
}

compiler/rustc_attr_parsing/src/context.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -215,6 +215,7 @@ attribute_parsers!(
215215
Single<RustcScalableVectorParser>,
216216
Single<RustcSimdMonomorphizeLaneLimitParser>,
217217
Single<RustcSymbolName>,
218+
Single<RustcTestMarkerParser>,
218219
Single<SanitizeParser>,
219220
Single<ShouldPanicParser>,
220221
Single<SkipDuringMethodDispatchParser>,

compiler/rustc_hir/src/attrs/data_structures.rs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1326,6 +1326,9 @@ pub enum AttributeKind {
13261326
/// Represents `#[rustc_symbol_name]`
13271327
RustcSymbolName(Span),
13281328

1329+
/// Represents `#[rustc_test_marker]`
1330+
RustcTestMarker(Symbol),
1331+
13291332
/// Represents `#[rustc_then_this_would_need]`
13301333
RustcThenThisWouldNeed(Span, ThinVec<Ident>),
13311334

compiler/rustc_hir/src/attrs/encode_cross_crate.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -167,6 +167,7 @@ impl AttributeKind {
167167
RustcStdInternalSymbol(..) => No,
168168
RustcStrictCoherence(..) => Yes,
169169
RustcSymbolName(..) => Yes,
170+
RustcTestMarker(..) => No,
170171
RustcThenThisWouldNeed(..) => No,
171172
RustcTrivialFieldReads => Yes,
172173
RustcUnsafeSpecializationMarker(..) => No,

compiler/rustc_passes/src/check_attr.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -358,6 +358,7 @@ impl<'tcx> CheckAttrVisitor<'tcx> {
358358
| AttributeKind::RustcStdInternalSymbol (..)
359359
| AttributeKind::RustcStrictCoherence(..)
360360
| AttributeKind::RustcSymbolName(..)
361+
| AttributeKind::RustcTestMarker(..)
361362
| AttributeKind::RustcThenThisWouldNeed(..)
362363
| AttributeKind::RustcTrivialFieldReads
363364
| AttributeKind::RustcUnsafeSpecializationMarker(..)
@@ -404,7 +405,6 @@ impl<'tcx> CheckAttrVisitor<'tcx> {
404405
| sym::rustc_on_unimplemented
405406
| sym::rustc_do_not_const_check
406407
| sym::rustc_doc_primitive
407-
| sym::rustc_test_marker
408408
| sym::rustc_layout
409409
| sym::rustc_proc_macro_decls
410410
| sym::rustc_autodiff

0 commit comments

Comments
 (0)