Skip to content

Commit d32994e

Browse files
daniel-nolanddaniel-noland
authored
fix(bolero-generator): rename gen to produce in Driver (#270)
1 parent 0a011b0 commit d32994e

37 files changed

+215
-180
lines changed

‎examples/basic/tests/fuzz_operations/fuzz_target.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ fn main() {
1414
let len = if should_panic() { 16 } else { 4 };
1515

1616
check!()
17-
.with_generator(gen::<Vec<Operation>>().with().len(0usize..=len))
17+
.with_generator(produce::<Vec<Operation>>().with().len(0usize..=len))
1818
.for_each(|operations| {
1919
let mut subject: ArrayVec<[_; 4]> = ArrayVec::new();
2020
let mut oracle = LinkedList::new();

‎lib/bolero-engine/src/shrink/tests.rs

+7-7
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ macro_rules! shrink_test {
2222
#[test]
2323
fn $name() {
2424
#[allow(unused_imports)]
25-
use bolero_generator::{gen, ValueGenerator};
25+
use bolero_generator::{produce, ValueGenerator};
2626

2727
panic::forward_panic(true);
2828
panic::capture_backtrace(true);
@@ -39,7 +39,7 @@ macro_rules! shrink_test {
3939

4040
shrink_test!(
4141
u16_shrink_test_zero_time,
42-
gen::<u16>(),
42+
produce::<u16>(),
4343
[255u8; 2],
4444
Duration::ZERO,
4545
(None),
@@ -48,7 +48,7 @@ shrink_test!(
4848

4949
shrink_test!(
5050
u16_shrink_test,
51-
gen::<u16>(),
51+
produce::<u16>(),
5252
[255u8; 2],
5353
Duration::from_secs(1),
5454
(1),
@@ -60,7 +60,7 @@ shrink_test!(
6060

6161
shrink_test!(
6262
u32_shrink_test,
63-
gen::<u32>(),
63+
produce::<u32>(),
6464
[255u8; 4],
6565
Duration::from_secs(1),
6666
(20),
@@ -71,7 +71,7 @@ shrink_test!(
7171

7272
shrink_test!(
7373
vec_shrink_test,
74-
gen::<Vec<u32>>().filter_gen(|vec| vec.len() >= 3),
74+
produce::<Vec<u32>>().filter_gen(|vec| vec.len() >= 3),
7575
[255u8; 256],
7676
Duration::from_secs(1),
7777
(vec![4, 0, 0]),
@@ -84,7 +84,7 @@ shrink_test!(
8484

8585
shrink_test!(
8686
non_start_vec_shrink_test,
87-
gen::<Vec<u32>>().filter_gen(|vec| vec.len() >= 3),
87+
produce::<Vec<u32>>().filter_gen(|vec| vec.len() >= 3),
8888
[255u8; 256],
8989
Duration::from_secs(1),
9090
(vec![0, 5, 0]),
@@ -96,7 +96,7 @@ shrink_test!(
9696

9797
shrink_test!(
9898
middle_vec_shrink_test,
99-
gen::<Vec<u8>>().filter_gen(|vec| vec.len() >= 3),
99+
produce::<Vec<u8>>().filter_gen(|vec| vec.len() >= 3),
100100
[255u8; 256],
101101
Duration::from_secs(1),
102102
(vec![1, 1, 1]),

‎lib/bolero-engine/src/test.rs

+11-11
Original file line numberDiff line numberDiff line change
@@ -142,13 +142,13 @@ macro_rules! generate_value {
142142
($self:ident, $driver:ident) => {{
143143
let forward_panic = crate::panic::forward_panic(true);
144144
let value = if let Some(value) = $self.value.as_mut() {
145-
if $self.gen.mutate($driver, value).is_some() {
145+
if $self.produce.mutate($driver, value).is_some() {
146146
value
147147
} else {
148148
crate::panic::forward_panic(forward_panic);
149149
return Ok(false);
150150
}
151-
} else if let Some(value) = $self.gen.generate($driver) {
151+
} else if let Some(value) = $self.produce.generate($driver) {
152152
$self.value = Some(value);
153153
$self.value.as_ref().unwrap()
154154
} else {
@@ -162,23 +162,23 @@ macro_rules! generate_value {
162162
#[cfg(kani)]
163163
macro_rules! generate_value {
164164
($self:ident, $driver:ident) => {{
165-
$self.value = $self.gen.generate($driver);
165+
$self.value = $self.produce.generate($driver);
166166
kani::assume($self.value.is_some());
167167
$self.value.as_ref().unwrap()
168168
}};
169169
}
170170

171171
pub struct BorrowedGeneratorTest<F, G, V> {
172172
fun: F,
173-
gen: G,
173+
produce: G,
174174
value: Option<V>,
175175
}
176176

177177
impl<F, G, V> BorrowedGeneratorTest<F, G, V> {
178-
pub fn new(fun: F, gen: G) -> Self {
178+
pub fn new(fun: F, produce: G) -> Self {
179179
Self {
180180
fun,
181-
gen,
181+
produce,
182182
value: None,
183183
}
184184
}
@@ -217,7 +217,7 @@ where
217217
fn generate_value<T: Input<Self::Value>>(&self, input: &mut T) -> Self::Value {
218218
input.with_driver(&mut |driver| {
219219
let forward_panic = crate::panic::forward_panic(true);
220-
let value = self.gen.generate(driver).unwrap();
220+
let value = self.produce.generate(driver).unwrap();
221221
crate::panic::forward_panic(forward_panic);
222222
value
223223
})
@@ -226,15 +226,15 @@ where
226226

227227
pub struct ClonedGeneratorTest<F, G, V> {
228228
fun: F,
229-
gen: G,
229+
produce: G,
230230
value: Option<V>,
231231
}
232232

233233
impl<F, G, V> ClonedGeneratorTest<F, G, V> {
234-
pub fn new(fun: F, gen: G) -> Self {
234+
pub fn new(fun: F, produce: G) -> Self {
235235
Self {
236236
fun,
237-
gen,
237+
produce,
238238
value: None,
239239
}
240240
}
@@ -285,7 +285,7 @@ where
285285
fn generate_value<T: Input<Self::Value>>(&self, input: &mut T) -> Self::Value {
286286
input.with_driver(&mut |driver| {
287287
let forward_panic = crate::panic::forward_panic(true);
288-
let value = self.gen.generate(driver).unwrap();
288+
let value = self.produce.generate(driver).unwrap();
289289
crate::panic::forward_panic(forward_panic);
290290
value
291291
})

‎lib/bolero-generator-derive/src/generator_attr.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ impl ToTokens for GeneratorAttr {
1313
tokens.extend(quote!(#generator));
1414
} else {
1515
let krate = &self.krate;
16-
tokens.extend(quote!(#krate::gen()));
16+
tokens.extend(quote!(#krate::produce()));
1717
}
1818
}
1919
}

‎lib/bolero-generator/src/alloc/boxed.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ impl<T: 'static + TypeGenerator> TypeGenerator for Box<T> {
1414
}
1515
}
1616
} else {
17-
let value = driver.gen()?;
17+
let value = driver.produce()?;
1818
Some(Box::new(value))
1919
}
2020
})
@@ -33,15 +33,15 @@ impl<T: 'static + TypeGenerator> TypeGenerator for Box<T> {
3333

3434
impl<T: 'static + TypeGenerator> TypeGenerator for Box<[T]> {
3535
fn generate<D: Driver>(driver: &mut D) -> Option<Self> {
36-
Some(driver.gen::<Vec<T>>()?.into_boxed_slice())
36+
Some(driver.produce::<Vec<T>>()?.into_boxed_slice())
3737
}
3838

3939
// TODO mutate
4040
}
4141

4242
impl TypeGenerator for Box<str> {
4343
fn generate<D: Driver>(driver: &mut D) -> Option<Self> {
44-
Some(driver.gen::<String>()?.into_boxed_str())
44+
Some(driver.produce::<String>()?.into_boxed_str())
4545
}
4646

4747
// TODO mutate

‎lib/bolero-generator/src/alloc/collections.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ macro_rules! impl_values_collection_generator {
123123
#[inline]
124124
fn mutate<D: $crate::Driver>(&mut self, driver: &mut D) -> Option<()> {
125125
driver.enter_list::<Self, _, _, _>(&$default_len_range, |driver, len| {
126-
$crate::alloc_generators::CollectionGenerator::mutate_collection(self, driver, len, &V::gen())?;
126+
$crate::alloc_generators::CollectionGenerator::mutate_collection(self, driver, len, &V::produce())?;
127127

128128
if self.len() != len {
129129
None

‎lib/bolero-generator/src/alloc/mod.rs

+10-10
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ impl<T: Ord> CollectionGenerator for BinaryHeap<T> {
4747

4848
#[test]
4949
fn binary_heap_test() {
50-
let _ = generator_no_clone_test!(gen::<BinaryHeap<u8>>());
50+
let _ = generator_no_clone_test!(produce::<BinaryHeap<u8>>());
5151
}
5252

5353
impl_values_collection_generator!(BTreeSet, BTreeSetGenerator, DEFAULT_LEN_RANGE, [Ord]);
@@ -80,7 +80,7 @@ impl<T: Ord> CollectionGenerator for BTreeSet<T> {
8080

8181
#[test]
8282
fn btree_set_test() {
83-
let _ = generator_test!(gen::<BTreeSet<u8>>());
83+
let _ = generator_test!(produce::<BTreeSet<u8>>());
8484
}
8585

8686
impl_values_collection_generator!(LinkedList, LinkedListGenerator, DEFAULT_LEN_RANGE);
@@ -121,7 +121,7 @@ impl<T> CollectionGenerator for LinkedList<T> {
121121

122122
#[test]
123123
fn linked_list_test() {
124-
let _ = generator_test!(gen::<LinkedList<u8>>());
124+
let _ = generator_test!(produce::<LinkedList<u8>>());
125125
}
126126

127127
impl_values_collection_generator!(VecDeque, VecDequeGenerator, DEFAULT_LEN_RANGE);
@@ -163,7 +163,7 @@ impl<T> CollectionGenerator for VecDeque<T> {
163163

164164
#[test]
165165
fn vecdeque_test() {
166-
let _ = generator_test!(gen::<VecDeque<u8>>());
166+
let _ = generator_test!(produce::<VecDeque<u8>>());
167167
}
168168

169169
impl_values_collection_generator!(Vec, VecGenerator, DEFAULT_LEN_RANGE);
@@ -205,30 +205,30 @@ impl<T> CollectionGenerator for Vec<T> {
205205

206206
#[test]
207207
fn vec_type_test() {
208-
let _ = generator_test!(gen::<Vec<u8>>());
208+
let _ = generator_test!(produce::<Vec<u8>>());
209209
}
210210

211211
#[test]
212212
fn vec_with_len_test() {
213-
let results = generator_test!(gen::<Vec<u8>>().with().len(8usize));
213+
let results = generator_test!(produce::<Vec<u8>>().with().len(8usize));
214214
assert!(results.into_iter().all(|v| v.len() == 8));
215215
}
216216

217217
#[test]
218218
fn vec_with_values_test() {
219-
let _ = generator_test!(gen::<Vec<_>>().with().values(4u16..6));
219+
let _ = generator_test!(produce::<Vec<_>>().with().values(4u16..6));
220220
}
221221

222222
#[test]
223223
fn vec_gen_test() {
224-
let _ = generator_test!(vec![gen::<u8>()]);
224+
let _ = generator_test!(vec![produce::<u8>()]);
225225
}
226226

227227
impl_key_values_collection_generator!(BTreeMap, BTreeMapGenerator, DEFAULT_LEN_RANGE, [Ord]);
228228

229229
#[test]
230230
fn btree_map_type_test() {
231-
let _ = generator_test!(gen::<BTreeMap<u8, u8>>());
231+
let _ = generator_test!(produce::<BTreeMap<u8, u8>>());
232232
}
233233

234234
pub type Bytes = Vec<u8>;
@@ -243,6 +243,6 @@ where
243243
<T as ToOwned>::Owned: TypeGenerator,
244244
{
245245
fn generate<D: Driver>(driver: &mut D) -> Option<Self> {
246-
Some(Cow::Owned(driver.gen()?))
246+
Some(Cow::Owned(driver.produce()?))
247247
}
248248
}

‎lib/bolero-generator/src/alloc/string.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -125,11 +125,11 @@ impl ValueGenerator for String {
125125

126126
#[test]
127127
fn string_type_test() {
128-
let _ = generator_test!(gen::<String>());
128+
let _ = generator_test!(produce::<String>());
129129
}
130130

131131
#[test]
132132
fn string_with_test() {
133-
let results = generator_test!(gen::<String>().with().len(32usize));
133+
let results = generator_test!(produce::<String>().with().len(32usize));
134134
assert!(results.into_iter().any(|s| s.chars().count() == 32));
135135
}

‎lib/bolero-generator/src/alloc/sync.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ use alloc::{rc::Rc, sync::Arc};
33

44
impl<T: TypeGenerator> TypeGenerator for Arc<T> {
55
fn generate<D: Driver>(driver: &mut D) -> Option<Self> {
6-
driver.depth_guard(|driver| Some(Self::new(driver.gen()?)))
6+
driver.depth_guard(|driver| Some(Self::new(driver.produce()?)))
77
}
88

99
fn mutate<D: Driver>(&mut self, driver: &mut D) -> Option<()> {
@@ -17,7 +17,7 @@ impl<T: TypeGenerator> TypeGenerator for Arc<T> {
1717

1818
impl<T: TypeGenerator> TypeGenerator for Rc<T> {
1919
fn generate<D: Driver>(driver: &mut D) -> Option<Self> {
20-
driver.depth_guard(|driver| Some(Self::new(driver.gen()?)))
20+
driver.depth_guard(|driver| Some(Self::new(driver.produce()?)))
2121
}
2222

2323
fn mutate<D: Driver>(&mut self, driver: &mut D) -> Option<()> {

‎lib/bolero-generator/src/any.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
use crate::{gen, TypeGenerator, ValueGenerator};
1+
use crate::{produce, TypeGenerator, ValueGenerator};
22

33
#[cfg(not(kani))]
44
mod default;
@@ -32,7 +32,7 @@ impl<G: 'static + ValueGenerator> Any for G {
3232

3333
#[inline]
3434
pub fn any<T: TypeGenerator>() -> T {
35-
gen().any()
35+
produce().any()
3636
}
3737

3838
pub trait AnySliceExt<T> {

‎lib/bolero-generator/src/array.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -58,16 +58,16 @@ impl<T: TypeGenerator, const LEN: usize> TypeGeneratorWithParams for [T; LEN] {
5858
type Output = [TypeValueGenerator<T>; LEN];
5959

6060
fn gen_with() -> Self::Output {
61-
[T::gen(); LEN]
61+
[T::produce(); LEN]
6262
}
6363
}
6464

6565
#[test]
6666
fn array_type_test() {
67-
let _ = generator_test!(gen::<[u8; 10]>());
67+
let _ = generator_test!(produce::<[u8; 10]>());
6868
}
6969

7070
#[test]
7171
fn array_gen_test() {
72-
let _ = generator_test!([gen::<u8>(), gen::<u8>()]);
72+
let _ = generator_test!([produce::<u8>(), produce::<u8>()]);
7373
}

0 commit comments

Comments
 (0)