Skip to content

Commit

Permalink
Merge branch 'main' into float-to-int-f16-f128
Browse files Browse the repository at this point in the history
  • Loading branch information
zhassan-aws authored Nov 12, 2024
2 parents 97a1d24 + abd68b9 commit 4709f82
Show file tree
Hide file tree
Showing 6 changed files with 30 additions and 25 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/verify-std-check.yml
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ jobs:
continue-on-error: true
run: |
kani verify-std -Z unstable-options ./library --target-dir ${{ runner.temp }} -Z function-contracts \
-Z mem-predicates
-Z mem-predicates -Z loop-contracts --enable-unstable --cbmc-args --object-bits 12
# If the head failed, check if it's a new failure.
- name: Checkout base
Expand All @@ -77,7 +77,7 @@ jobs:
continue-on-error: true
run: |
kani verify-std -Z unstable-options ./library --target-dir ${{ runner.temp }} -Z function-contracts \
-Z mem-predicates
-Z mem-predicates -Z loop-contracts --enable-unstable --cbmc-args --object-bits 12
- name: Compare PR results
if: steps.check-head.outcome != 'success' && steps.check-head.outcome != steps.check-base.outcome
Expand Down
40 changes: 20 additions & 20 deletions Cargo.lock
Original file line number Diff line number Diff line change
Expand Up @@ -90,9 +90,9 @@ dependencies = [

[[package]]
name = "anyhow"
version = "1.0.92"
version = "1.0.93"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "74f37166d7d48a0284b99dd824694c26119c700b53bf0d1540cdb147dbdaaf13"
checksum = "4c95c10ba0b00a02636238b814946408b1322d5ac4760326e6fb8ec956d85775"

[[package]]
name = "arrayvec"
Expand Down Expand Up @@ -231,9 +231,9 @@ dependencies = [

[[package]]
name = "cc"
version = "1.1.34"
version = "1.1.37"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "67b9470d453346108f93a59222a9a1a5724db32d0a4727b7ab7ace4b4d822dc9"
checksum = "40545c26d092346d8a8dab71ee48e7685a7a9cba76e634790c215b41a4a7b4cf"
dependencies = [
"shlex",
]
Expand Down Expand Up @@ -469,9 +469,9 @@ dependencies = [

[[package]]
name = "csv"
version = "1.3.0"
version = "1.3.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ac574ff4d437a7b5ad237ef331c17ccca63c46479e5b5453eb8e10bb99a759fe"
checksum = "acdc4883a9c96732e4733212c01447ebd805833b7275a73ca3ee080fd77afdaf"
dependencies = [
"csv-core",
"itoa",
Expand Down Expand Up @@ -595,9 +595,9 @@ dependencies = [

[[package]]
name = "fastrand"
version = "2.1.1"
version = "2.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e8c02a5121d4ea3eb16a80748c74f5549a5665e4c21333c6098f283870fbdea6"
checksum = "486f806e73c5707928240ddc295403b1b93c96a02038563881c4a2fd84b81ac4"

[[package]]
name = "fixedbitset"
Expand Down Expand Up @@ -890,9 +890,9 @@ checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe"

[[package]]
name = "libc"
version = "0.2.161"
version = "0.2.162"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8e9489c2807c139ffd9c1794f4af0ebe86a828db53ecdc7fea2111d0fed085d1"
checksum = "18d287de67fe55fd7e1581fe933d965a5a9477b38e949cfa9f8574ef01506398"

[[package]]
name = "linear-map"
Expand Down Expand Up @@ -1421,9 +1421,9 @@ dependencies = [

[[package]]
name = "rustix"
version = "0.38.38"
version = "0.38.40"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "aa260229e6538e52293eeb577aabd09945a09d6d9cc0fc550ed7529056c2e32a"
checksum = "99e4ea3e1cdc4b559b8e5650f9c8e5998e3e5c1343b4eaf034565f32318d63c0"
dependencies = [
"bitflags 2.6.0",
"errno",
Expand Down Expand Up @@ -1685,9 +1685,9 @@ checksum = "f764005d11ee5f36500a149ace24e00e3da98b0158b3e2d53a7495660d3f4d60"

[[package]]
name = "tempfile"
version = "3.13.0"
version = "3.14.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f0f2c9fc62d0beef6951ccffd757e241266a2c833136efbe35af6cd2567dca5b"
checksum = "28cce251fcbc87fac86a866eeb0d6c2d536fc16d06f184bb61aeae11aa4cee0c"
dependencies = [
"cfg-if",
"fastrand",
Expand All @@ -1704,18 +1704,18 @@ checksum = "3369f5ac52d5eb6ab48c6b4ffdc8efbcad6b89c765749064ba298f2c68a16a76"

[[package]]
name = "thiserror"
version = "1.0.68"
version = "1.0.69"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "02dd99dc800bbb97186339685293e1cc5d9df1f8fae2d0aecd9ff1c77efea892"
checksum = "b6aaf5339b578ea85b50e080feb250a3e8ae8cfcdff9a461c9ec2904bc923f52"
dependencies = [
"thiserror-impl",
]

[[package]]
name = "thiserror-impl"
version = "1.0.68"
version = "1.0.69"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a7c61ec9a6f64d2793d8a45faba21efbe3ced62a886d44c36a009b2b519b4c7e"
checksum = "4fee6c4efc90059e10f81e6d42c60a18f76588c3d74cb83a0b242a2b6c7504c1"
dependencies = [
"proc-macro2",
"quote",
Expand Down Expand Up @@ -1767,9 +1767,9 @@ dependencies = [

[[package]]
name = "tokio"
version = "1.41.0"
version = "1.41.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "145f3413504347a2be84393cc8a7d2fb4d863b375909ea59f2158261aa258bbb"
checksum = "22cfb5bee7a6a52939ca9224d6ac897bb669134078daa8735560897f69de4d33"
dependencies = [
"backtrace",
"bytes",
Expand Down
6 changes: 6 additions & 0 deletions deny.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,12 @@
# Copyright Kani Contributors
# SPDX-License-Identifier: Apache-2.0 OR MIT

[graph]
# derivative is marked as unmaintained by RUSTSEC but still used in
# Charon. We exclude it from the deny check until derivative is replaced
# from Charon (https://github.com/AeneasVerif/charon/pull/459).
exclude = ["derivative"]

# This section is considered when running `cargo deny check advisories`
# More documentation for the advisories section can be found here:
# https://embarkstudios.github.io/cargo-deny/checks/advisories/cfg.html
Expand Down
2 changes: 1 addition & 1 deletion rust-toolchain.toml
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@
# SPDX-License-Identifier: Apache-2.0 OR MIT

[toolchain]
channel = "nightly-2024-11-03"
channel = "nightly-2024-11-09"
components = ["llvm-tools", "rustc-dev", "rust-src", "rustfmt"]
1 change: 0 additions & 1 deletion tests/expected/function-contract/const_fn_with_effect.rs
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
//! Check that Kani contract can be applied to a constant function.
//! <https://github.com/model-checking/kani/issues/3258>
#![feature(effects)]
#![allow(incomplete_features)]

#[kani::requires(kani::mem::can_dereference(arg))]
Expand Down
2 changes: 1 addition & 1 deletion tests/perf/s2n-quic
Submodule s2n-quic updated 80 files
+15 −0 .cargo/audit.toml
+13 −1 .github/config/cargo-deny.toml
+16 −2 .github/workflows/dependencies.yml
+2 −1 .github/workflows/release.yml
+1 −1 common/s2n-codec/Cargo.toml
+8 −6 dc/s2n-quic-dc/Cargo.toml
+4 −1 dc/s2n-quic-dc/events/common.rs
+6 −0 dc/s2n-quic-dc/events/connection.rs
+4 −0 dc/s2n-quic-dc/events/endpoint.rs
+26 −0 dc/s2n-quic-dc/events/map.rs
+18 −1 dc/s2n-quic-dc/src/event.rs
+34 −84 dc/s2n-quic-dc/src/event/generated.rs
+82 −0 dc/s2n-quic-dc/src/event/generated/metrics.rs
+1,358 −0 dc/s2n-quic-dc/src/event/generated/metrics/aggregate.rs
+469 −0 dc/s2n-quic-dc/src/event/generated/metrics/probe.rs
+10 −4 dc/s2n-quic-dc/src/path/secret/map.rs
+11 −2 dc/s2n-quic-dc/src/path/secret/map/cleaner.rs
+15 −3 dc/s2n-quic-dc/src/path/secret/map/event_tests.rs
+34 −34 dc/s2n-quic-dc/src/path/secret/map/snapshots/path__secret__map__event_tests__control_packets__events.snap
+2 −2 dc/s2n-quic-dc/src/path/secret/map/snapshots/path__secret__map__event_tests__init_uninit__events.snap
+4 −4 dc/s2n-quic-dc/src/path/secret/map/snapshots/path__secret__map__event_tests__insert_one__events.snap
+49 −7 dc/s2n-quic-dc/src/path/secret/map/state.rs
+2 −2 ...n-quic-dc/src/path/secret/map/state/snapshots/path__secret__map__state__tests__thread_shutdown__events.snap
+8 −7 dc/s2n-quic-dc/src/path/secret/map/state/tests.rs
+26 −0 dc/s2n-quic-dc/src/testing.rs
+2 −2 quic/s2n-quic-core/Cargo.toml
+74 −0 quic/s2n-quic-core/events/connection.rs
+9 −0 quic/s2n-quic-core/events/endpoint.rs
+22 −0 quic/s2n-quic-core/events/platform.rs
+105 −0 quic/s2n-quic-core/src/connection/error.rs
+258 −0 quic/s2n-quic-core/src/connection/snapshots/s2n_quic_core__connection__error__metrics__variants_test.snap
+57 −0 quic/s2n-quic-core/src/crypto/tls/error.rs
+146 −0 quic/s2n-quic-core/src/crypto/tls/snapshots/s2n_quic_core__crypto__tls__error__variants_test.snap
+21 −2 quic/s2n-quic-core/src/event.rs
+896 −697 quic/s2n-quic-core/src/event/generated.rs
+704 −0 quic/s2n-quic-core/src/event/generated/metrics.rs
+2,912 −0 quic/s2n-quic-core/src/event/generated/metrics/aggregate.rs
+718 −0 quic/s2n-quic-core/src/event/generated/metrics/probe.rs
+3 −1 quic/s2n-quic-core/src/event/metrics.rs
+171 −0 quic/s2n-quic-core/src/event/metrics/aggregate.rs
+135 −0 quic/s2n-quic-core/src/event/metrics/aggregate/info.rs
+165 −0 quic/s2n-quic-core/src/event/metrics/aggregate/metric.rs
+5 −0 quic/s2n-quic-core/src/event/metrics/aggregate/probe.rs
+196 −0 quic/s2n-quic-core/src/event/metrics/aggregate/probe/dynamic.rs
+115 −0 quic/s2n-quic-core/src/event/metrics/aggregate/recorder.rs
+269 −0 quic/s2n-quic-core/src/event/metrics/aggregate/testing.rs
+15 −0 quic/s2n-quic-core/src/event/metrics/aggregate/variant.rs
+14 −10 quic/s2n-quic-core/src/probe.rs
+1 −1 quic/s2n-quic-core/src/time/clock.rs
+88 −1 quic/s2n-quic-core/src/transport/error.rs
+214 −0 quic/s2n-quic-core/src/transport/snapshots/s2n_quic_core__transport__error__variants_test.snap
+3 −3 quic/s2n-quic-crypto/Cargo.toml
+22 −42 quic/s2n-quic-events/src/main.rs
+66 −59 quic/s2n-quic-events/src/output.rs
+129 −0 quic/s2n-quic-events/src/output/metrics.rs
+910 −0 quic/s2n-quic-events/src/output/metrics/aggregate.rs
+0 −7 quic/s2n-quic-events/src/output_mode.rs
+214 −86 quic/s2n-quic-events/src/parser.rs
+3 −3 quic/s2n-quic-platform/Cargo.toml
+4 −4 quic/s2n-quic-rustls/Cargo.toml
+3 −0 quic/s2n-quic-rustls/src/session.rs
+4 −4 quic/s2n-quic-tls-default/Cargo.toml
+4 −4 quic/s2n-quic-tls/Cargo.toml
+3 −3 quic/s2n-quic-transport/Cargo.toml
+9 −9 quic/s2n-quic/Cargo.toml
+3 −0 quic/s2n-quic/src/provider/dc.rs
+117 −0 quic/s2n-quic/src/provider/dc/mtu_confirm.rs
+68 −6 quic/s2n-quic/src/tests/dc.rs
+15 −3 quic/s2n-quic/src/tests/pto.rs
+23 −23 quic/s2n-quic/src/tests/snapshots/platform_events__client.snap
+21 −21 quic/s2n-quic/src/tests/snapshots/platform_events__server.snap
+843 −0 quic/s2n-quic/src/tests/snapshots/tests__dc__dc_handshake_self_test__events.snap
+519 −0 quic/s2n-quic/src/tests/snapshots/tests__dc__dc_mtls_handshake_auth_failure_self_test__events.snap
+589 −0 quic/s2n-quic/src/tests/snapshots/tests__dc__dc_mtls_handshake_client_not_supported_self_test__events.snap
+856 −0 quic/s2n-quic/src/tests/snapshots/tests__dc__dc_mtls_handshake_self_test__events.snap
+507 −0 quic/s2n-quic/src/tests/snapshots/tests__dc__dc_mtls_handshake_server_not_supported_self_test__events.snap
+1,043 −0 quic/s2n-quic/src/tests/snapshots/tests__dc__dc_not_secret_control_packet__events.snap
+1,039 −0 quic/s2n-quic/src/tests/snapshots/tests__dc__dc_secret_control_packet__events.snap
+975 −0 quic/s2n-quic/src/tests/snapshots/tests__pto__handshake_pto_timer_is_armed__events.snap
+3 −3 tools/xdp/s2n-quic-xdp/Cargo.toml

0 comments on commit 4709f82

Please sign in to comment.