Skip to content

Commit 26cf026

Browse files
committed
Auto merge of #120980 - matthiaskrgr:rollup-dsjsqql, r=matthiaskrgr
Rollup of 11 pull requests Successful merges: - #120765 (Reorder diagnostics API) - #120833 (More internal emit diagnostics cleanups) - #120899 (Gracefully handle non-WF alias in `assemble_alias_bound_candidates_recur`) - #120917 (Remove a bunch of dead parameters in functions) - #120928 (Add test for recently fixed issue) - #120933 (check_consts: fix duplicate errors, make importance consistent) - #120936 (improve `btree_cursors` functions documentation) - #120944 (Check that the ABI of the instance we are inlining is correct) - #120956 (Clean inlined type alias with correct param-env) - #120962 (Add myself to library/std review) - #120972 (fix ICE for deref coercions with type errors) r? `@ghost` `@rustbot` modify labels: rollup
2 parents 97b4401 + 80d3eef commit 26cf026

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

crates/hir-def/src/attr/builtin.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -650,7 +650,7 @@ pub const INERT_ATTRIBUTES: &[BuiltinAttribute] = &[
650650
rustc_attr!(TEST, rustc_regions, Normal, template!(Word), WarnFollowing),
651651
rustc_attr!(
652652
TEST, rustc_error, Normal,
653-
template!(Word, List: "span_delayed_bug_from_inside_query"), WarnFollowingWordOnly
653+
template!(Word, List: "delayed_bug_from_inside_query"), WarnFollowingWordOnly
654654
),
655655
rustc_attr!(TEST, rustc_dump_user_args, Normal, template!(Word), WarnFollowing),
656656
rustc_attr!(TEST, rustc_evaluate_where_clauses, Normal, template!(Word), WarnFollowing),

0 commit comments

Comments
 (0)