Skip to content

Rollup of 9 pull requests #141133

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
bors merged 30 commits into from
May 17, 2025
Merged

Rollup of 9 pull requests #141133

Changes from 1 commit
Commits
Show all changes
30 commits
Select commit Hold shift + click to select a range
701b194
impl Display for Conv
tiif Jan 21, 2025
17c6eae
Add test and change ub message wording
tiif Feb 3, 2025
43c51e9
Remove unnecessary assert
tiif Feb 3, 2025
d463c5d
Implement Display by mapping Conv to ExternAbi
tiif Mar 11, 2025
3079213
Remove test
tiif Mar 11, 2025
c8197b7
fmt
tiif Mar 11, 2025
71c4b24
Remove invalid Conv
tiif Mar 11, 2025
650c8a2
bless test
tiif Mar 12, 2025
e74fe7a
Bless more test
tiif Mar 12, 2025
f96fb61
checktools.sh: fix bashism
RalfJung May 11, 2025
41a2260
Use unreachable instead of panic
tiif May 12, 2025
55ad9cd
silence unexpected lld warning on old gccs
lqd May 15, 2025
b7f2cd3
deduplicate abort implementations
joboet Mar 29, 2025
6647cbb
improve internal fastfail explainer
joboet Apr 21, 2025
f77c160
normalize abort calls in miri tests
joboet May 15, 2025
7d9f437
Add as_ascii_unchecked() methods to char, str, and u8
Feb 22, 2025
101e24a
Add assert_unsafe_precondition!()s to as_ascii_unchecked() methods
May 13, 2025
1c9f20f
Enable rust-analyzer to go from query definition to the corresponding…
Veykril May 17, 2025
9578b59
Only select true errors in impossible_predicates
compiler-errors May 17, 2025
667504b
check coroutines with TypingMode::Borrowck to avoid cyclic reasoning
lcnr May 17, 2025
a4765c9
Make some `match`es slightly more ergonomic in `librustdoc`
yotamofek May 17, 2025
836db3c
Rollup merge of #135808 - tiif:conv_display, r=workingjubilee
matthiaskrgr May 17, 2025
eb01ba0
Rollup merge of #137432 - djscythe:char_u8_str_as_ascii_unchecked, r=…
matthiaskrgr May 17, 2025
b9839ab
Rollup merge of #139103 - joboet:abort_dedup, r=tgross35
matthiaskrgr May 17, 2025
f0b1150
Rollup merge of #140917 - RalfJung:checktools, r=WaffleLapkin
matthiaskrgr May 17, 2025
73ea8d7
Rollup merge of #141035 - lqd:lld-warn, r=Mark-Simulacrum
matthiaskrgr May 17, 2025
57a400d
Rollup merge of #141118 - Veykril:lw-ymmtxytkrrqs, r=compiler-errors
matthiaskrgr May 17, 2025
616650b
Rollup merge of #141121 - compiler-errors:ambig-is-not-err, r=lcnr
matthiaskrgr May 17, 2025
9090987
Rollup merge of #141125 - lcnr:coroutine_obligations_use_borrowck, r=…
matthiaskrgr May 17, 2025
339a46c
Rollup merge of #141131 - yotamofek:pr/rustdoc/match-ergo, r=fmease
matthiaskrgr May 17, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Remove invalid Conv
  • Loading branch information
@tiif
tiif committed Mar 12, 2025
commit 71c4b2492de8a34a81f362ef9769b1608b8310e4
17 changes: 8 additions & 9 deletions compiler/rustc_target/src/callconv/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -900,22 +900,21 @@ impl FromStr for Conv {

fn conv_to_externabi(conv: &Conv) -> ExternAbi {
match conv {
Conv::C => ExternAbi::C { unwind: false },
Conv::Rust => ExternAbi::Rust,
Conv::PreserveMost => ExternAbi::RustCold,
Conv::X86Stdcall => ExternAbi::Stdcall { unwind: false },
Conv::X86Fastcall => ExternAbi::Fastcall { unwind: false },
Conv::X86VectorCall => ExternAbi::Vectorcall { unwind: false },
Conv::X86ThisCall => ExternAbi::Thiscall { unwind: false },
Conv::C => ExternAbi::C { unwind: false },
Conv::X86_64Win64 => ExternAbi::Win64 { unwind: false },
Conv::X86_64SysV => ExternAbi::SysV64 { unwind: false },
Conv::ArmAapcs => ExternAbi::Aapcs { unwind: false },
Conv::CCmseNonSecureCall => ExternAbi::CCmseNonSecureCall,
Conv::CCmseNonSecureEntry => ExternAbi::CCmseNonSecureEntry,
Conv::PtxKernel => ExternAbi::PtxKernel,
Conv::Msp430Intr => ExternAbi::Msp430Interrupt,
Conv::X86Intr => ExternAbi::X86Interrupt,
Conv::GpuKernel => ExternAbi::GpuKernel,
Conv::X86Fastcall => ExternAbi::Fastcall { unwind: false },
Conv::X86Intr => ExternAbi::X86Interrupt,
Conv::X86Stdcall => ExternAbi::Stdcall { unwind: false },
Conv::X86ThisCall => ExternAbi::Thiscall { unwind: false },
Conv::X86VectorCall => ExternAbi::Vectorcall { unwind: false },
Conv::X86_64SysV => ExternAbi::SysV64 { unwind: false },
Conv::X86_64Win64 => ExternAbi::Win64 { unwind: false },
Conv::AvrInterrupt => ExternAbi::AvrInterrupt,
Conv::AvrNonBlockingInterrupt => ExternAbi::AvrNonBlockingInterrupt,
Conv::RiscvInterrupt { kind: RiscvInterruptKind::Machine } => ExternAbi::RiscvInterruptM,
Expand Down