Skip to content

Commit a811e9e

Browse files
authored
Update paste dependency to 1.0, arbitrary to 0.4, console to 0.12 and semver to 0.10 (#2489)
1 parent 15a4364 commit a811e9e

File tree

3 files changed

+11
-15
lines changed

3 files changed

+11
-15
lines changed

Cargo.toml

+4-4
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ y4m = { version = "0.6", optional = true }
6363
backtrace = { version = "0.3", optional = true }
6464
num-traits = "0.2"
6565
num-derive = "0.3"
66-
paste = "0.1"
66+
paste = "1.0"
6767
noop_proc_macro = "0.3.0"
6868
serde = { version = "1.0", features = ["derive"], optional = true }
6969
dav1d-sys = { version = "0.3.2", optional = true }
@@ -78,7 +78,7 @@ arrayvec = { version = "0.5", features = ["array-sizes-33-128"] }
7878
thiserror = "1.0"
7979
byteorder = { version = "1.3.2", optional = true }
8080
log = "0.4"
81-
console = { version = "0.11", optional = true }
81+
console = { version = "0.12", optional = true }
8282
fern = { version = "0.6", optional = true }
8383
itertools = "0.9"
8484
simd_helpers = "0.1"
@@ -118,10 +118,10 @@ pretty_assertions = "0.6"
118118
interpolate_name = "0.2.2"
119119
rand = "0.7"
120120
rand_chacha = "0.2"
121-
semver = "0.9"
121+
semver = "0.10"
122122

123123
[target.'cfg(fuzzing)'.dependencies]
124-
arbitrary = "0.2"
124+
arbitrary = "0.4"
125125
interpolate_name = "0.2.2"
126126
rand = "0.7"
127127
rand_chacha = "0.2"

src/fuzzing.rs

+5-9
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99

1010
use std::sync::Arc;
1111

12-
use arbitrary::*;
12+
use arbitrary::{Arbitrary, Unstructured};
1313

1414
use crate::prelude::*;
1515

@@ -41,12 +41,12 @@ use crate::prelude::*;
4141

4242
// A helper for generating arbitrary data.
4343
struct Generator<'a> {
44-
buffer: RingBuffer<'a>,
44+
buffer: Unstructured<'a>,
4545
}
4646

4747
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) }
5050
}
5151

5252
fn g<T: Arbitrary>(&mut self) -> T {
@@ -56,11 +56,7 @@ impl<'a> Generator<'a> {
5656

5757
macro_rules! create_generator {
5858
($data:expr) => {{
59-
let g = Generator::new($data);
60-
if g.is_err() {
61-
return;
62-
}
63-
g.unwrap()
59+
Generator::new($data)
6460
}};
6561
}
6662

src/test_encode_decode/mod.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -678,7 +678,7 @@ fn high_bit_depth(decoder: &str, depth: usize) {
678678
macro_rules! test_high_bit_depth {
679679
($($B:expr),+) => {
680680
$(
681-
paste::item_with_macros!{
681+
paste::item!{
682682
#[cfg_attr(feature = "decode_test", interpolate_test(aom, "aom"))]
683683
#[cfg_attr(feature = "decode_test_dav1d", interpolate_test(dav1d, "dav1d"))]
684684
#[ignore]
@@ -709,7 +709,7 @@ fn chroma_sampling(decoder: &str, cs: ChromaSampling) {
709709
macro_rules! test_chroma_sampling {
710710
($(($S:expr, $I:expr)),+) => {
711711
$(
712-
paste::item_with_macros!{
712+
paste::item!{
713713
#[cfg_attr(feature = "decode_test", interpolate_test(aom, "aom"))]
714714
#[cfg_attr(feature = "decode_test_dav1d", interpolate_test(dav1d, "dav1d"))]
715715
#[ignore]

0 commit comments

Comments
 (0)