From 35ddd410ccc4a29053e5de419a50598cefbd04fe Mon Sep 17 00:00:00 2001 From: Qinheping Hu Date: Mon, 16 Sep 2024 20:47:56 -0500 Subject: [PATCH 1/3] Upgrade toolchain to 2024-09-09 --- .../rustc-coroutine-tests/niche-in-generator-size.rs | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/tests/kani/Coroutines/rustc-coroutine-tests/niche-in-generator-size.rs b/tests/kani/Coroutines/rustc-coroutine-tests/niche-in-generator-size.rs index 68b0a8589d3c..fc7cc937aa28 100644 --- a/tests/kani/Coroutines/rustc-coroutine-tests/niche-in-generator-size.rs +++ b/tests/kani/Coroutines/rustc-coroutine-tests/niche-in-generator-size.rs @@ -26,6 +26,7 @@ fn main() { take(x); }; - // FIXME: size of coroutines does not work reliably (https://github.com/model-checking/kani/issues/1395) - assert_eq!(size_of_val(&gen1), size_of_val(&Some(gen1))); + // FIXME(https://github.com/rust-lang/rust/issues/63818#issuecomment-2264915918): + // niches in coroutines are disabled. Should be `assert_eq`. + assert_ne!(size_of_val(&gen1), size_of_val(&Some(gen1))); } From 485eb2dbeaab421c0291f524c74455c3e5829436 Mon Sep 17 00:00:00 2001 From: Qinheping Hu Date: Mon, 16 Sep 2024 20:48:11 -0500 Subject: [PATCH 2/3] Upgrade toolchain to 2024-09-09 --- rust-toolchain.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rust-toolchain.toml b/rust-toolchain.toml index a3febf5ae7db..9932620638ce 100644 --- a/rust-toolchain.toml +++ b/rust-toolchain.toml @@ -2,5 +2,5 @@ # SPDX-License-Identifier: Apache-2.0 OR MIT [toolchain] -channel = "nightly-2024-09-08" +channel = "nightly-2024-09-09" components = ["llvm-tools", "rustc-dev", "rust-src", "rustfmt"] From 819d9c14f6963ef4e7b5c2a980fece6af4e82c6a Mon Sep 17 00:00:00 2001 From: Qinheping Hu Date: Mon, 16 Sep 2024 21:41:13 -0500 Subject: [PATCH 3/3] Fix format --- .../Coroutines/rustc-coroutine-tests/niche-in-generator-size.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/kani/Coroutines/rustc-coroutine-tests/niche-in-generator-size.rs b/tests/kani/Coroutines/rustc-coroutine-tests/niche-in-generator-size.rs index fc7cc937aa28..71a3eb9553c0 100644 --- a/tests/kani/Coroutines/rustc-coroutine-tests/niche-in-generator-size.rs +++ b/tests/kani/Coroutines/rustc-coroutine-tests/niche-in-generator-size.rs @@ -26,7 +26,7 @@ fn main() { take(x); }; - // FIXME(https://github.com/rust-lang/rust/issues/63818#issuecomment-2264915918): + // FIXME(https://github.com/rust-lang/rust/issues/63818#issuecomment-2264915918): // niches in coroutines are disabled. Should be `assert_eq`. assert_ne!(size_of_val(&gen1), size_of_val(&Some(gen1))); }