Skip to content

Commit 7f8d8e4

Browse files
Automatic cargo update to 2025-03-10 (#3926)
Dependency upgrade resulting from `cargo update`. --------- Co-authored-by: tautschnig <1144736+tautschnig@users.noreply.github.com> Co-authored-by: Michael Tautschnig <tautschn@amazon.com>
1 parent 931c40e commit 7f8d8e4

File tree

5 files changed

+64
-32
lines changed

5 files changed

+64
-32
lines changed

Cargo.lock

Lines changed: 60 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ dependencies = [
2727
"getrandom 0.2.15",
2828
"once_cell",
2929
"version_check",
30-
"zerocopy",
30+
"zerocopy 0.7.35",
3131
]
3232

3333
[[package]]
@@ -184,12 +184,6 @@ dependencies = [
184184
"which",
185185
]
186186

187-
[[package]]
188-
name = "byteorder"
189-
version = "1.5.0"
190-
source = "registry+https://github.com/rust-lang/crates.io-index"
191-
checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b"
192-
193187
[[package]]
194188
name = "bytes"
195189
version = "1.10.1"
@@ -444,7 +438,7 @@ dependencies = [
444438
"bitflags",
445439
"crossterm_winapi",
446440
"parking_lot",
447-
"rustix",
441+
"rustix 0.38.44",
448442
"winapi",
449443
]
450444

@@ -950,6 +944,12 @@ version = "0.4.15"
950944
source = "registry+https://github.com/rust-lang/crates.io-index"
951945
checksum = "d26c52dbd32dccf2d10cac7725f8eae5296885fb5703b261f7d0a0739ec807ab"
952946

947+
[[package]]
948+
name = "linux-raw-sys"
949+
version = "0.9.2"
950+
source = "registry+https://github.com/rust-lang/crates.io-index"
951+
checksum = "6db9c683daf087dc577b7506e9695b3d556a9f3849903fa28186283afd6809e9"
952+
953953
[[package]]
954954
name = "lock_api"
955955
version = "0.4.12"
@@ -1236,11 +1236,11 @@ checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391"
12361236

12371237
[[package]]
12381238
name = "ppv-lite86"
1239-
version = "0.2.20"
1239+
version = "0.2.21"
12401240
source = "registry+https://github.com/rust-lang/crates.io-index"
1241-
checksum = "77957b295656769bb8ad2b6a6b09d897d94f05c41b069aede1fcdaa675eaea04"
1241+
checksum = "85eae3c4ed2f50dcfe72643da4befc30deadb458a9b590d720cde2f2b1e97da9"
12421242
dependencies = [
1243-
"zerocopy",
1243+
"zerocopy 0.8.23",
12441244
]
12451245

12461246
[[package]]
@@ -1446,7 +1446,20 @@ dependencies = [
14461446
"bitflags",
14471447
"errno",
14481448
"libc",
1449-
"linux-raw-sys",
1449+
"linux-raw-sys 0.4.15",
1450+
"windows-sys 0.59.0",
1451+
]
1452+
1453+
[[package]]
1454+
name = "rustix"
1455+
version = "1.0.1"
1456+
source = "registry+https://github.com/rust-lang/crates.io-index"
1457+
checksum = "dade4812df5c384711475be5fcd8c162555352945401aed22a35bffeab61f657"
1458+
dependencies = [
1459+
"bitflags",
1460+
"errno",
1461+
"libc",
1462+
"linux-raw-sys 0.9.2",
14501463
"windows-sys 0.59.0",
14511464
]
14521465

@@ -1500,9 +1513,9 @@ dependencies = [
15001513

15011514
[[package]]
15021515
name = "serde"
1503-
version = "1.0.218"
1516+
version = "1.0.219"
15041517
source = "registry+https://github.com/rust-lang/crates.io-index"
1505-
checksum = "e8dfc9d19bdbf6d17e22319da49161d5d0108e4188e8b680aef6299eed22df60"
1518+
checksum = "5f0e2c6ed6606019b4e29e69dbaba95b11854410e5347d525002456dbbb786b6"
15061519
dependencies = [
15071520
"serde_derive",
15081521
]
@@ -1518,9 +1531,9 @@ dependencies = [
15181531

15191532
[[package]]
15201533
name = "serde_derive"
1521-
version = "1.0.218"
1534+
version = "1.0.219"
15221535
source = "registry+https://github.com/rust-lang/crates.io-index"
1523-
checksum = "f09503e191f4e797cb8aac08e9a4a4695c5edf6a2e70e376d961ddd5c969f82b"
1536+
checksum = "5b0276cf7f2c73365f7157c8123c21cd9a50fbbd844757af28ca1f5925fc2a00"
15241537
dependencies = [
15251538
"proc-macro2",
15261539
"quote",
@@ -1680,9 +1693,9 @@ dependencies = [
16801693

16811694
[[package]]
16821695
name = "syn"
1683-
version = "2.0.99"
1696+
version = "2.0.100"
16841697
source = "registry+https://github.com/rust-lang/crates.io-index"
1685-
checksum = "e02e925281e18ffd9d640e234264753c43edc62d64b2d4cf898f1bc5e75f3fc2"
1698+
checksum = "b09a44accad81e1ba1cd74a32461ba89dee89095ba17b32f5d03683b1b1fc2a0"
16861699
dependencies = [
16871700
"proc-macro2",
16881701
"quote",
@@ -1697,15 +1710,15 @@ checksum = "f764005d11ee5f36500a149ace24e00e3da98b0158b3e2d53a7495660d3f4d60"
16971710

16981711
[[package]]
16991712
name = "tempfile"
1700-
version = "3.17.1"
1713+
version = "3.18.0"
17011714
source = "registry+https://github.com/rust-lang/crates.io-index"
1702-
checksum = "22e5a0acb1f3f55f65cc4a866c361b2fb2a0ff6366785ae6fbb5f85df07ba230"
1715+
checksum = "2c317e0a526ee6120d8dabad239c8dadca62b24b6f168914bbbc8e2fb1f0e567"
17031716
dependencies = [
17041717
"cfg-if",
17051718
"fastrand",
17061719
"getrandom 0.3.1",
17071720
"once_cell",
1708-
"rustix",
1721+
"rustix 1.0.1",
17091722
"windows-sys 0.59.0",
17101723
]
17111724

@@ -1767,9 +1780,9 @@ dependencies = [
17671780

17681781
[[package]]
17691782
name = "time"
1770-
version = "0.3.38"
1783+
version = "0.3.39"
17711784
source = "registry+https://github.com/rust-lang/crates.io-index"
1772-
checksum = "bb041120f25f8fbe8fd2dbe4671c7c2ed74d83be2e7a77529bf7e0790ae3f472"
1785+
checksum = "dad298b01a40a23aac4580b67e3dbedb7cc8402f3592d7f49469de2ea4aecdd8"
17731786
dependencies = [
17741787
"deranged",
17751788
"itoa",
@@ -1809,9 +1822,9 @@ dependencies = [
18091822

18101823
[[package]]
18111824
name = "tokio"
1812-
version = "1.43.0"
1825+
version = "1.44.0"
18131826
source = "registry+https://github.com/rust-lang/crates.io-index"
1814-
checksum = "3d61fa4ffa3de412bfea335c6ecff681de2b609ba3c77ef3e00e521813a9ed9e"
1827+
checksum = "9975ea0f48b5aa3972bf2d888c238182458437cc2a19374b81b25cdf1023fb3a"
18151828
dependencies = [
18161829
"backtrace",
18171830
"bytes",
@@ -2074,7 +2087,7 @@ checksum = "2774c861e1f072b3aadc02f8ba886c26ad6321567ecc294c935434cad06f1283"
20742087
dependencies = [
20752088
"either",
20762089
"env_home",
2077-
"rustix",
2090+
"rustix 0.38.44",
20782091
"winsafe",
20792092
]
20802093

@@ -2221,8 +2234,16 @@ version = "0.7.35"
22212234
source = "registry+https://github.com/rust-lang/crates.io-index"
22222235
checksum = "1b9b4fd18abc82b8136838da5d50bae7bdea537c574d8dc1a34ed098d6c166f0"
22232236
dependencies = [
2224-
"byteorder",
2225-
"zerocopy-derive",
2237+
"zerocopy-derive 0.7.35",
2238+
]
2239+
2240+
[[package]]
2241+
name = "zerocopy"
2242+
version = "0.8.23"
2243+
source = "registry+https://github.com/rust-lang/crates.io-index"
2244+
checksum = "fd97444d05a4328b90e75e503a34bad781f14e28a823ad3557f0750df1ebcbc6"
2245+
dependencies = [
2246+
"zerocopy-derive 0.8.23",
22262247
]
22272248

22282249
[[package]]
@@ -2235,3 +2256,14 @@ dependencies = [
22352256
"quote",
22362257
"syn",
22372258
]
2259+
2260+
[[package]]
2261+
name = "zerocopy-derive"
2262+
version = "0.8.23"
2263+
source = "registry+https://github.com/rust-lang/crates.io-index"
2264+
checksum = "6352c01d0edd5db859a63e2605f4ea3183ddbd15e2c4a9e7d32184df75e4f154"
2265+
dependencies = [
2266+
"proc-macro2",
2267+
"quote",
2268+
"syn",
2269+
]

kani-driver/src/autoharness/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ use anyhow::Result;
1414
use comfy_table::Table as PrettyTable;
1515
use kani_metadata::{AutoHarnessSkipReason, KaniMetadata};
1616

17-
const AUTOHARNESS_TIMEOUT: &str = "30s";
17+
const AUTOHARNESS_TIMEOUT: &str = "60s";
1818
const LOOP_UNWIND_DEFAULT: u32 = 20;
1919

2020
pub fn autoharness_cargo(args: CargoAutoharnessArgs) -> Result<()> {

tests/script-based-pre/cargo_autoharness_contracts/contracts.expected

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ Autoharness Summary:
3737
|--------------------------------+-----------------------------+---------------------|
3838
| should_fail::max | #[kani::proof_for_contract] | Failure |
3939
+--------------------------------+-----------------------------+---------------------+
40-
Note that `kani autoharness` sets default --harness-timeout of 30s and --default-unwind of 20.
40+
Note that `kani autoharness` sets default --harness-timeout of 60s and --default-unwind of 20.
4141
If verification failed because of timing out or too low of an unwinding bound, try passing larger values for these arguments (or, if possible, writing a loop contract).
4242
Complete - 4 successfully verified functions, 1 failures, 5 total.
4343

tests/script-based-pre/cargo_autoharness_harnesses_fail/harnesses_fail.expected

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ Autoharness Summary:
6969
|-------------------------+---------------------------+---------------------|
7070
| oob_safe_array_access | #[kani::proof] | Failure |
7171
+-------------------------+---------------------------+---------------------+
72-
Note that `kani autoharness` sets default --harness-timeout of 30s and --default-unwind of 20.
72+
Note that `kani autoharness` sets default --harness-timeout of 60s and --default-unwind of 20.
7373
If verification failed because of timing out or too low of an unwinding bound, try passing larger values for these arguments (or, if possible, writing a loop contract).
7474
Complete - 0 successfully verified functions, 5 failures, 5 total.
7575

tests/script-based-pre/cargo_autoharness_termination/termination.expected

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ Autoharness Summary:
3535
|--------------------------------+---------------------------+---------------------|
3636
| unwind_bound::infinite_loop | #[kani::proof] | Failure |
3737
+--------------------------------+---------------------------+---------------------+
38-
Note that `kani autoharness` sets default --harness-timeout of 30s and --default-unwind of 20.
38+
Note that `kani autoharness` sets default --harness-timeout of 60s and --default-unwind of 20.
3939
If verification failed because of timing out or too low of an unwinding bound, try passing larger values for these arguments (or, if possible, writing a loop contract).
4040
Complete - 0 successfully verified functions, 3 failures, 3 total.
4141

0 commit comments

Comments
 (0)