From 45eb938b096e9d506d835d870b5ced78137b6681 Mon Sep 17 00:00:00 2001 From: bjorn3 <17426603+bjorn3@users.noreply.github.com> Date: Sun, 9 Apr 2023 15:12:19 +0000 Subject: [PATCH] Rustup to rustc 1.70.0-nightly (af06dce64 2023-04-08) --- build_sysroot/Cargo.lock | 4 ++-- example/mini_core.rs | 9 +++++++++ rust-toolchain | 2 +- 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/build_sysroot/Cargo.lock b/build_sysroot/Cargo.lock index d06a3ca4cf4..d14d8e3734f 100644 --- a/build_sysroot/Cargo.lock +++ b/build_sysroot/Cargo.lock @@ -128,9 +128,9 @@ dependencies = [ [[package]] name = "libc" -version = "0.2.140" +version = "0.2.141" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "99227334921fae1a979cf0bfdfcc6b3e5ce376ef57e16fb6fb3ea2ed6095f80c" +checksum = "3304a64d199bb964be99741b7a14d26972741915b3649639149b2479bb46f4b5" dependencies = [ "rustc-std-workspace-core", ] diff --git a/example/mini_core.rs b/example/mini_core.rs index 5792ccd7cea..6ab226b4691 100644 --- a/example/mini_core.rs +++ b/example/mini_core.rs @@ -480,6 +480,15 @@ fn panic_bounds_check(index: usize, len: usize) -> ! { } } +#[lang = "panic_cannot_unwind"] +#[track_caller] +fn panic_cannot_unwind() -> ! { + unsafe { + libc::puts("panic in a function that cannot unwind\n\0" as *const str as *const i8); + intrinsics::abort(); + } +} + #[lang = "eh_personality"] fn eh_personality() -> ! { loop {} diff --git a/rust-toolchain b/rust-toolchain index 1655cbbd6de..82371ddf3ba 100644 --- a/rust-toolchain +++ b/rust-toolchain @@ -1,3 +1,3 @@ [toolchain] -channel = "nightly-2023-03-30" +channel = "nightly-2023-04-09" components = ["rust-src", "rustc-dev", "llvm-tools-preview"]