Skip to content

Commit c58e0bd

Browse files
committed
rename emit_unless to emit_unless_delay
Signed-off-by: xizheyin <xizheyin@smail.nju.edu.cn>
1 parent 8231065 commit c58e0bd

File tree

7 files changed

+15
-15
lines changed

7 files changed

+15
-15
lines changed

compiler/rustc_errors/src/diagnostic.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1421,7 +1421,7 @@ impl<'a, G: EmissionGuarantee> Diag<'a, G> {
14211421
///
14221422
/// See `emit` and `delay_as_bug` for details.
14231423
#[track_caller]
1424-
pub fn emit_unless(mut self, delay: bool) -> G::EmitResult {
1424+
pub fn emit_unless_delay(mut self, delay: bool) -> G::EmitResult {
14251425
if delay {
14261426
self.downgrade_to_delayed_bug();
14271427
}

compiler/rustc_hir_analysis/src/check/compare_impl_item.rs

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1173,7 +1173,7 @@ fn check_region_bounds_on_impl_item<'tcx>(
11731173
bounds_span,
11741174
where_span,
11751175
})
1176-
.emit_unless(delay);
1176+
.emit_unless_delay(delay);
11771177

11781178
Err(reported)
11791179
}
@@ -1481,7 +1481,7 @@ fn compare_self_type<'tcx>(
14811481
} else {
14821482
err.note_trait_signature(trait_m.name(), trait_m.signature(tcx));
14831483
}
1484-
return Err(err.emit_unless(delay));
1484+
return Err(err.emit_unless_delay(delay));
14851485
}
14861486

14871487
(true, false) => {
@@ -1502,7 +1502,7 @@ fn compare_self_type<'tcx>(
15021502
err.note_trait_signature(trait_m.name(), trait_m.signature(tcx));
15031503
}
15041504

1505-
return Err(err.emit_unless(delay));
1505+
return Err(err.emit_unless_delay(delay));
15061506
}
15071507
}
15081508

@@ -1662,7 +1662,7 @@ fn compare_number_of_generics<'tcx>(
16621662
err.span_label(*span, "`impl Trait` introduces an implicit type parameter");
16631663
}
16641664

1665-
let reported = err.emit_unless(delay);
1665+
let reported = err.emit_unless_delay(delay);
16661666
err_occurred = Some(reported);
16671667
}
16681668
}
@@ -1745,7 +1745,7 @@ fn compare_number_of_method_arguments<'tcx>(
17451745
),
17461746
);
17471747

1748-
return Err(err.emit_unless(delay));
1748+
return Err(err.emit_unless_delay(delay));
17491749
}
17501750

17511751
Ok(())
@@ -1872,7 +1872,7 @@ fn compare_synthetic_generics<'tcx>(
18721872
);
18731873
};
18741874
}
1875-
error_found = Some(err.emit_unless(delay));
1875+
error_found = Some(err.emit_unless_delay(delay));
18761876
}
18771877
}
18781878
if let Some(reported) = error_found { Err(reported) } else { Ok(()) }
@@ -1974,7 +1974,7 @@ fn compare_generic_param_kinds<'tcx>(
19741974
err.span_label(impl_header_span, "");
19751975
err.span_label(param_impl_span, make_param_message("found", param_impl));
19761976

1977-
let reported = err.emit_unless(delay);
1977+
let reported = err.emit_unless_delay(delay);
19781978
return Err(reported);
19791979
}
19801980
}

compiler/rustc_hir_analysis/src/collect/resolve_bound_vars.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2495,7 +2495,7 @@ fn deny_non_region_late_bound(
24952495
format!("late-bound {what} parameter not allowed on {where_}"),
24962496
);
24972497

2498-
let guar = diag.emit_unless(!tcx.features().non_lifetime_binders() || !first);
2498+
let guar = diag.emit_unless_delay(!tcx.features().non_lifetime_binders() || !first);
24992499

25002500
first = false;
25012501
*arg = ResolvedArg::Error(guar);

compiler/rustc_hir_analysis/src/hir_ty_lowering/generics.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -570,7 +570,7 @@ pub(crate) fn check_generic_arg_count(
570570
gen_args,
571571
def_id,
572572
))
573-
.emit_unless(all_params_are_binded)
573+
.emit_unless_delay(all_params_are_binded)
574574
});
575575

576576
Err(reported)

compiler/rustc_hir_typeck/src/coercion.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1775,7 +1775,7 @@ impl<'tcx, 'exprs, E: AsCoercionSite> CoerceMany<'tcx, 'exprs, E> {
17751775
);
17761776
}
17771777

1778-
let reported = err.emit_unless(unsized_return);
1778+
let reported = err.emit_unless_delay(unsized_return);
17791779

17801780
self.final_ty = Some(Ty::new_error(fcx.tcx, reported));
17811781
}

compiler/rustc_hir_typeck/src/expr.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1549,7 +1549,7 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
15491549

15501550
// If the assignment expression itself is ill-formed, don't
15511551
// bother emitting another error
1552-
err.emit_unless(lhs_ty.references_error() || rhs_ty.references_error())
1552+
err.emit_unless_delay(lhs_ty.references_error() || rhs_ty.references_error())
15531553
}
15541554

15551555
pub(super) fn check_expr_let(
@@ -3865,7 +3865,7 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
38653865
self.dcx()
38663866
.create_err(NoVariantNamed { span: ident.span, ident, ty: container })
38673867
.with_span_label(field.span, "variant not found")
3868-
.emit_unless(container.references_error());
3868+
.emit_unless_delay(container.references_error());
38693869
break;
38703870
};
38713871
let Some(&subfield) = fields.next() else {
@@ -3897,7 +3897,7 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
38973897
enum_span: field.span,
38983898
field_span: subident.span,
38993899
})
3900-
.emit_unless(container.references_error());
3900+
.emit_unless_delay(container.references_error());
39013901
break;
39023902
};
39033903

compiler/rustc_resolve/src/late.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2913,7 +2913,7 @@ impl<'a, 'ast, 'ra, 'tcx> LateResolutionVisitor<'a, 'ast, 'ra, 'tcx> {
29132913
self.r
29142914
.dcx()
29152915
.create_err(errors::UnderscoreLifetimeIsReserved { span: param.ident.span })
2916-
.emit_unless(is_raw_underscore_lifetime);
2916+
.emit_unless_delay(is_raw_underscore_lifetime);
29172917
// Record lifetime res, so lowering knows there is something fishy.
29182918
self.record_lifetime_param(param.id, LifetimeRes::Error);
29192919
continue;

0 commit comments

Comments
 (0)