From acca86dd2a20b19901f836a9618888b707717270 Mon Sep 17 00:00:00 2001 From: "Celina G. Val" Date: Tue, 17 Oct 2023 01:58:44 -0700 Subject: [PATCH] Upgrade toolchain and fix test (#2822) Update rust toolchain to 2023-10-16 and update failing test. The coverage test was failing because the logic was being pruned by rustup. Resolves #2817 --- rust-toolchain.toml | 2 +- tests/coverage/unreachable/contradiction/expected | 9 +++++---- tests/coverage/unreachable/contradiction/main.rs | 3 ++- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/rust-toolchain.toml b/rust-toolchain.toml index e2a63b2268f3..bd441b412f6e 100644 --- a/rust-toolchain.toml +++ b/rust-toolchain.toml @@ -2,5 +2,5 @@ # SPDX-License-Identifier: Apache-2.0 OR MIT [toolchain] -channel = "nightly-2023-10-10" +channel = "nightly-2023-10-16" components = ["llvm-tools-preview", "rustc-dev", "rust-src", "rustfmt"] diff --git a/tests/coverage/unreachable/contradiction/expected b/tests/coverage/unreachable/contradiction/expected index ca67a4938193..4234fc328e1e 100644 --- a/tests/coverage/unreachable/contradiction/expected +++ b/tests/coverage/unreachable/contradiction/expected @@ -1,6 +1,7 @@ coverage/unreachable/contradiction/main.rs, 5, FULL coverage/unreachable/contradiction/main.rs, 6, FULL -coverage/unreachable/contradiction/main.rs, 7, PARTIAL -coverage/unreachable/contradiction/main.rs, 8, NONE -coverage/unreachable/contradiction/main.rs, 11, FULL -coverage/unreachable/contradiction/main.rs, 13, FULL +coverage/unreachable/contradiction/main.rs, 7, FULL +coverage/unreachable/contradiction/main.rs, 8, PARTIAL +coverage/unreachable/contradiction/main.rs, 9, NONE +coverage/unreachable/contradiction/main.rs, 12, FULL +coverage/unreachable/contradiction/main.rs, 14, FULL diff --git a/tests/coverage/unreachable/contradiction/main.rs b/tests/coverage/unreachable/contradiction/main.rs index fe79107e8962..351df6fab49d 100644 --- a/tests/coverage/unreachable/contradiction/main.rs +++ b/tests/coverage/unreachable/contradiction/main.rs @@ -3,9 +3,10 @@ #[kani::proof] fn contradiction() { let x: u8 = kani::any(); + let mut y: u8 = 0; if x > 5 { if x < 2 { - let y = x; + y = x; } } else { assert!(x < 10);