Skip to content

Commit 8ac3c65

Browse files
SwatinemSwatinem
committed
fix clippy and doc tests
1 parent 5749cab commit 8ac3c65

File tree

6 files changed

+49
-49
lines changed

6 files changed

+49
-49
lines changed

‎benches/binary.rs‎

Lines changed: 29 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -109,35 +109,35 @@ fn write_tests(tests: &[Testrun], num_days: usize, timestamp: u32) -> Vec<u8> {
109109
buf
110110
}
111111

112-
struct Upload {
113-
flags: Vec<String>,
114-
tests: Vec<Testrun>,
115-
}
116-
117-
/// Generates a random set of `num_flags` flags.
118-
fn create_random_flags(rng: &mut impl Rng, num_flags: usize) -> Vec<String> {
119-
let flag_lens = Uniform::from(5usize..10);
120-
(0..num_flags)
121-
.map(|_| {
122-
let flag_len = flag_lens.sample(rng);
123-
Alphanumeric.sample_string(rng, flag_len)
124-
})
125-
.collect()
126-
}
127-
128-
/// Samples random combinations of flags with length `max_flags_in_set`.
129-
fn sample_flag_sets<'a>(
130-
rng: &'a mut impl Rng,
131-
flags: &'a [String],
132-
max_flags_in_set: usize,
133-
) -> impl Iterator<Item = Vec<String>> + 'a {
134-
let num_flags = Uniform::from(0..max_flags_in_set);
135-
std::iter::from_fn(move || {
136-
let num_flags = num_flags.sample(rng);
137-
let flags: Vec<_> = flags.choose_multiple(rng, num_flags).cloned().collect();
138-
Some(flags)
139-
})
140-
}
112+
// struct Upload {
113+
// flags: Vec<String>,
114+
// tests: Vec<Testrun>,
115+
// }
116+
117+
// /// Generates a random set of `num_flags` flags.
118+
// fn create_random_flags(rng: &mut impl Rng, num_flags: usize) -> Vec<String> {
119+
// let flag_lens = Uniform::from(5usize..10);
120+
// (0..num_flags)
121+
// .map(|_| {
122+
// let flag_len = flag_lens.sample(rng);
123+
// Alphanumeric.sample_string(rng, flag_len)
124+
// })
125+
// .collect()
126+
// }
127+
128+
// /// Samples random combinations of flags with length `max_flags_in_set`.
129+
// fn sample_flag_sets<'a>(
130+
// rng: &'a mut impl Rng,
131+
// flags: &'a [String],
132+
// max_flags_in_set: usize,
133+
// ) -> impl Iterator<Item = Vec<String>> + 'a {
134+
// let num_flags = Uniform::from(0..max_flags_in_set);
135+
// std::iter::from_fn(move || {
136+
// let num_flags = num_flags.sample(rng);
137+
// let flags: Vec<_> = flags.choose_multiple(rng, num_flags).cloned().collect();
138+
// Some(flags)
139+
// })
140+
// }
141141

