From ca1b2ceb6578bcf872afad47948da6234a425627 Mon Sep 17 00:00:00 2001 From: Remi Delmas Date: Tue, 19 Sep 2023 17:50:42 +0000 Subject: [PATCH 1/2] Update toolchain to nightly-2023-09-19 Propagate changes from https://github.com/rust-lang/rust/pull/115748. --- kani-compiler/src/kani_middle/reachability.rs | 4 ++-- rust-toolchain.toml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/kani-compiler/src/kani_middle/reachability.rs b/kani-compiler/src/kani_middle/reachability.rs index 42afeefb81df..609d10798de6 100644 --- a/kani-compiler/src/kani_middle/reachability.rs +++ b/kani-compiler/src/kani_middle/reachability.rs @@ -457,8 +457,8 @@ impl<'a, 'tcx> MirVisitor<'tcx> for MonoItemsFnCollector<'a, 'tcx> { match self.tcx.const_eval_resolve(ParamEnv::reveal_all(), un_eval, None) { // The `monomorphize` call should have evaluated that constant already. Ok(const_val) => const_val, - Err(ErrorHandled::TooGeneric) => span_bug!( - self.body.source_info(location).span, + Err(ErrorHandled::TooGeneric(span)) => span_bug!( + span, "Unexpected polymorphic constant: {:?}", literal ), diff --git a/rust-toolchain.toml b/rust-toolchain.toml index 203b89770831..b89dd2f6a55e 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-09-18" +channel = "nightly-2023-09-19" components = ["llvm-tools-preview", "rustc-dev", "rust-src", "rustfmt"] From b726c45ba4ca43c5c4a5aca0b252ebddd575d6c5 Mon Sep 17 00:00:00 2001 From: Remi Delmas Date: Tue, 19 Sep 2023 19:38:33 +0000 Subject: [PATCH 2/2] format fix --- kani-compiler/src/kani_middle/reachability.rs | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/kani-compiler/src/kani_middle/reachability.rs b/kani-compiler/src/kani_middle/reachability.rs index 609d10798de6..5ac0344c9fbd 100644 --- a/kani-compiler/src/kani_middle/reachability.rs +++ b/kani-compiler/src/kani_middle/reachability.rs @@ -457,11 +457,9 @@ impl<'a, 'tcx> MirVisitor<'tcx> for MonoItemsFnCollector<'a, 'tcx> { match self.tcx.const_eval_resolve(ParamEnv::reveal_all(), un_eval, None) { // The `monomorphize` call should have evaluated that constant already. Ok(const_val) => const_val, - Err(ErrorHandled::TooGeneric(span)) => span_bug!( - span, - "Unexpected polymorphic constant: {:?}", - literal - ), + Err(ErrorHandled::TooGeneric(span)) => { + span_bug!(span, "Unexpected polymorphic constant: {:?}", literal) + } Err(error) => { warn!(?error, "Error already reported"); return;