Skip to content

Commit 4e85ccb

Browse files
authored
build(deps): update bolero requirement from 0.11 to 0.12 (#2400)
1 parent 82943e4 commit 4e85ccb

File tree

29 files changed

+43
-43
lines changed

29 files changed

+43
-43
lines changed

Cargo.toml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,10 @@ exclude = [
1515
"tools",
1616
]
1717

18+
[workspace.dependencies]
19+
bolero = "0.12"
20+
bolero-generator = { version = "0.12", default-features = false }
21+
1822
[profile.release]
1923
lto = true
2024
codegen-units = 1

common/s2n-codec/Cargo.toml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,14 +19,14 @@ checked_range_unsafe = []
1919
generator = ["bolero-generator"]
2020

2121
[dependencies]
22-
bolero-generator = { version = "0.11", default-features = false, optional = true }
22+
bolero-generator = { workspace = true, optional = true }
2323
byteorder = { version = "1.1", default-features = false }
2424
bytes = { version = "1", default-features = false, optional = true }
2525
zerocopy = { version = "0.7", features = ["derive"] }
2626

2727
[dev-dependencies]
28-
bolero = "0.11"
29-
bolero-generator = "0.11"
28+
bolero.workspace = true
29+
bolero-generator.workspace = true
3030

3131
[package.metadata.kani]
3232
flags = { tests = true }

common/s2n-codec/src/decoder/checked_range.rs

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,12 @@ pub struct CheckedRange {
1212
original_ptr: *const u8,
1313
}
1414

15-
#[cfg(any(test, feature = "generator"))]
16-
use bolero_generator::*;
17-
1815
#[cfg(test)]
1916
impl bolero::TypeGenerator for CheckedRange {
2017
fn generate<D: bolero::Driver>(driver: &mut D) -> Option<Self> {
21-
let start = gen::<usize>().generate(driver)?;
18+
use bolero::ValueGenerator;
19+
20+
let start = bolero::gen::<usize>().generate(driver)?;
2221
let end = (start..).generate(driver)?;
2322
Some(CheckedRange::new(start, end, core::ptr::null()))
2423
}

common/s2n-codec/src/zerocopy.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ use core::{
99
pub use zerocopy::*;
1010

1111
#[cfg(feature = "generator")]
12-
use bolero_generator::*;
12+
use bolero_generator::prelude::*;
1313

1414
/// Define a codec implementation for a zerocopy value that implements
1515
/// `FromBytes`, `AsBytes`, and `Unaligned`.
@@ -293,7 +293,7 @@ macro_rules! zerocopy_network_integer {
293293

294294
#[cfg(feature = "generator")]
295295
impl TypeGenerator for $name {
296-
fn generate<D: Driver>(driver: &mut D) -> Option<Self> {
296+
fn generate<D: bolero_generator::Driver>(driver: &mut D) -> Option<Self> {
297297
Some(Self::new(driver.gen()?))
298298
}
299299
}

dc/s2n-quic-dc/Cargo.toml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ arrayvec = "0.7"
2020
atomic-waker = "1"
2121
aws-lc-rs = "1"
2222
bitflags = "2"
23-
bolero-generator = { version = "0.11", optional = true }
23+
bolero-generator = { workspace = true, optional = true }
2424
bytes = "1"
2525
crossbeam-channel = "0.5"
2626
crossbeam-epoch = "0.9"
@@ -46,8 +46,8 @@ zeroize = "1"
4646
parking_lot = "0.12"
4747

4848
[dev-dependencies]
49-
bolero = "0.11"
50-
bolero-generator = "0.11"
49+
bolero.workspace = true
50+
bolero-generator.workspace = true
5151
insta = "1"
5252
s2n-codec = { path = "../../common/s2n-codec", features = ["testing"] }
5353
s2n-quic-core = { path = "../../quic/s2n-quic-core", features = ["testing"] }

dc/wireshark/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ s2n-quic-core = { path = "../../quic/s2n-quic-core" }
1414
s2n-quic-dc = { path = "../s2n-quic-dc" }
1515

1616
[dev-dependencies]
17-
bolero = "0.11"
17+
bolero = "0.12"
1818
s2n-quic-core = { path = "../../quic/s2n-quic-core", features = ["testing", "generator"] }
1919
s2n-quic-dc = { path = "../s2n-quic-dc", features = ["testing"] }
2020

quic/s2n-quic-core/Cargo.toml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ usdt = ["dep:probe"]
2929

3030
[dependencies]
3131
atomic-waker = { version = "1", optional = true }
32-
bolero-generator = { version = "0.11", optional = true }
32+
bolero-generator = { workspace = true, optional = true }
3333
byteorder = { version = "1", default-features = false }
3434
bytes = { version = "1", optional = true, default-features = false }
3535
crossbeam-utils = { version = "0.8", optional = true }
@@ -49,8 +49,8 @@ futures-test = { version = "0.3", optional = true } # For testing Waker interact
4949
once_cell = { version = "1", optional = true }
5050

5151
[dev-dependencies]
52-
bolero = "0.11"
53-
bolero-generator = "0.11"
52+
bolero.workspace = true
53+
bolero-generator.workspace = true
5454
insta = { version = "1", features = ["json"] }
5555
futures = "0.3"
5656
futures-test = "0.3"

quic/s2n-quic-core/src/connection/id.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ use core::time::Duration;
1111
use s2n_codec::{decoder_value, Encoder, EncoderValue};
1212

1313
#[cfg(any(test, feature = "generator"))]
14-
use bolero_generator::*;
14+
use bolero_generator::prelude::*;
1515

1616
//= https://www.rfc-editor.org/rfc/rfc9000#section-5.1
1717
//# Each connection possesses a set of connection identifiers, or

quic/s2n-quic-core/src/frame/ack.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -443,7 +443,7 @@ const ACK_RANGE_DECODING_ERROR: DecoderError =
443443
//#
444444
//# ECN counts are maintained separately for each packet number space.
445445
#[cfg(any(test, feature = "generator"))]
446-
use bolero_generator::*;
446+
use bolero_generator::prelude::*;
447447

448448
#[derive(Copy, Clone, Debug, Default, PartialEq, Eq)]
449449
#[cfg_attr(any(test, feature = "generator"), derive(TypeGenerator))]

quic/s2n-quic-core/src/frame/ack_elicitation.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
// SPDX-License-Identifier: Apache-2.0
33

44
#[cfg(any(test, feature = "generator"))]
5-
use bolero_generator::*;
5+
use bolero_generator::prelude::*;
66
use core::ops::{BitOr, BitOrAssign};
77

88
//= https://www.rfc-editor.org/rfc/rfc9002#section-2

0 commit comments

Comments
 (0)