142142
fn create_random_testcases(rng: &mut impl Rng, num_tests: usize) -> Vec<Testrun> {
143143
let name_lens = Uniform::from(5usize..50);

‎src/binary/flagsset.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ impl<'table> FlagsSet<'table> {
107107
Ok(flags)
108108
}
109109

110-
pub fn into_owned(&self) -> FlagsSet<'static> {
110+
pub fn to_owned(&self) -> FlagsSet<'static> {
111111
FlagsSet {
112112
map: self.map.clone(),
113113
table: self.table.clone().into_owned().into(),

‎src/binary/format.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ impl<'data> TestAnalytics<'data> {
9292
}
9393
}
9494

95-
impl<'data> fmt::Debug for TestAnalytics<'data> {
95+
impl fmt::Debug for TestAnalytics<'_> {
9696
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
9797
f.debug_struct("TestAnalytics")
9898
.field("version", &self.header.version)
@@ -113,7 +113,7 @@ pub struct Test<'data, 'parsed> {
113113
data_range: Range<usize>,
114114
}
115115

116-
impl<'data, 'parsed> Test<'data, 'parsed> {
116+
impl<'data> Test<'data, '_> {
117117
/// Returns the testsuite of the test.
118118
pub fn testsuite(&self) -> Result<&'data str, TestAnalyticsError> {
119119
watto::StringTable::read(

‎src/binary/mod.rs‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ mod timestamps;
66
mod writer;
77

88
pub use error::{TestAnalyticsError, TestAnalyticsErrorKind};
9-
pub use format::TestAnalytics;
9+
pub use format::{Test, TestAnalytics};
1010
pub use writer::TestAnalyticsWriter;
1111

1212
#[cfg(test)]
@@ -151,7 +151,7 @@ mod tests {
151151
assert!(tests.next().is_none());
152152

153153
// next, we re-parse one day ahead
154-
let parsed = TestAnalytics::parse(&buf, 1 * DAY).unwrap();
154+
let parsed = TestAnalytics::parse(&buf, DAY).unwrap();
155155
let mut tests = parsed.tests();
156156

157157
let abc = tests.next().unwrap();
@@ -191,16 +191,16 @@ mod tests {
191191
let mut buf = vec![];
192192
writer.serialize(&mut buf).unwrap();
193193

194-
let parsed = TestAnalytics::parse(&buf, 1 * DAY).unwrap();
194+
let parsed = TestAnalytics::parse(&buf, DAY).unwrap();
195195
let mut writer = TestAnalyticsWriter::from_existing_format(&parsed).unwrap();
196-
let mut session = writer.start_session(1 * DAY, &[]);
196+
let mut session = writer.start_session(DAY, &[]);
197197

198198
session.insert(&test);
199199

200200
let mut buf = vec![];
201201
writer.serialize(&mut buf).unwrap();
202202

203-
let parsed = TestAnalytics::parse(&buf, 1 * DAY).unwrap();
203+
let parsed = TestAnalytics::parse(&buf, DAY).unwrap();
204204
let mut tests = parsed.tests();
205205

206206
let abc = tests.next().unwrap();
@@ -240,13 +240,13 @@ mod tests {
240240
writer.serialize(&mut buf_1).unwrap();
241241

242242
let mut writer = TestAnalyticsWriter::new(2);
243-
let mut session = writer.start_session(1 * DAY, &[]);
243+
let mut session = writer.start_session(DAY, &[]);
244244
session.insert(&test);
245245
let mut buf_2 = vec![];
246246
writer.serialize(&mut buf_2).unwrap();
247247

248-
let parsed_1 = TestAnalytics::parse(&buf_1, 1 * DAY).unwrap();
249-
let parsed_2 = TestAnalytics::parse(&buf_2, 1 * DAY).unwrap();
248+
let parsed_1 = TestAnalytics::parse(&buf_1, DAY).unwrap();
249+
let parsed_2 = TestAnalytics::parse(&buf_2, DAY).unwrap();
250250

251251
let merged_12 = TestAnalyticsWriter::merge(&parsed_1, &parsed_2).unwrap();
252252
let merged_21 = TestAnalyticsWriter::merge(&parsed_2, &parsed_1).unwrap();
@@ -258,7 +258,7 @@ mod tests {
258258

259259
assert_eq!(buf_12, buf_21);
260260

261-
let parsed = TestAnalytics::parse(&buf_12, 1 * DAY).unwrap();
261+
let parsed = TestAnalytics::parse(&buf_12, DAY).unwrap();
262262
let mut tests = parsed.tests();
263263

264264
let abc = tests.next().unwrap();
@@ -299,19 +299,19 @@ mod tests {
299299
let mut buf = vec![];
300300
writer.serialize(&mut buf).unwrap();
301301

302-
let parsed = TestAnalytics::parse(&buf, 1 * DAY).unwrap();
302+
let parsed = TestAnalytics::parse(&buf, DAY).unwrap();
303303
let mut writer = TestAnalyticsWriter::from_existing_format(&parsed).unwrap();
304304

305-
let was_rewritten = writer.rewrite(2, 1 * DAY, Some(0)).unwrap();
305+
let was_rewritten = writer.rewrite(2, DAY, Some(0)).unwrap();
306306
assert!(!was_rewritten);
307307

308-
let was_rewritten = writer.rewrite(7, 1 * DAY, Some(0)).unwrap();
308+
let was_rewritten = writer.rewrite(7, DAY, Some(0)).unwrap();
309309
assert!(was_rewritten);
310310

311311
let mut buf = vec![];
312312
writer.serialize(&mut buf).unwrap();
313313

314-
let parsed = TestAnalytics::parse(&buf, 1 * DAY).unwrap();
314+
let parsed = TestAnalytics::parse(&buf, DAY).unwrap();
315315
let mut tests = parsed.tests();
316316

317317
// nothing garbage collected yet
@@ -364,7 +364,7 @@ mod tests {
364364
let mut buf = vec![];
365365
writer.serialize(&mut buf).unwrap();
366366

367-
let parsed = TestAnalytics::parse(&buf, 1 * DAY).unwrap();
367+
let parsed = TestAnalytics::parse(&buf, DAY).unwrap();
368368
let mut tests = parsed.tests();
369369

370370
// we get the test twice, with two different flags

‎src/binary/timestamps.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ mod tests {
7676

7777
#[test]
7878
fn test_day_offsets() {
79-
let offset = offset_from_today(0, 1 * DAY);
79+
let offset = offset_from_today(0, DAY);
8080
assert_eq!(offset, 1);
8181

8282
let offset = offset_from_today(0, 7 * DAY);

‎src/binary/writer.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ pub struct InsertSession<'writer> {
1818
flag_set_offset: u32,
1919
}
2020

21-
impl<'writer> InsertSession<'writer> {
21+
impl InsertSession<'_> {
2222
/// Writes the data for the given [`Testrun`](testrun::Testrun) into the
2323
/// underlying [`TestAnalyticsWriter`].
2424
pub fn insert(&mut self, test: &testrun::Testrun) {
@@ -106,7 +106,7 @@ impl TestAnalyticsWriter {
106106

107107
let string_table = StringTable::from_bytes(data.string_bytes)
108108
.map_err(|_| TestAnalyticsErrorKind::InvalidStringReference)?;
109-
let flags_set = data.flags_set.into_owned();
109+
let flags_set = data.flags_set.to_owned();
110110

111111
Ok(Self {
112112
num_days: data.header.num_days as usize,

0 commit comments

Comments
 (0)