Skip to content

Commit b417e93

Browse files
authored
Merge pull request #1375 from rust-ndarray/rustfmt2
Add rustformat config and CI
2 parents 5465bc4 + d07f5f3 commit b417e93

File tree

138 files changed

+5042
-3834
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

138 files changed

+5042
-3834
lines changed

.github/workflows/ci.yaml

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,22 @@ jobs:
2626
components: clippy
2727
- uses: Swatinem/rust-cache@v2
2828
- run: cargo clippy --features docs
29+
30+
format:
31+
runs-on: ubuntu-latest
32+
strategy:
33+
matrix:
34+
rust:
35+
- nightly
36+
name: format/${{ matrix.rust }}
37+
steps:
38+
- uses: actions/checkout@v4
39+
- uses: dtolnay/rust-toolchain@master
40+
with:
41+
toolchain: ${{ matrix.rust }}
42+
components: rustfmt
43+
- run: cargo fmt --all --check
44+
2945
tests:
3046
runs-on: ubuntu-latest
3147
strategy:
@@ -103,6 +119,7 @@ jobs:
103119
conclusion:
104120
needs:
105121
- clippy
122+
# - format # should format be required?
106123
- tests
107124
- cross_test
108125
- cargo-careful

benches/append.rs

Lines changed: 9 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -6,30 +6,27 @@ use test::Bencher;
66
use ndarray::prelude::*;
77

88
#[bench]
9-
fn select_axis0(bench: &mut Bencher) {
9+
fn select_axis0(bench: &mut Bencher)
10+
{
1011
let a = Array::<f32, _>::zeros((256, 256));
1112
let selectable = vec![0, 1, 2, 0, 1, 3, 0, 4, 16, 32, 128, 147, 149, 220, 221, 255, 221, 0, 1];
12-
bench.iter(|| {
13-
a.select(Axis(0), &selectable)
14-
});
13+
bench.iter(|| a.select(Axis(0), &selectable));
1514
}
1615

1716
#[bench]
18-
fn select_axis1(bench: &mut Bencher) {
17+
fn select_axis1(bench: &mut Bencher)
18+
{
1919
let a = Array::<f32, _>::zeros((256, 256));
2020
let selectable = vec![0, 1, 2, 0, 1, 3, 0, 4, 16, 32, 128, 147, 149, 220, 221, 255, 221, 0, 1];
21-
bench.iter(|| {
22-
a.select(Axis(1), &selectable)
23-
});
21+
bench.iter(|| a.select(Axis(1), &selectable));
2422
}
2523

2624
#[bench]
27-
fn select_1d(bench: &mut Bencher) {
25+
fn select_1d(bench: &mut Bencher)
26+
{
2827
let a = Array::<f32, _>::zeros(1024);
2928
let mut selectable = (0..a.len()).step_by(17).collect::<Vec<_>>();
3029
selectable.extend(selectable.clone().iter().rev());
3130

32-
bench.iter(|| {
33-
a.select(Axis(0), &selectable)
34-
});
31+
bench.iter(|| a.select(Axis(0), &selectable));
3532
}

0 commit comments

Comments
 (0)