Skip to content

Commit cb91235

Browse files
committed
Rename LayoutCalculator::delay_bug as LayoutCalculator::delayed_bug.
To match with the previous commits.
1 parent c9008c6 commit cb91235

File tree

3 files changed

+5
-5
lines changed

3 files changed

+5
-5
lines changed

compiler/rustc_abi/src/layout.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ use crate::{
1414
pub trait LayoutCalculator {
1515
type TargetDataLayoutRef: Borrow<TargetDataLayout>;
1616

17-
fn delay_bug(&self, txt: String);
17+
fn delayed_bug(&self, txt: String);
1818
fn current_data_layout(&self) -> Self::TargetDataLayoutRef;
1919

2020
fn scalar_pair<FieldIdx: Idx, VariantIdx: Idx>(
@@ -792,7 +792,7 @@ pub trait LayoutCalculator {
792792
let only_variant = &variants[VariantIdx::new(0)];
793793
for field in only_variant {
794794
if field.is_unsized() {
795-
self.delay_bug("unsized field in union".to_string());
795+
self.delayed_bug("unsized field in union".to_string());
796796
}
797797

798798
align = align.max(field.align);
@@ -1038,7 +1038,7 @@ fn univariant<
10381038
for &i in &inverse_memory_index {
10391039
let field = &fields[i];
10401040
if !sized {
1041-
this.delay_bug(format!(
1041+
this.delayed_bug(format!(
10421042
"univariant: field #{} comes after unsized field",
10431043
offsets.len(),
10441044
));

compiler/rustc_middle/src/ty/layout.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -282,7 +282,7 @@ pub struct LayoutCx<'tcx, C> {
282282
impl<'tcx> LayoutCalculator for LayoutCx<'tcx, TyCtxt<'tcx>> {
283283
type TargetDataLayoutRef = &'tcx TargetDataLayout;
284284

285-
fn delay_bug(&self, txt: String) {
285+
fn delayed_bug(&self, txt: String) {
286286
self.tcx.sess.span_delayed_bug(DUMMY_SP, txt);
287287
}
288288

src/tools/rust-analyzer/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)