Skip to content

Commit 3a55d4e

Browse files
LuthafLuthaf
committed
Fix clippy warnings
1 parent 2fe650a commit 3a55d4e

File tree

12 files changed

+84
-73
lines changed

12 files changed

+84
-73
lines changed

‎Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@ soa_derive_internal = {path = "soa-derive-internal", version = "0.10"}
2323

2424
[dev-dependencies]
2525
bencher = "0.1"
26-
serde = { version = "1.0.130", features = ["derive"] }
27-
serde_json = "1.0.68"
26+
serde = { version = "1", features = ["derive"] }
27+
serde_json = "1"
2828

2929
[[bench]]
3030
name = "soa"

‎soa-derive-internal/src/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#![warn(clippy::all, clippy::pedantic)]
22
#![allow(clippy::needless_return, clippy::redundant_field_names)]
3-
#![allow(clippy::use_self, clippy::too_many_lines)]
3+
#![allow(clippy::use_self, clippy::too_many_lines, clippy::missing_panics_doc)]
44
// TODO: improve the code and make it simpler to read
55
#![allow(clippy::cognitive_complexity)]
66

‎src/lib.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,7 @@ pub trait StructOfArray {
169169
}
170170

171171

172-
mod private_soa_indexs {
172+
mod private_soa_indexes {
173173
// From [`std::slice::SliceIndex`](https://doc.rust-lang.org/std/slice/trait.SliceIndex.html) code.
174174
// Limits the types that may implement the SoA index traits.
175175
// It's also helpful to have the exaustive list of all accepted types.
@@ -189,7 +189,7 @@ mod private_soa_indexs {
189189

190190
/// Helper trait used for indexing operations.
191191
/// Inspired by [`std::slice::SliceIndex`](https://doc.rust-lang.org/std/slice/trait.SliceIndex.html).
192-
pub trait SoAIndex<T>: private_soa_indexs::Sealed {
192+
pub trait SoAIndex<T>: private_soa_indexes::Sealed {
193193
/// The output for the non-mutable functions
194194
type RefOutput;
195195

@@ -203,7 +203,7 @@ pub trait SoAIndex<T>: private_soa_indexs::Sealed {
203203

204204
/// Helper trait used for indexing operations returning mutable references.
205205
/// Inspired by [`std::slice::SliceIndex`](https://doc.rust-lang.org/std/slice/trait.SliceIndex.html).
206-
pub trait SoAIndexMut<T>: private_soa_indexs::Sealed {
206+
pub trait SoAIndexMut<T>: private_soa_indexes::Sealed {
207207
/// The output for the mutable functions
208208
type MutOutput;
209209

‎tests/extreme.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
#![deny(warnings)]
2+
#![allow(clippy::float_cmp)]
23

34
use soa_derive::StructOfArray;
45

‎tests/index.rs

Lines changed: 56 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
#![allow(clippy::float_cmp)]
2+
13
mod particles;
24
use self::particles::{Particle, ParticleVec, ParticleRef};
35

@@ -62,14 +64,14 @@ fn index_vec_with_usize() {
6264

6365
#[test]
6466
fn index_vec_with_ranges() {
65-
let mut particles = Vec::new();
66-
particles.push(Particle::new(String::from("Cl"), 1.0));
67-
particles.push(Particle::new(String::from("Na"), 2.0));
68-
particles.push(Particle::new(String::from("Br"), 3.0));
69-
particles.push(Particle::new(String::from("Zn"), 4.0));
67+
let particles = vec![
68+
Particle::new(String::from("Cl"), 1.0),
69+
Particle::new(String::from("Na"), 2.0),
70+
Particle::new(String::from("Br"), 3.0),
71+
Particle::new(String::from("Zn"), 4.0),
72+
];
7073

7174
let mut soa = ParticleVec::new();
72-
7375
for particle in particles.iter() {
7476
soa.push(particle.clone());
7577
}
@@ -84,47 +86,47 @@ fn index_vec_with_ranges() {
8486
eq_its(soa.index(range.clone()).iter(), particles[range.clone()].iter());
8587
eq_its(soa.get_mut(range.clone()).unwrap().iter(), particles.get(range.clone()).unwrap().iter());
8688
unsafe { eq_its(soa.get_unchecked_mut(range.clone()).iter(), particles.get_unchecked(range.clone()).iter()); }
87-
eq_its(soa.index_mut(range.clone()).iter(), particles[range.clone()].iter());
89+
eq_its(soa.index_mut(range.clone()).iter(), particles[range].iter());
8890

8991
let range = ..3;
90-
eq_its(soa.get(range.clone()).unwrap().iter(), particles.get(range.clone()).unwrap().iter());
91-
unsafe { eq_its(soa.get_unchecked(range.clone()).iter(), particles.get_unchecked(range.clone()).iter()); }
92-
eq_its(soa.index(range.clone()).iter(), particles[range.clone()].iter());
93-
eq_its(soa.get_mut(range.clone()).unwrap().iter(), particles.get(range.clone()).unwrap().iter());
94-
unsafe { eq_its(soa.get_unchecked_mut(range.clone()).iter(), particles.get_unchecked(range.clone()).iter()); }
95-
eq_its(soa.index_mut(range.clone()).iter(), particles[range.clone()].iter());
92+
eq_its(soa.get(range).unwrap().iter(), particles.get(range).unwrap().iter());
93+
unsafe { eq_its(soa.get_unchecked(range).iter(), particles.get_unchecked(range).iter()); }
94+
eq_its(soa.index(range).iter(), particles[range].iter());
95+
eq_its(soa.get_mut(range).unwrap().iter(), particles.get(range).unwrap().iter());
96+
unsafe { eq_its(soa.get_unchecked_mut(range).iter(), particles.get_unchecked(range).iter()); }
97+
eq_its(soa.index_mut(range).iter(), particles[range].iter());
9698

9799
let range = 1..;
98100
eq_its(soa.get(range.clone()).unwrap().iter(), particles.get(range.clone()).unwrap().iter());
99101
unsafe { eq_its(soa.get_unchecked(range.clone()).iter(), particles.get_unchecked(range.clone()).iter()); }
100102
eq_its(soa.index(range.clone()).iter(), particles[range.clone()].iter());
101103
eq_its(soa.get_mut(range.clone()).unwrap().iter(), particles.get(range.clone()).unwrap().iter());
102104
unsafe { eq_its(soa.get_unchecked_mut(range.clone()).iter(), particles.get_unchecked(range.clone()).iter()); }
103-
eq_its(soa.index_mut(range.clone()).iter(), particles[range.clone()].iter());
105+
eq_its(soa.index_mut(range.clone()).iter(), particles[range].iter());
104106

105107
let range = ..;
106-
eq_its(soa.get(range.clone()).unwrap().iter(), particles.get(range.clone()).unwrap().iter());
107-
unsafe { eq_its(soa.get_unchecked(range.clone()).iter(), particles.get_unchecked(range.clone()).iter()); }
108-
eq_its(soa.index(range.clone()).iter(), particles[range.clone()].iter());
109-
eq_its(soa.get_mut(range.clone()).unwrap().iter(), particles.get(range.clone()).unwrap().iter());
110-
unsafe { eq_its(soa.get_unchecked_mut(range.clone()).iter(), particles.get_unchecked(range.clone()).iter()); }
111-
eq_its(soa.index_mut(range.clone()).iter(), particles[range.clone()].iter());
108+
eq_its(soa.get(range).unwrap().iter(), particles.get(range).unwrap().iter());
109+
unsafe { eq_its(soa.get_unchecked(range).iter(), particles.get_unchecked(range).iter()); }
110+
eq_its(soa.index(range).iter(), particles[range].iter());
111+
eq_its(soa.get_mut(range).unwrap().iter(), particles.get(range).unwrap().iter());
112+
unsafe { eq_its(soa.get_unchecked_mut(range).iter(), particles.get_unchecked(range).iter()); }
113+
eq_its(soa.index_mut(range).iter(), particles[range].iter());
112114

113115
let range = 0..=1;
114116
eq_its(soa.get(range.clone()).unwrap().iter(), particles.get(range.clone()).unwrap().iter());
115117
unsafe { eq_its(soa.get_unchecked(range.clone()).iter(), particles.get_unchecked(range.clone()).iter()); }
116118
eq_its(soa.index(range.clone()).iter(), particles[range.clone()].iter());
117119
eq_its(soa.get_mut(range.clone()).unwrap().iter(), particles.get(range.clone()).unwrap().iter());
118120
unsafe { eq_its(soa.get_unchecked_mut(range.clone()).iter(), particles.get_unchecked(range.clone()).iter()); }
119-
eq_its(soa.index_mut(range.clone()).iter(), particles[range.clone()].iter());
121+
eq_its(soa.index_mut(range.clone()).iter(), particles[range].iter());
120122

121123
let range = ..=2;
122-
eq_its(soa.get(range.clone()).unwrap().iter(), particles.get(range.clone()).unwrap().iter());
123-
unsafe { eq_its(soa.get_unchecked(range.clone()).iter(), particles.get_unchecked(range.clone()).iter()); }
124-
eq_its(soa.index(range.clone()).iter(), particles[range.clone()].iter());
125-
eq_its(soa.get_mut(range.clone()).unwrap().iter(), particles.get(range.clone()).unwrap().iter());
126-
unsafe { eq_its(soa.get_unchecked_mut(range.clone()).iter(), particles.get_unchecked(range.clone()).iter()); }
127-
eq_its(soa.index_mut(range.clone()).iter(), particles[range.clone()].iter());
124+
eq_its(soa.get(range).unwrap().iter(), particles.get(range).unwrap().iter());
125+
unsafe { eq_its(soa.get_unchecked(range).iter(), particles.get_unchecked(range).iter()); }
126+
eq_its(soa.index(range).iter(), particles[range].iter());
127+
eq_its(soa.get_mut(range).unwrap().iter(), particles.get(range).unwrap().iter());
128+
unsafe { eq_its(soa.get_unchecked_mut(range).iter(), particles.get_unchecked(range).iter()); }
129+
eq_its(soa.index_mut(range).iter(), particles[range].iter());
128130
}
129131

130132
#[test]
@@ -181,14 +183,14 @@ fn index_slice_with_usize() {
181183

182184
#[test]
183185
fn index_slice_with_ranges() {
184-
let mut particles = Vec::new();
185-
particles.push(Particle::new(String::from("Cl"), 1.0));
186-
particles.push(Particle::new(String::from("Na"), 2.0));
187-
particles.push(Particle::new(String::from("Br"), 3.0));
188-
particles.push(Particle::new(String::from("Zn"), 4.0));
186+
let particles = vec![
187+
Particle::new(String::from("Cl"), 1.0),
188+
Particle::new(String::from("Na"), 2.0),
189+
Particle::new(String::from("Br"), 3.0),
190+
Particle::new(String::from("Zn"), 4.0),
191+
];
189192

190193
let mut soa = ParticleVec::new();
191-
192194
for particle in particles.iter() {
193195
soa.push(particle.clone());
194196
}
@@ -204,45 +206,45 @@ fn index_slice_with_ranges() {
204206
eq_its(soa_mut_slice.index(range.clone()).iter(), particles[range.clone()].iter());
205207
eq_its(soa_mut_slice.get_mut(range.clone()).unwrap().iter(), particles.get(range.clone()).unwrap().iter());
206208
unsafe { eq_its(soa_mut_slice.get_unchecked_mut(range.clone()).iter(), particles.get_unchecked(range.clone()).iter()); }
207-
eq_its(soa_mut_slice.index_mut(range.clone()).iter(), particles[range.clone()].iter());
209+
eq_its(soa_mut_slice.index_mut(range.clone()).iter(), particles[range].iter());
208210

209211
let range = ..3;
210-
eq_its(soa_mut_slice.get(range.clone()).unwrap().iter(), particles.get(range.clone()).unwrap().iter());
211-
unsafe { eq_its(soa_mut_slice.get_unchecked(range.clone()).iter(), particles.get_unchecked(range.clone()).iter()); }
212-
eq_its(soa_mut_slice.index(range.clone()).iter(), particles[range.clone()].iter());
213-
eq_its(soa_mut_slice.get_mut(range.clone()).unwrap().iter(), particles.get(range.clone()).unwrap().iter());
214-
unsafe { eq_its(soa_mut_slice.get_unchecked_mut(range.clone()).iter(), particles.get_unchecked(range.clone()).iter()); }
215-
eq_its(soa_mut_slice.index_mut(range.clone()).iter(), particles[range.clone()].iter());
212+
eq_its(soa_mut_slice.get(range).unwrap().iter(), particles.get(range).unwrap().iter());
213+
unsafe { eq_its(soa_mut_slice.get_unchecked(range).iter(), particles.get_unchecked(range).iter()); }
214+
eq_its(soa_mut_slice.index(range).iter(), particles[range].iter());
215+
eq_its(soa_mut_slice.get_mut(range).unwrap().iter(), particles.get(range).unwrap().iter());
216+
unsafe { eq_its(soa_mut_slice.get_unchecked_mut(range).iter(), particles.get_unchecked(range).iter()); }
217+
eq_its(soa_mut_slice.index_mut(range).iter(), particles[range].iter());
216218

217219
let range = 1..;
218220
eq_its(soa_mut_slice.get(range.clone()).unwrap().iter(), particles.get(range.clone()).unwrap().iter());
219221
unsafe { eq_its(soa_mut_slice.get_unchecked(range.clone()).iter(), particles.get_unchecked(range.clone()).iter()); }
220222
eq_its(soa_mut_slice.index(range.clone()).iter(), particles[range.clone()].iter());
221223
eq_its(soa_mut_slice.get_mut(range.clone()).unwrap().iter(), particles.get(range.clone()).unwrap().iter());
222224
unsafe { eq_its(soa_mut_slice.get_unchecked_mut(range.clone()).iter(), particles.get_unchecked(range.clone()).iter()); }
223-
eq_its(soa_mut_slice.index_mut(range.clone()).iter(), particles[range.clone()].iter());
225+
eq_its(soa_mut_slice.index_mut(range.clone()).iter(), particles[range].iter());
224226

225227
let range = ..;
226-
eq_its(soa_mut_slice.get(range.clone()).unwrap().iter(), particles.get(range.clone()).unwrap().iter());
227-
unsafe { eq_its(soa_mut_slice.get_unchecked(range.clone()).iter(), particles.get_unchecked(range.clone()).iter()); }
228-
eq_its(soa_mut_slice.index(range.clone()).iter(), particles[range.clone()].iter());
229-
eq_its(soa_mut_slice.get_mut(range.clone()).unwrap().iter(), particles.get(range.clone()).unwrap().iter());
230-
unsafe { eq_its(soa_mut_slice.get_unchecked_mut(range.clone()).iter(), particles.get_unchecked(range.clone()).iter()); }
231-
eq_its(soa_mut_slice.index_mut(range.clone()).iter(), particles[range.clone()].iter());
228+
eq_its(soa_mut_slice.get(range).unwrap().iter(), particles.get(range).unwrap().iter());
229+
unsafe { eq_its(soa_mut_slice.get_unchecked(range).iter(), particles.get_unchecked(range).iter()); }
230+
eq_its(soa_mut_slice.index(range).iter(), particles[range].iter());
231+
eq_its(soa_mut_slice.get_mut(range).unwrap().iter(), particles.get(range).unwrap().iter());
232+
unsafe { eq_its(soa_mut_slice.get_unchecked_mut(range).iter(), particles.get_unchecked(range).iter()); }
233+
eq_its(soa_mut_slice.index_mut(range).iter(), particles[range].iter());
232234

233235
let range = 0..=1;
234236
eq_its(soa_mut_slice.get(range.clone()).unwrap().iter(), particles.get(range.clone()).unwrap().iter());
235237
unsafe { eq_its(soa_mut_slice.get_unchecked(range.clone()).iter(), particles.get_unchecked(range.clone()).iter()); }
236238
eq_its(soa_mut_slice.index(range.clone()).iter(), particles[range.clone()].iter());
237239
eq_its(soa_mut_slice.get_mut(range.clone()).unwrap().iter(), particles.get(range.clone()).unwrap().iter());
238240
unsafe { eq_its(soa_mut_slice.get_unchecked_mut(range.clone()).iter(), particles.get_unchecked(range.clone()).iter()); }
239-
eq_its(soa_mut_slice.index_mut(range.clone()).iter(), particles[range.clone()].iter());
241+
eq_its(soa_mut_slice.index_mut(range.clone()).iter(), particles[range].iter());
240242

241243
let range = ..=2;
242-
eq_its(soa_mut_slice.get(range.clone()).unwrap().iter(), particles.get(range.clone()).unwrap().iter());
243-
unsafe { eq_its(soa_mut_slice.get_unchecked(range.clone()).iter(), particles.get_unchecked(range.clone()).iter()); }
244-
eq_its(soa_mut_slice.index(range.clone()).iter(), particles[range.clone()].iter());
245-
eq_its(soa_mut_slice.get_mut(range.clone()).unwrap().iter(), particles.get(range.clone()).unwrap().iter());
246-
unsafe { eq_its(soa_mut_slice.get_unchecked_mut(range.clone()).iter(), particles.get_unchecked(range.clone()).iter()); }
247-
eq_its(soa_mut_slice.index_mut(range.clone()).iter(), particles[range.clone()].iter());
244+
eq_its(soa_mut_slice.get(range).unwrap().iter(), particles.get(range).unwrap().iter());
245+
unsafe { eq_its(soa_mut_slice.get_unchecked(range).iter(), particles.get_unchecked(range).iter()); }
246+
eq_its(soa_mut_slice.index(range).iter(), particles[range].iter());
247+
eq_its(soa_mut_slice.get_mut(range).unwrap().iter(), particles.get(range).unwrap().iter());
248+
unsafe { eq_its(soa_mut_slice.get_unchecked_mut(range).iter(), particles.get_unchecked(range).iter()); }
249+
eq_its(soa_mut_slice.index_mut(range).iter(), particles[range].iter());
248250
}

‎tests/iter.rs

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
1-
mod particles;
1+
#![allow(clippy::float_cmp)]
22

3+
mod particles;
34
use self::particles::{Particle, ParticleVec};
45

56
#[test]
@@ -53,10 +54,11 @@ fn iter_mut() {
5354

5455
#[test]
5556
fn from_iter() {
56-
let mut vec_with_particles = Vec::new();
57-
vec_with_particles.push(Particle::new(String::from("Na"), 0.0));
58-
vec_with_particles.push(Particle::new(String::from("Cl"), 0.0));
59-
vec_with_particles.push(Particle::new(String::from("Zn"), 0.0));
57+
let vec_with_particles = vec![
58+
Particle::new(String::from("Na"), 0.0),
59+
Particle::new(String::from("Cl"), 0.0),
60+
Particle::new(String::from("Zn"), 0.0),
61+
];
6062

6163
let particles_from_iter: ParticleVec = vec_with_particles.into_iter().collect();
6264

‎tests/particles/mod.rs

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
#![forbid(warnings)]
2-
31
use soa_derive::StructOfArray;
42

53
#[derive(Debug, Clone, PartialEq, StructOfArray)]
@@ -12,8 +10,8 @@ pub struct Particle {
1210
impl Particle {
1311
pub fn new(name: String, mass: f64) -> Self {
1412
Particle {
15-
name: name,
16-
mass: mass,
13+
name,
14+
mass,
1715
}
1816
}
1917
}

‎tests/ptr.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
#![allow(clippy::float_cmp)]
2+
13
mod particles;
24
use self::particles::{Particle, ParticleVec, ParticleSlice, ParticleSliceMut};
35

‎tests/serde.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ pub struct Particle {
1111
impl Particle {
1212
pub fn new(name: String, mass: f64) -> Self {
1313
Particle {
14-
name: name,
15-
mass: mass,
14+
name,
15+
mass,
1616
}
1717
}
1818
}

‎tests/slice.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
#![allow(clippy::float_cmp)]
2+
13
mod particles;
24
use self::particles::{Particle, ParticleVec};
35

0 commit comments

Comments
 (0)