Skip to content

Commit 0d48308

Browse files
committed
Auto merge of #139154 - jhpratt:rollup-rv8f915, r=jhpratt
Rollup of 5 pull requests Successful merges: - #139044 (bootstrap: Avoid cloning `change-id` list) - #139111 (Properly document FakeReads) - #139122 (Remove attribute `#[rustc_error]`) - #139132 (Improve hir_pretty for struct expressions.) - #139141 (Switch some rustc_on_unimplemented uses to diagnostic::on_unimplemented) r? `@ghost` `@rustbot` modify labels: rollup
2 parents 1081b64 + 5c9f1b9 commit 0d48308

File tree

1 file changed

+0
-4
lines changed

1 file changed

+0
-4
lines changed

crates/hir-expand/src/inert_attr_macro.rs

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -665,10 +665,6 @@ pub const INERT_ATTRIBUTES: &[BuiltinAttribute] = &[
665665
rustc_attr!(TEST, rustc_layout, Normal, template!(List: "field1, field2, ..."), WarnFollowing),
666666
rustc_attr!(TEST, rustc_abi, Normal, template!(List: "field1, field2, ..."), WarnFollowing),
667667
rustc_attr!(TEST, rustc_regions, Normal, template!(Word), WarnFollowing),
668-
rustc_attr!(
669-
TEST, rustc_error, Normal,
670-
template!(Word, List: "delayed_bug_from_inside_query"), WarnFollowingWordOnly
671-
),
672668
rustc_attr!(TEST, rustc_dump_user_args, Normal, template!(Word), WarnFollowing),
673669
rustc_attr!(TEST, rustc_evaluate_where_clauses, Normal, template!(Word), WarnFollowing),
674670
rustc_attr!(

0 commit comments

Comments
 (0)