From ac46d986b74f1f0a431b5a087fab9b6fd376fb2a Mon Sep 17 00:00:00 2001 From: Michael Tautschnig Date: Fri, 5 Apr 2024 16:11:57 +0200 Subject: [PATCH 1/2] Bump Kani version to 0.49.0 (#3126) Updated version in all `Cargo.toml` files (via `find . -name Cargo.toml -exec sed -i 's/version = "0.48.0"/version = "0.49.0"/' {} \;`) and ran `cargo build-dev` to have `Cargo.lock` files updated. GitHub generated release notes: ## What's Changed * Upgrade Rust toolchain to 2024-03-14 by @zhassan-aws in https://github.com/model-checking/kani/pull/3081 * Disable removal of storage markers by @zhassan-aws in https://github.com/model-checking/kani/pull/3083 * Automatic cargo update to 2024-03-18 by @github-actions in https://github.com/model-checking/kani/pull/3086 * Bump tests/perf/s2n-quic from `1a7faa8` to `9e39ca0` by @dependabot in https://github.com/model-checking/kani/pull/3087 * Upgrade toolchain to nightly-2024-03-15 by @celinval in https://github.com/model-checking/kani/pull/3084 * Add optional scatterplot to benchcomp output by @tautschnig in https://github.com/model-checking/kani/pull/3077 * Benchcomp scatterplots: quote axis labels by @tautschnig in https://github.com/model-checking/kani/pull/3097 * Expand ${var} in benchcomp variant `env` by @karkhaz in https://github.com/model-checking/kani/pull/3090 * Add test for #3099 by @zhassan-aws in https://github.com/model-checking/kani/pull/3100 * Automatic cargo update to 2024-03-25 by @github-actions in https://github.com/model-checking/kani/pull/3103 * Bump tests/perf/s2n-quic from `1a7faa8` to `0a60ec1` by @dependabot in https://github.com/model-checking/kani/pull/3104 * Implement validity checks by @celinval in https://github.com/model-checking/kani/pull/3085 * Add `benchcomp filter` command by @karkhaz in https://github.com/model-checking/kani/pull/3105 * Add CI test for --use-local-toolchain by @jaisnan in https://github.com/model-checking/kani/pull/3074 * Upgrade Rust toolchain to `nightly-2024-03-21` by @adpaco-aws in https://github.com/model-checking/kani/pull/3102 * Use `intrinsic_name` to get the intrinsic name by @adpaco-aws in https://github.com/model-checking/kani/pull/3114 * Bump tests/perf/s2n-quic from `0a60ec1` to `2d5e891` by @dependabot in https://github.com/model-checking/kani/pull/3118 * Allow modifies clause for verification only by @feliperodri in https://github.com/model-checking/kani/pull/3098 * Automatic cargo update to 2024-04-01 by @github-actions in https://github.com/model-checking/kani/pull/3117 * Automatic cargo update to 2024-04-04 by @github-actions in https://github.com/model-checking/kani/pull/3122 * Remove bookrunner by @tautschnig in https://github.com/model-checking/kani/pull/3123 * Upgrade Rust toolchain to nightly-2024-03-29 by @feliperodri in https://github.com/model-checking/kani/pull/3116 * Remove unnecessary build step for some workflows by @zhassan-aws in https://github.com/model-checking/kani/pull/3124 * Ensure storage markers are kept in std code by @zhassan-aws in https://github.com/model-checking/kani/pull/3080 **Full Changelog**: https://github.com/model-checking/kani/compare/kani-0.48.0...kani-0.49.0 --- CHANGELOG.md | 14 ++++++++++++++ Cargo.lock | 18 +++++++++--------- Cargo.toml | 2 +- cprover_bindings/Cargo.toml | 2 +- kani-compiler/Cargo.toml | 2 +- kani-driver/Cargo.toml | 2 +- kani_metadata/Cargo.toml | 2 +- library/kani/Cargo.toml | 2 +- library/kani_macros/Cargo.toml | 2 +- library/std/Cargo.toml | 2 +- tools/build-kani/Cargo.toml | 2 +- 11 files changed, 32 insertions(+), 18 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 08f687d8e31c..bd592b2f27a7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,20 @@ This file contains notable changes (e.g. breaking changes, major changes, etc.) This file was introduced starting Kani 0.23.0, so it only contains changes from version 0.23.0 onwards. +## [0.49.0] + +### What's Changed +* Disable removal of storage markers by @zhassan-aws in https://github.com/model-checking/kani/pull/3083 +* Ensure storage markers are kept in std code by @zhassan-aws in https://github.com/model-checking/kani/pull/3080 +* Implement validity checks by @celinval in https://github.com/model-checking/kani/pull/3085 +* Allow modifies clause for verification only by @feliperodri in https://github.com/model-checking/kani/pull/3098 +* Add optional scatterplot to benchcomp output by @tautschnig in https://github.com/model-checking/kani/pull/3077 +* Expand ${var} in benchcomp variant `env` by @karkhaz in https://github.com/model-checking/kani/pull/3090 +* Add `benchcomp filter` command by @karkhaz in https://github.com/model-checking/kani/pull/3105 +* Upgrade Rust toolchain to 2024-03-29 by @zhassan-aws @celinval @adpaco-aws @feliperodri + +**Full Changelog**: https://github.com/model-checking/kani/compare/kani-0.48.0...kani-0.49.0 + ## [0.48.0] ### Major Changes diff --git a/Cargo.lock b/Cargo.lock index 2a7cbf2d7028..ae2e712e1049 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -97,7 +97,7 @@ checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1" [[package]] name = "build-kani" -version = "0.48.0" +version = "0.49.0" dependencies = [ "anyhow", "cargo_metadata", @@ -233,7 +233,7 @@ dependencies = [ [[package]] name = "cprover_bindings" -version = "0.48.0" +version = "0.49.0" dependencies = [ "lazy_static", "linear-map", @@ -410,14 +410,14 @@ checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b" [[package]] name = "kani" -version = "0.48.0" +version = "0.49.0" dependencies = [ "kani_macros", ] [[package]] name = "kani-compiler" -version = "0.48.0" +version = "0.49.0" dependencies = [ "clap", "cprover_bindings", @@ -438,7 +438,7 @@ dependencies = [ [[package]] name = "kani-driver" -version = "0.48.0" +version = "0.49.0" dependencies = [ "anyhow", "cargo_metadata", @@ -466,7 +466,7 @@ dependencies = [ [[package]] name = "kani-verifier" -version = "0.48.0" +version = "0.49.0" dependencies = [ "anyhow", "home", @@ -475,7 +475,7 @@ dependencies = [ [[package]] name = "kani_macros" -version = "0.48.0" +version = "0.49.0" dependencies = [ "proc-macro-error", "proc-macro2", @@ -485,7 +485,7 @@ dependencies = [ [[package]] name = "kani_metadata" -version = "0.48.0" +version = "0.49.0" dependencies = [ "clap", "cprover_bindings", @@ -992,7 +992,7 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" [[package]] name = "std" -version = "0.48.0" +version = "0.49.0" dependencies = [ "kani", ] diff --git a/Cargo.toml b/Cargo.toml index 810b4e2bb5eb..e271a3650c03 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -3,7 +3,7 @@ [package] name = "kani-verifier" -version = "0.48.0" +version = "0.49.0" edition = "2021" description = "A bit-precise model checker for Rust." readme = "README.md" diff --git a/cprover_bindings/Cargo.toml b/cprover_bindings/Cargo.toml index b9d0259b3577..ed0e57847e71 100644 --- a/cprover_bindings/Cargo.toml +++ b/cprover_bindings/Cargo.toml @@ -3,7 +3,7 @@ [package] name = "cprover_bindings" -version = "0.48.0" +version = "0.49.0" edition = "2021" license = "MIT OR Apache-2.0" publish = false diff --git a/kani-compiler/Cargo.toml b/kani-compiler/Cargo.toml index a5b7fd006180..ffc508e90866 100644 --- a/kani-compiler/Cargo.toml +++ b/kani-compiler/Cargo.toml @@ -3,7 +3,7 @@ [package] name = "kani-compiler" -version = "0.48.0" +version = "0.49.0" edition = "2021" license = "MIT OR Apache-2.0" publish = false diff --git a/kani-driver/Cargo.toml b/kani-driver/Cargo.toml index 36a979a1366d..3a476922a838 100644 --- a/kani-driver/Cargo.toml +++ b/kani-driver/Cargo.toml @@ -3,7 +3,7 @@ [package] name = "kani-driver" -version = "0.48.0" +version = "0.49.0" edition = "2021" description = "Build a project with Kani and run all proof harnesses" license = "MIT OR Apache-2.0" diff --git a/kani_metadata/Cargo.toml b/kani_metadata/Cargo.toml index 6b6db72f4a6d..582c20c7bd9f 100644 --- a/kani_metadata/Cargo.toml +++ b/kani_metadata/Cargo.toml @@ -3,7 +3,7 @@ [package] name = "kani_metadata" -version = "0.48.0" +version = "0.49.0" edition = "2021" license = "MIT OR Apache-2.0" publish = false diff --git a/library/kani/Cargo.toml b/library/kani/Cargo.toml index 4da7f91a9ed7..b87536740fcd 100644 --- a/library/kani/Cargo.toml +++ b/library/kani/Cargo.toml @@ -3,7 +3,7 @@ [package] name = "kani" -version = "0.48.0" +version = "0.49.0" edition = "2021" license = "MIT OR Apache-2.0" publish = false diff --git a/library/kani_macros/Cargo.toml b/library/kani_macros/Cargo.toml index 84ed56a9ef12..fe4279fc4366 100644 --- a/library/kani_macros/Cargo.toml +++ b/library/kani_macros/Cargo.toml @@ -3,7 +3,7 @@ [package] name = "kani_macros" -version = "0.48.0" +version = "0.49.0" edition = "2021" license = "MIT OR Apache-2.0" publish = false diff --git a/library/std/Cargo.toml b/library/std/Cargo.toml index 29467fddf70b..05f5b4de5635 100644 --- a/library/std/Cargo.toml +++ b/library/std/Cargo.toml @@ -5,7 +5,7 @@ # Note: this package is intentionally named std to make sure the names of # standard library symbols are preserved name = "std" -version = "0.48.0" +version = "0.49.0" edition = "2021" license = "MIT OR Apache-2.0" publish = false diff --git a/tools/build-kani/Cargo.toml b/tools/build-kani/Cargo.toml index b75c373655bd..525c060232a7 100644 --- a/tools/build-kani/Cargo.toml +++ b/tools/build-kani/Cargo.toml @@ -3,7 +3,7 @@ [package] name = "build-kani" -version = "0.48.0" +version = "0.49.0" edition = "2021" description = "Builds Kani, Sysroot and release bundle." license = "MIT OR Apache-2.0" From 81e11ba9e31ba6d46b59fa0f85f256989126793a Mon Sep 17 00:00:00 2001 From: Michael Tautschnig Date: Fri, 5 Apr 2024 21:04:39 +0200 Subject: [PATCH 2/2] Update the rust toolchain to nightly-2024-04-02 (#3127) Changes required due to: - rust-lang/rust@a325bce3cd Normalize the result of Fields::ty_with_args Resolves: #3125, #3113 --- rust-toolchain.toml | 2 +- .../ValidValues/{write_invalid_fixme.rs => write_invalid.rs} | 3 --- 2 files changed, 1 insertion(+), 4 deletions(-) rename tests/kani/ValidValues/{write_invalid_fixme.rs => write_invalid.rs} (88%) diff --git a/rust-toolchain.toml b/rust-toolchain.toml index eee073e29a89..1ee76e0f92f1 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-03-29" +channel = "nightly-2024-04-02" components = ["llvm-tools-preview", "rustc-dev", "rust-src", "rustfmt"] diff --git a/tests/kani/ValidValues/write_invalid_fixme.rs b/tests/kani/ValidValues/write_invalid.rs similarity index 88% rename from tests/kani/ValidValues/write_invalid_fixme.rs rename to tests/kani/ValidValues/write_invalid.rs index f04a667a47d1..05d3705bd69a 100644 --- a/tests/kani/ValidValues/write_invalid_fixme.rs +++ b/tests/kani/ValidValues/write_invalid.rs @@ -6,9 +6,6 @@ //! Writing invalid bytes is not UB as long as the incorrect value is not read. //! However, we over-approximate for sake of simplicity and performance. -// Note: We're getting an unexpected compilation error because the type returned -// from StableMIR is `Alias`: https://github.com/model-checking/kani/issues/3113 - use std::num::NonZeroU8; #[kani::proof]