1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
|
Subject: Relax dependencies in vec-collections and update tests to quickcheck 1.x
From: Fabian Grünbichler <debian@fabian.gruenbichler.email>
Forwarded: https://github.com/rklaehn/vec-collections/pull/18
Last-Update: 2024-10-20
This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
Index: vec-collections/Cargo.toml
===================================================================
--- vec-collections.orig/Cargo.toml
+++ vec-collections/Cargo.toml
@@ -21,6 +21,7 @@ keywords = ["succinct", "vector", "array
categories = ["data-structures"]
license = "MIT OR Apache-2.0"
repository = "https://github.com/rklaehn/vec-collections"
+autoexamples = false
[[example]]
name = "radix_db"
@@ -38,28 +39,28 @@ harness = false
name = "set_ops"
harness = false
[dependencies.binary-merge]
-version = "0.1.1"
+version = "0.1"
[dependencies.bytecheck]
-version = "0.6.5"
+version = "0.8"
optional = true
[dependencies.inplace-vec-builder]
-version = "0.1.0"
+version = "0.1"
features = ["smallvec"]
[dependencies.lazy_static]
-version = "1.4.0"
+version = "1.4"
[dependencies.num-traits]
version = "0.2"
[dependencies.parking_lot]
-version = "0.11.2"
+version = "0.12"
optional = true
[dependencies.rkyv]
-version = "0.7.18"
+version = "0.7"
optional = true
[dependencies.serde]
@@ -68,15 +69,12 @@ optional = true
default-features = false
[dependencies.smallvec]
-version = "1.4"
+version = "1"
[dependencies.sorted-iter]
version = "0.1"
[dev-dependencies.anyhow]
-version = "1.0.32"
-
-[dev-dependencies.criterion]
-version = "0.3.0"
+version = "1.0"
[dev-dependencies.fnv]
version = "1.0.7"
@@ -87,9 +85,6 @@ version = "0.3.17"
[dev-dependencies.hex]
version = "0.4.3"
-[dev-dependencies.hexdump]
-version = "0.1.1"
-
[dev-dependencies.lazy_static]
version = "1.4.0"
@@ -103,13 +98,13 @@ version = "0.2.8"
version = "0.1.0"
[dev-dependencies.quickcheck]
-version = "0.8"
+version = "1.0"
[dev-dependencies.quickcheck_macros]
-version = "0.8.0"
+version = "1.0.0"
[dev-dependencies.rand]
-version = "0.7.3"
+version = "0.8.5"
[dev-dependencies.rkyv]
version = "0.7.19"
@@ -118,12 +113,6 @@ features = ["validation", "smallvec"]
[dev-dependencies.serde_json]
version = "1.0.41"
-[dev-dependencies.stats_alloc]
-version = "0.1.8"
-
-[dev-dependencies.testdrop]
-version = "0.1.2"
-
[dev-dependencies.tokio]
version = "1.13.0"
features = ["full"]
Index: vec-collections/src/vec_map.rs
===================================================================
--- vec-collections.orig/src/vec_map.rs
+++ vec-collections/src/vec_map.rs
@@ -932,7 +932,7 @@ mod tests {
type Ref = BTreeMap<i32, i32>;
impl<K: Arbitrary + Ord, V: Arbitrary> Arbitrary for VecMap1<K, V> {
- fn arbitrary<G: Gen>(g: &mut G) -> Self {
+ fn arbitrary(g: &mut Gen) -> Self {
let t: BTreeMap<K, V> = Arbitrary::arbitrary(g);
t.into()
}
Index: vec-collections/src/vec_set.rs
===================================================================
--- vec-collections.orig/src/vec_set.rs
+++ vec-collections/src/vec_set.rs
@@ -783,7 +783,7 @@ where
mod test {
use super::*;
use crate::vec_set::AbstractVecSet;
- use num_traits::PrimInt;
+ use num_traits::{PrimInt, WrappingAdd, WrappingSub};
use obey::*;
use quickcheck::*;
@@ -798,18 +798,18 @@ mod test {
}
impl<T: Arbitrary + Ord + Copy + Default + fmt::Debug> Arbitrary for VecSet<[T; 2]> {
- fn arbitrary<G: Gen>(g: &mut G) -> Self {
+ fn arbitrary(g: &mut Gen) -> Self {
Self::from_vec(Arbitrary::arbitrary(g))
}
}
- impl<E: PrimInt> TestSamples<E, bool> for VecSet<[E; 2]> {
+ impl<E: PrimInt + WrappingAdd + WrappingSub> TestSamples<E, bool> for VecSet<[E; 2]> {
fn samples(&self, res: &mut BTreeSet<E>) {
res.insert(E::min_value());
for x in self.0.iter().cloned() {
- res.insert(x - E::one());
+ res.insert(x.wrapping_sub(&E::one()));
res.insert(x);
- res.insert(x + E::one());
+ res.insert(x.wrapping_add(&E::one()));
}
res.insert(E::max_value());
}
Index: vec-collections/src/radix_tree/mod.rs
===================================================================
--- vec-collections.orig/src/radix_tree/mod.rs
+++ vec-collections/src/radix_tree/mod.rs
@@ -1565,7 +1565,7 @@ mod test {
use quickcheck::*;
impl Arbitrary for RadixTree<u8, ()> {
- fn arbitrary<G: Gen>(g: &mut G) -> Self {
+ fn arbitrary(g: &mut Gen) -> Self {
let t: Vec<String> = Arbitrary::arbitrary(g);
t.iter()
.take(2)
Index: vec-collections/src/total_vec_map.rs
===================================================================
--- vec-collections.orig/src/total_vec_map.rs
+++ vec-collections/src/total_vec_map.rs
@@ -287,7 +287,7 @@ mod tests {
}
impl<K: Arbitrary + Ord, V: Arbitrary + Eq> Arbitrary for TotalVecMap1<K, V> {
- fn arbitrary<G: Gen>(g: &mut G) -> Self {
+ fn arbitrary(g: &mut Gen) -> Self {
TotalVecMap::new(Arbitrary::arbitrary(g), Arbitrary::arbitrary(g))
}
}
Index: vec-collections/src/total_vec_set.rs
===================================================================
--- vec-collections.orig/src/total_vec_set.rs
+++ vec-collections/src/total_vec_set.rs
@@ -343,7 +343,7 @@ mod tests {
type Test = TotalVecSet<[i64; 2]>;
impl<T: Arbitrary + Ord + Copy + Default + Debug> Arbitrary for TotalVecSet<[T; 2]> {
- fn arbitrary<G: Gen>(g: &mut G) -> Self {
+ fn arbitrary(g: &mut Gen) -> Self {
let mut elements: Vec<T> = Arbitrary::arbitrary(g);
elements.truncate(2);
let negated: bool = Arbitrary::arbitrary(g);
|
