Adopt the same rustfmt config as rust

Author: smu160

.github/workflows/rust.yml

@@ -1,4 +1,4 @@
-on: [ push, pull_request ]
+on: [push, pull_request]
 
 name: Build
 

benches/bench.rs

@@ -1,12 +1,14 @@
 use criterion::{criterion_group, criterion_main, BatchSize, BenchmarkId, Criterion, Throughput};
 use num_traits::Float;
+use phastft::options::Options;
+use phastft::planner::{Direction, Planner32, Planner64, PlannerDit32, PlannerDit64};
 use phastft::{
     fft_32_dit_with_planner_and_opts, fft_32_with_opts_and_plan, fft_64_dit_with_planner_and_opts,
     fft_64_with_opts_and_plan,
-    options::Options,
-    planner::{Direction, Planner32, Planner64, PlannerDit32, PlannerDit64},
 };
-use rand::{distr::StandardUniform, prelude::Distribution, rng, Rng};
+use rand::distr::StandardUniform;
+use rand::prelude::Distribution;
+use rand::{rng, Rng};
 use utilities::rustfft::num_complex::Complex;
 use utilities::rustfft::FftPlanner;
 

examples/benchmark.rs

@@ -1,9 +1,9 @@
-use phastft::fft_64_dit_with_planner;
-use phastft::fft_64_with_opts_and_plan;
-use phastft::options::Options;
-use phastft::planner::{Direction, Planner64, PlannerDit64};
 use std::env;
 use std::str::FromStr;
+
+use phastft::options::Options;
+use phastft::planner::{Direction, Planner64, PlannerDit64};
+use phastft::{fft_64_dit_with_planner, fft_64_with_opts_and_plan};
 use utilities::gen_random_signal;
 
 fn benchmark_fft_64(n: usize) {

examples/benchmark_dit_planner.rs

@@ -1,8 +1,8 @@
-use phastft::fft_64_dit;
-use phastft::fft_64_dit_with_planner;
-use phastft::planner::{Direction, PlannerDit64};
 use std::env;
 use std::str::FromStr;
+
+use phastft::planner::{Direction, PlannerDit64};
+use phastft::{fft_64_dit, fft_64_dit_with_planner};
 use utilities::gen_random_signal;
 
 fn benchmark_dit_with_planner(n: usize, iterations: usize) {

examples/bit_reversal_control.rs

@@ -1,8 +1,6 @@
-use phastft::{
-    fft_64, fft_64_dit, fft_64_with_opts_and_plan,
-    options::Options,
-    planner::{Direction, Planner64},
-};
+use phastft::options::Options;
+use phastft::planner::{Direction, Planner64};
+use phastft::{fft_64, fft_64_dit, fft_64_with_opts_and_plan};
 
 /// This example demonstrates the bit reversal behavior of DIF and DIT FFT algorithms
 /// and how to control bit reversal in DIF FFT.

examples/fftwrb.rs

@@ -1,11 +1,12 @@
-use std::{env, ptr::slice_from_raw_parts_mut, str::FromStr};
+use std::env;
+use std::ptr::slice_from_raw_parts_mut;
+use std::str::FromStr;
 
-use fftw::{
-    array::AlignedVec,
-    plan::{C2CPlan, C2CPlan64},
-    types::{Flag, Sign},
-};
-use utilities::{gen_random_signal, rustfft::num_complex::Complex};
+use fftw::array::AlignedVec;
+use fftw::plan::{C2CPlan, C2CPlan64};
+use fftw::types::{Flag, Sign};
+use utilities::gen_random_signal;
+use utilities::rustfft::num_complex::Complex;
 
 fn benchmark_fftw(n: usize) {
     let big_n = 1 << n;

examples/profile.rs

@@ -1,11 +1,10 @@
 use std::env;
 use std::str::FromStr;
 
-use utilities::gen_random_signal;
-
 use phastft::options::Options;
 use phastft::planner::{Direction, Planner64};
 use phastft::{fft_64_dit, fft_64_with_opts_and_plan};
+use utilities::gen_random_signal;
 
 fn benchmark_fft_64(n: usize) {
     let big_n = 1 << n;

examples/rustfft.rs

@@ -1,10 +1,9 @@
 use std::env;
 use std::str::FromStr;
 
-use utilities::{
-    gen_random_signal,
-    rustfft::{num_complex::Complex64, FftPlanner},
-};
+use utilities::gen_random_signal;
+use utilities::rustfft::num_complex::Complex64;
+use utilities::rustfft::FftPlanner;
 
 fn benchmark_rustfft(n: usize) {
     let big_n = 1 << n;

hooks/pre-commit

@@ -2,23 +2,20 @@
 
 set -eu
 
-if ! cargo fmt --all -- --check
-then
-    echo "There are some code style issues."
-    echo "Run cargo fmt first."
-    exit 1
+if ! cargo +nightly fmt --all -- --check; then
+  echo "There are some code style issues."
+  echo "Run cargo fmt first."
+  exit 1
 fi
 
-if ! cargo clippy --all-targets --all-features --tests -- -D warnings 
-then
-    echo "There are some clippy issues."
-    exit 1
+if ! cargo clippy --all-targets --all-features --tests -- -D warnings; then
+  echo "There are some clippy issues."
+  exit 1
 fi
 
-if ! cargo test --all-features
-then
-    echo "There are some test issues."
-    exit 1
+if ! cargo test --all-features; then
+  echo "There are some test issues."
+  exit 1
 fi
 
 exit 0

src/lib.rs

@@ -11,8 +11,6 @@
 #![feature(portable_simd)]
 #![feature(doc_cfg)]
 
-#[cfg(feature = "complex-nums")]
-use crate::utils::{combine_re_im, deinterleave_complex32, deinterleave_complex64};
 #[cfg(feature = "complex-nums")]
 use num_complex::Complex;
 
@@ -27,6 +25,8 @@ use crate::kernels::{
 use crate::options::Options;
 use crate::planner::{Direction, Planner32, Planner64, PlannerDit32, PlannerDit64};
 use crate::twiddles::filter_twiddles;
+#[cfg(feature = "complex-nums")]
+use crate::utils::{combine_re_im, deinterleave_complex32, deinterleave_complex64};
 
 pub mod cobra;
 mod kernels;