Skip to content

Commit baab5d4

Browse files
committed
[REBASEME] rustc_target: rename Arch::{Uknown,Other}
1 parent b0098fc commit baab5d4

File tree

5 files changed

+8
-8
lines changed

5 files changed

+8
-8
lines changed

compiler/rustc_target/src/asm/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -273,7 +273,7 @@ impl InlineAsmArch {
273273
Arch::Msp430 => Some(Self::Msp430),
274274
Arch::M68k => Some(Self::M68k),
275275
Arch::CSky => Some(Self::CSKY),
276-
Arch::AmdGpu | Arch::Xtensa | Arch::Unknown(_) => None,
276+
Arch::AmdGpu | Arch::Xtensa | Arch::Other(_) => None,
277277
}
278278
}
279279
}

compiler/rustc_target/src/callconv/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -701,7 +701,7 @@ impl<'a, Ty> FnAbi<'a, Ty> {
701701
Arch::RiscV32 | Arch::RiscV64 => riscv::compute_abi_info(cx, self),
702702
Arch::Wasm32 | Arch::Wasm64 => wasm::compute_abi_info(cx, self),
703703
Arch::Bpf => bpf::compute_abi_info(cx, self),
704-
arch @ (Arch::PowerPC64LE | Arch::SpirV | Arch::Unknown(_)) => {
704+
arch @ (Arch::PowerPC64LE | Arch::SpirV | Arch::Other(_)) => {
705705
panic!("no lowering implemented for {arch}")
706706
}
707707
}

compiler/rustc_target/src/spec/mod.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1881,7 +1881,7 @@ crate::target_spec_enum! {
18811881
X86_64 = "x86_64",
18821882
Xtensa = "xtensa",
18831883
}
1884-
other_variant = Unknown;
1884+
other_variant = Other;
18851885
}
18861886

18871887
impl Arch {
@@ -1918,7 +1918,7 @@ impl Arch {
19181918
Self::X86 => sym::x86,
19191919
Self::X86_64 => sym::x86_64,
19201920
Self::Xtensa => sym::xtensa,
1921-
Self::Unknown(name) => rustc_span::Symbol::intern(name),
1921+
Self::Other(name) => rustc_span::Symbol::intern(name),
19221922
}
19231923
}
19241924
}
@@ -3445,7 +3445,7 @@ impl Target {
34453445
| Arch::SpirV
34463446
| Arch::Wasm32
34473447
| Arch::Wasm64
3448-
| Arch::Unknown(_) => return None,
3448+
| Arch::Other(_) => return None,
34493449
})
34503450
}
34513451

compiler/rustc_target/src/target_features.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -977,7 +977,7 @@ impl Target {
977977
| Arch::PowerPC64LE
978978
| Arch::SpirV
979979
| Arch::Xtensa
980-
| Arch::Unknown(_) => &[],
980+
| Arch::Other(_) => &[],
981981
}
982982
}
983983

@@ -1006,7 +1006,7 @@ impl Target {
10061006
| Arch::PowerPC64LE
10071007
| Arch::SpirV
10081008
| Arch::Xtensa
1009-
| Arch::Unknown(_) => &[],
1009+
| Arch::Other(_) => &[],
10101010
}
10111011
}
10121012

src/tools/miri/src/shims/alloc.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ pub trait EvalContextExt<'tcx>: crate::MiriInterpCxExt<'tcx> {
5454
| Arch::Nvptx64
5555
| Arch::PowerPC64LE
5656
| Arch::SpirV
57-
| Arch::Unknown(_)) => bug!("unsupported target architecture for malloc: `{arch}`"),
57+
| Arch::Other(_)) => bug!("unsupported target architecture for malloc: `{arch}`"),
5858
};
5959
// The C standard only requires sufficient alignment for any *type* with size less than or
6060
// equal to the size requested. Types one can define in standard C seem to never have an alignment

0 commit comments

Comments
 (0)