File tree 3 files changed +11
-15
lines changed 3 files changed +11
-15
lines changed Original file line number Diff line number Diff line change @@ -63,7 +63,7 @@ y4m = { version = "0.6", optional = true }
63
63
backtrace = { version = " 0.3" , optional = true }
64
64
num-traits = " 0.2"
65
65
num-derive = " 0.3"
66
- paste = " 0.1 "
66
+ paste = " 1.0 "
67
67
noop_proc_macro = " 0.3.0"
68
68
serde = { version = " 1.0" , features = [" derive" ], optional = true }
69
69
dav1d-sys = { version = " 0.3.2" , optional = true }
@@ -78,7 +78,7 @@ arrayvec = { version = "0.5", features = ["array-sizes-33-128"] }
78
78
thiserror = " 1.0"
79
79
byteorder = { version = " 1.3.2" , optional = true }
80
80
log = " 0.4"
81
- console = { version = " 0.11 " , optional = true }
81
+ console = { version = " 0.12 " , optional = true }
82
82
fern = { version = " 0.6" , optional = true }
83
83
itertools = " 0.9"
84
84
simd_helpers = " 0.1"
@@ -118,10 +118,10 @@ pretty_assertions = "0.6"
118
118
interpolate_name = " 0.2.2"
119
119
rand = " 0.7"
120
120
rand_chacha = " 0.2"
121
- semver = " 0.9 "
121
+ semver = " 0.10 "
122
122
123
123
[target .'cfg(fuzzing)' .dependencies ]
124
- arbitrary = " 0.2 "
124
+ arbitrary = " 0.4 "
125
125
interpolate_name = " 0.2.2"
126
126
rand = " 0.7"
127
127
rand_chacha = " 0.2"
Original file line number Diff line number Diff line change 9
9
10
10
use std:: sync:: Arc ;
11
11
12
- use arbitrary:: * ;
12
+ use arbitrary:: { Arbitrary , Unstructured } ;
13
13
14
14
use crate :: prelude:: * ;
15
15
@@ -41,12 +41,12 @@ use crate::prelude::*;
41
41
42
42
// A helper for generating arbitrary data.
43
43
struct Generator < ' a > {
44
- buffer : RingBuffer < ' a > ,
44
+ buffer : Unstructured < ' a > ,
45
45
}
46
46
47
47
impl < ' a > Generator < ' a > {
48
- fn new ( data : & ' a [ u8 ] ) -> Result < Self , BufferError > {
49
- Ok ( Self { buffer : RingBuffer :: new ( data, data . len ( ) ) ? } )
48
+ fn new ( data : & ' a [ u8 ] ) -> Self {
49
+ Self { buffer : Unstructured :: new ( data) }
50
50
}
51
51
52
52
fn g < T : Arbitrary > ( & mut self ) -> T {
@@ -56,11 +56,7 @@ impl<'a> Generator<'a> {
56
56
57
57
macro_rules! create_generator {
58
58
( $data: expr) => { {
59
- let g = Generator :: new( $data) ;
60
- if g. is_err( ) {
61
- return ;
62
- }
63
- g. unwrap( )
59
+ Generator :: new( $data)
64
60
} } ;
65
61
}
66
62
Original file line number Diff line number Diff line change @@ -678,7 +678,7 @@ fn high_bit_depth(decoder: &str, depth: usize) {
678
678
macro_rules! test_high_bit_depth {
679
679
( $( $B: expr) ,+) => {
680
680
$(
681
- paste:: item_with_macros !{
681
+ paste:: item !{
682
682
#[ cfg_attr( feature = "decode_test" , interpolate_test( aom, "aom" ) ) ]
683
683
#[ cfg_attr( feature = "decode_test_dav1d" , interpolate_test( dav1d, "dav1d" ) ) ]
684
684
#[ ignore]
@@ -709,7 +709,7 @@ fn chroma_sampling(decoder: &str, cs: ChromaSampling) {
709
709
macro_rules! test_chroma_sampling {
710
710
( $( ( $S: expr, $I: expr) ) ,+) => {
711
711
$(
712
- paste:: item_with_macros !{
712
+ paste:: item !{
713
713
#[ cfg_attr( feature = "decode_test" , interpolate_test( aom, "aom" ) ) ]
714
714
#[ cfg_attr( feature = "decode_test_dav1d" , interpolate_test( dav1d, "dav1d" ) ) ]
715
715
#[ ignore]
You can’t perform that action at this time.
0 commit comments