clippy + update ci (#137)

Author: kaplanelad

.github/workflows/ci.yaml

@@ -12,55 +12,23 @@ on:
       - 'docs/**'
       - '**.md'
 
+env:
+  RUST_TOOLCHAIN: stable
+
 jobs:
   check:
     name: Check
     runs-on: ubuntu-latest
     steps:
       - name: Checkout sources
         uses: actions/checkout@v2
-
-      - name: Run cargo check
-        uses: actions-rs/cargo@v1
+      
+      - uses: dtolnay/rust-toolchain@stable
         with:
-          command: check
-
-  # coverage:
-  #   name: Coverage
-  #   strategy:
-  #     matrix:
-  #       os: [ubuntu-latest]
-  #       rust: [stable]
-  #   runs-on: ${{ matrix.os }}
-  #   steps:
-  #     - name: Checkout sources
-  #       uses: actions/checkout@v2
-
-  #     - name: Install stable toolchain
-  #       uses: actions-rs/toolchain@v1
-  #       with:
-  #         toolchain: ${{ matrix.rust }}
-  #         override: true
-  #         components: llvm-tools-preview
+          toolchain: ${{ env.RUST_TOOLCHAIN }}
 
-  #     - uses: Swatinem/rust-cache@v1
-
-  #     - name: Download grcov
-  #       run: |
-  #         mkdir -p "${HOME}/.local/bin"
-  #         curl -sL https://github.com/mozilla/grcov/releases/download/v0.8.10/grcov-x86_64-unknown-linux-gnu.tar.bz2 | tar jxf - -C "${HOME}/.local/bin"
-  #         echo "$HOME/.local/bin" >> $GITHUB_PATH
-  #     - name: Run xtask coverage
-  #       uses: actions-rs/cargo@v1
-  #       with:
-  #         command: xtask
-  #         args: coverage
-
-
-  #     - name: Upload to codecov.io
-  #       uses: codecov/codecov-action@v3
-  #       with:
-  #         files: coverage/*.lcov
+      - name: Run cargo check
+        run: cargo check
 
   test:
     name: Test Suite
@@ -74,20 +42,14 @@ jobs:
       - name: Checkout sources
         uses: actions/checkout@v2
 
-      - name: Install stable toolchain
-        uses: actions-rs/toolchain@v1
+      - uses: dtolnay/rust-toolchain@stable
         with:
-          profile: minimal
-          toolchain: stable
-          override: true
+          toolchain: ${{ env.RUST_TOOLCHAIN }}
 
       - uses: Swatinem/rust-cache@v1
 
       - name: Run test
-        uses: actions-rs/cargo@v1
-        with:
-          command: xtask
-          args: test
+        run: cargo test
 
   clippy:
     name: clippy
@@ -96,40 +58,12 @@ jobs:
       - name: Checkout sources
         uses: actions/checkout@v2
 
-      - name: Install stable toolchain
-        uses: actions-rs/toolchain@v1
+      - uses: dtolnay/rust-toolchain@stable
         with:
-          profile: minimal
-          toolchain: stable
-          override: true
-          components: clippy
+          toolchain: ${{ env.RUST_TOOLCHAIN }}
 
       - name: Run clippy
-        uses: actions-rs/cargo@v1
-        with:
-          command: xtask
-          args: clippy
-
-  fmt:
-    name: fmt
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout sources
-        uses: actions/checkout@v2
-
-      - name: Install stable toolchain
-        uses: actions-rs/toolchain@v1
-        with:
-          profile: minimal
-          toolchain: stable
-          override: true
-          components: rustfmt
-
-      - name: Run fmt
-        uses: actions-rs/cargo@v1
-        with:
-          command: xtask
-          args: fmt
+        run: cargo clippy --all-features -- -D warnings -W clippy::pedantic -W clippy::nursery -W rust-2018-idioms
 
   docs:
     name: Docs
@@ -138,12 +72,10 @@ jobs:
     - name: Checkout repository
       uses: actions/checkout@v2
 
-    - name: Install Rust
-      uses: actions-rs/toolchain@v1
+    - uses: dtolnay/rust-toolchain@stable
       with:
-        toolchain: stable
-        profile: minimal
-        override: true
+        toolchain: ${{ env.RUST_TOOLCHAIN }}
+        
     - uses: Swatinem/rust-cache@v1
 
     - name: Check documentation

.github/workflows/release.yml

@@ -5,6 +5,7 @@ on:
     - 'v[0-9]+.[0-9]+.[0-9]+'
 
 env:
+  RUST_TOOLCHAIN: stable
   BIN_NAME: shellfirm
   PROJECT_NAME: shellfirm
   REPO_NAME: kaplanelad/shellfirm
@@ -53,27 +54,16 @@ jobs:
           submodules: true
 
       - name: Install ${{ matrix.rust }} toolchain
-        uses: actions-rs/toolchain@v1
+        uses: dtolnay/rust-toolchain@stable
         with:
-          profile: minimal
-          toolchain: ${{ matrix.rust }}
-          target: ${{ matrix.target }}
-          override: true
+          toolchain: ${{ env.RUST_TOOLCHAIN }}
 
       - name: Run cargo test
         if: matrix.build != 'aarch64-macos'
-        uses: actions-rs/cargo@v1
-        with:
-          use-cross: ${{ matrix.cross }}
-          command: test
-          args: --release --locked --target ${{ matrix.target }}
-
+        run: cargo test --release --locked --target ${{ matrix.target }} 
+       
       - name: Build release binary
-        uses: actions-rs/cargo@v1
-        with:
-          use-cross: ${{ matrix.cross }}
-          command: build
-          args: --release --locked --target ${{ matrix.target }}
+        run: cargo build --release --locked --target ${{ matrix.target }}
 
       - name: Strip release binary (linux and macos)
         if: matrix.build == 'x86_64-linux' || matrix.build == 'x86_64-macos' || matrix.build == 'aarch64-macos'

Cargo.lock

@@ -1,2 +1,2 @@
 [workspace]
-members = ["shellfirm", "xtask"]
+members = ["shellfirm"]

Cargo.toml

@@ -11,7 +11,7 @@ fn main() -> Result<()> {
     let dest_groups = Path::new(&out_dir).join("all_the_files.rs");
     let mut groups_names = File::create(dest_groups)?;
 
-    writeln!(&mut groups_names, r##"["##,)?;
+    writeln!(&mut groups_names, r"[",)?;
 
     let paths = fs::read_dir("./checks")?;
     let mut all_group_checks = String::new();
@@ -26,10 +26,10 @@ fn main() -> Result<()> {
             .unwrap()
             .to_str()
             .expect("could not get file name");
-        writeln!(&mut groups_names, r##""{file_name}","##)?;
+        writeln!(&mut groups_names, r#""{file_name}","#)?;
     }
 
-    writeln!(&mut groups_names, r##"]"##,)?;
+    writeln!(&mut groups_names, r"]",)?;
 
     let mut file = File::create(dest_checks_path)?;
     file.write_all(all_group_checks.as_bytes())?;

shellfirm/build.rs

@@ -187,8 +187,8 @@ fn filter_is_file_or_directory_exists(file_path: &str) -> bool {
     };
 
     log::debug!("check is {} path is exists", full_path);
-    return std::path::Path::new(full_path.trim()).exists()
-        || std::path::Path::new(full_path.trim()).is_dir();
+    std::path::Path::new(full_path.trim()).exists()
+        || std::path::Path::new(full_path.trim()).is_dir()
 }
 
 fn filter_is_command_contains_string(command: &str, filter_params: &str) -> bool {

shellfirm/src/checks.rs

@@ -317,7 +317,7 @@ impl Settings {
     }
 
     #[must_use]
-    pub fn get_active_groups(&self) -> &Vec<String> {
+    pub const fn get_active_groups(&self) -> &Vec<String> {
         &self.includes
     }
 }