Skip to content

Commit 0ed84b5

Browse files
committed
more lints
1 parent 82210d7 commit 0ed84b5

File tree

9 files changed

+44
-19
lines changed

9 files changed

+44
-19
lines changed

benches/bench1.rs

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,11 @@
11
#![feature(test)]
22
#![allow(unused_imports)]
3+
#![allow(
4+
clippy::many_single_char_names,
5+
clippy::deref_addrof,
6+
clippy::unreadable_literal,
7+
clippy::many_single_char_names
8+
)]
39

410
extern crate ndarray;
511
extern crate test;
@@ -304,6 +310,7 @@ fn add_2d_zip_cutout(bench: &mut test::Bencher) {
304310
}
305311

306312
#[bench]
313+
#[allow(clippy::identity_op)]
307314
fn add_2d_cutouts_by_4(bench: &mut test::Bencher) {
308315
let mut a = Array::<i32, _>::zeros((64 * 1, 64 * 1));
309316
let b = Array::<i32, _>::zeros((64 * 1, 64 * 1));
@@ -316,6 +323,7 @@ fn add_2d_cutouts_by_4(bench: &mut test::Bencher) {
316323
}
317324

318325
#[bench]
326+
#[allow(clippy::identity_op)]
319327
fn add_2d_cutouts_by_16(bench: &mut test::Bencher) {
320328
let mut a = Array::<i32, _>::zeros((64 * 1, 64 * 1));
321329
let b = Array::<i32, _>::zeros((64 * 1, 64 * 1));
@@ -328,6 +336,7 @@ fn add_2d_cutouts_by_16(bench: &mut test::Bencher) {
328336
}
329337

330338
#[bench]
339+
#[allow(clippy::identity_op)]
331340
fn add_2d_cutouts_by_32(bench: &mut test::Bencher) {
332341
let mut a = Array::<i32, _>::zeros((64 * 1, 64 * 1));
333342
let b = Array::<i32, _>::zeros((64 * 1, 64 * 1));
@@ -580,7 +589,7 @@ fn iadd_scalar_2d_strided_dyn(bench: &mut test::Bencher) {
580589
fn scaled_add_2d_f32_regular(bench: &mut test::Bencher) {
581590
let mut av = Array::<f32, _>::zeros((ADD2DSZ, ADD2DSZ));
582591
let bv = Array::<f32, _>::zeros((ADD2DSZ, ADD2DSZ));
583-
let scalar = 3.1415926535;
592+
let scalar = std::f32::consts::Pi;
584593
bench.iter(|| {
585594
av.scaled_add(scalar, &bv);
586595
});
@@ -650,7 +659,7 @@ fn bench_row_iter(bench: &mut test::Bencher) {
650659
let a = Array::<f32, _>::zeros((1024, 1024));
651660
let it = a.row(17);
652661
bench.iter(|| {
653-
for elt in it.clone() {
662+
for elt in it {
654663
black_box(elt);
655664
}
656665
})
@@ -661,7 +670,7 @@ fn bench_col_iter(bench: &mut test::Bencher) {
661670
let a = Array::<f32, _>::zeros((1024, 1024));
662671
let it = a.column(17);
663672
bench.iter(|| {
664-
for elt in it.clone() {
673+
for elt in it {
665674
black_box(elt);
666675
}
667676
})

benches/chunks.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,7 @@ fn chunk2x2_sum_uget1(bench: &mut Bencher) {
6464
}
6565

6666
#[bench]
67+
#[allow(clippy::identity_op)]
6768
fn chunk2x2_sum_get2(bench: &mut Bencher) {
6869
let a = Array::<f32, _>::zeros((256, 256));
6970
let chunksz = (2, 2);

benches/construct.rs

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
11
#![feature(test)]
2-
2+
#![allow(
3+
clippy::many_single_char_names,
4+
clippy::deref_addrof,
5+
clippy::unreadable_literal,
6+
clippy::many_single_char_names
7+
)]
38
extern crate test;
49
use test::Bencher;
510

benches/gemv.rs

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,10 @@
11
#![feature(test)]
2+
#![allow(
3+
clippy::many_single_char_names,
4+
clippy::deref_addrof,
5+
clippy::unreadable_literal,
6+
clippy::many_single_char_names
7+
)]
28

39
extern crate test;
410
use test::Bencher;

benches/higher-order.rs

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
11
#![feature(test)]
2-
2+
#![allow(
3+
clippy::many_single_char_names,
4+
clippy::deref_addrof,
5+
clippy::unreadable_literal,
6+
clippy::many_single_char_names
7+
)]
38
extern crate test;
49
use test::black_box;
510
use test::Bencher;
@@ -67,13 +72,13 @@ fn map_axis_0(bench: &mut Bencher) {
6772
let a = Array::from_iter(0..MASZ as i32)
6873
.into_shape([MA, MA])
6974
.unwrap();
70-
bench.iter(|| a.map_axis(Axis(0), |lane| black_box(lane)));
75+
bench.iter(|| a.map_axis(Axis(0), black_box));
7176
}
7277

7378
#[bench]
7479
fn map_axis_1(bench: &mut Bencher) {
7580
let a = Array::from_iter(0..MASZ as i32)
7681
.into_shape([MA, MA])
7782
.unwrap();
78-
bench.iter(|| a.map_axis(Axis(1), |lane| black_box(lane)));
83+
bench.iter(|| a.map_axis(Axis(1), black_box));
7984
}

benches/iter.rs

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -20,15 +20,15 @@ use ndarray::{FoldWhile, Zip};
2020
#[bench]
2121
fn iter_sum_2d_regular(bench: &mut Bencher) {
2222
let a = Array::<i32, _>::zeros((64, 64));
23-
bench.iter(|| a.iter().fold(0, |acc, &x| acc + x));
23+
bench.iter(|| a.iter().sum::<i32>());
2424
}
2525

2626
#[bench]
2727
fn iter_sum_2d_cutout(bench: &mut Bencher) {
2828
let a = Array::<i32, _>::zeros((66, 66));
2929
let av = a.slice(s![1..-1, 1..-1]);
3030
let a = av;
31-
bench.iter(|| a.iter().fold(0, |acc, &x| acc + x));
31+
bench.iter(|| a.iter().sum::<i32>());
3232
}
3333

3434
#[bench]
@@ -43,37 +43,37 @@ fn iter_all_2d_cutout(bench: &mut Bencher) {
4343
fn iter_sum_2d_transpose(bench: &mut Bencher) {
4444
let a = Array::<i32, _>::zeros((66, 66));
4545
let a = a.t();
46-
bench.iter(|| a.iter().fold(0, |acc, &x| acc + x));
46+
bench.iter(|| a.iter().sum::<i32>());
4747
}
4848

4949
#[bench]
5050
fn iter_filter_sum_2d_u32(bench: &mut Bencher) {
5151
let a = Array::linspace(0., 1., 256).into_shape((16, 16)).unwrap();
5252
let b = a.mapv(|x| (x * 100.) as u32);
53-
bench.iter(|| b.iter().filter(|&&x| x < 75).fold(0, |acc, &x| acc + x));
53+
bench.iter(|| b.iter().filter(|&&x| x < 75).sum::<u32>());
5454
}
5555

5656
#[bench]
5757
fn iter_filter_sum_2d_f32(bench: &mut Bencher) {
5858
let a = Array::linspace(0., 1., 256).into_shape((16, 16)).unwrap();
5959
let b = a * 100.;
60-
bench.iter(|| b.iter().filter(|&&x| x < 75.).fold(0., |acc, &x| acc + x));
60+
bench.iter(|| b.iter().filter(|&&x| x < 75.).sum::<f32>());
6161
}
6262

6363
#[bench]
6464
fn iter_filter_sum_2d_stride_u32(bench: &mut Bencher) {
6565
let a = Array::linspace(0., 1., 256).into_shape((16, 16)).unwrap();
6666
let b = a.mapv(|x| (x * 100.) as u32);
6767
let b = b.slice(s![.., ..;2]);
68-
bench.iter(|| b.iter().filter(|&&x| x < 75).fold(0, |acc, &x| acc + x));
68+
bench.iter(|| b.iter().filter(|&&x| x < 75).sum::<u32>());
6969
}
7070

7171
#[bench]
7272
fn iter_filter_sum_2d_stride_f32(bench: &mut Bencher) {
7373
let a = Array::linspace(0., 1., 256).into_shape((16, 16)).unwrap();
7474
let b = a * 100.;
7575
let b = b.slice(s![.., ..;2]);
76-
bench.iter(|| b.iter().filter(|&&x| x < 75.).fold(0., |acc, &x| acc + x));
76+
bench.iter(|| b.iter().filter(|&&x| x < 75.).sum::<f32>());
7777
}
7878

7979
const ZIPSZ: usize = 10_000;
@@ -196,7 +196,7 @@ fn vector_sum_3_zip_unchecked_manual(bench: &mut Bencher) {
196196
let mut ap = a.as_ptr();
197197
let mut bp = b.as_ptr();
198198
let mut cp = c.as_mut_ptr();
199-
let cend = cp.offset(c.len() as isize);
199+
let cend = cp.add(c.len());
200200
while cp != cend {
201201
*cp.post_inc() += *ap.post_inc() + *bp.post_inc();
202202
}
@@ -316,7 +316,7 @@ fn indexed_iter_3d_dyn(bench: &mut Bencher) {
316316
fn iter_sum_1d_strided_fold(bench: &mut Bencher) {
317317
let mut a = Array::<u64, _>::ones(10240);
318318
a.slice_axis_inplace(Axis(0), Slice::new(0, None, 2));
319-
bench.iter(|| a.iter().fold(0, |acc, &x| acc + x));
319+
bench.iter(|| a.iter().sum::<u64>());
320320
}
321321

322322
#[bench]

src/data_traits.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ pub unsafe trait DataMut: Data + RawDataMut {
133133
/// accessed with safe code.
134134
///
135135
/// ***Internal trait, see `Data`.***
136-
#[deprecated(note = "use `Data + RawDataClone` instead", since = "0.13")]
136+
#[deprecated(note = "use `Data + RawDataClone` instead", since = "0.13.0")]
137137
pub trait DataClone: Data + RawDataClone {}
138138

139139
#[allow(deprecated)]

src/dimension/mod.rs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -266,13 +266,11 @@ pub trait DimensionExt {
266266
/// Get the dimension at `axis`.
267267
///
268268
/// *Panics* if `axis` is out of bounds.
269-
#[inline]
270269
fn axis(&self, axis: Axis) -> Ix;
271270

272271
/// Set the dimension at `axis`.
273272
///
274273
/// *Panics* if `axis` is out of bounds.
275-
#[inline]
276274
fn set_axis(&mut self, axis: Axis, value: Ix);
277275
}
278276

tests/array.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -527,6 +527,7 @@ fn test_index_arrays() {
527527
}
528528

529529
#[test]
530+
#[allow(clippy::assign_op_pattern)]
530531
fn test_add() {
531532
let mut A = ArcArray::<usize, _>::zeros((2, 2));
532533
for (i, elt) in A.iter_mut().enumerate() {

0 commit comments

Comments
 (0)