Skip to content

Commit 820817f

Browse files
committed
Auto merge of #118470 - nnethercote:cleanup-error-handlers, r=compiler-errors
Cleanup error handlers Mostly by making function naming more consistent. More to do after this, but this is enough for one PR. r? compiler-errors
2 parents 5146033 + 68af1ce commit 820817f

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -629,7 +629,7 @@ pub const INERT_ATTRIBUTES: &[BuiltinAttribute] = &[
629629
rustc_attr!(TEST, rustc_regions, Normal, template!(Word), WarnFollowing),
630630
rustc_attr!(
631631
TEST, rustc_error, Normal,
632-
template!(Word, List: "delay_span_bug_from_inside_query"), WarnFollowingWordOnly
632+
template!(Word, List: "span_delayed_bug_from_inside_query"), WarnFollowingWordOnly
633633
),
634634
rustc_attr!(TEST, rustc_dump_user_substs, Normal, template!(Word), WarnFollowing),
635635
rustc_attr!(TEST, rustc_evaluate_where_clauses, Normal, template!(Word), WarnFollowing),

crates/hir-ty/src/layout.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ struct LayoutCx<'a> {
110110
impl<'a> LayoutCalculator for LayoutCx<'a> {
111111
type TargetDataLayoutRef = &'a TargetDataLayout;
112112

113-
fn delay_bug(&self, txt: String) {
113+
fn delayed_bug(&self, txt: String) {
114114
never!("{}", txt);
115115
}
116116

0 commit comments

Comments
 (0)