run cargo fmt and fix ci (#1)

* run cargo fmt and fix ci * remove miri and set MSRV to 1.76
joshainglis · Mar 11, 2024 · 75fac0b · 75fac0b
1 parent 67a90d6
commit 75fac0b
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 32 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -2,9 +2,9 @@ name: Cargo Build & Test
 
 on:
   push:
-    branches: [ master ]
+    branches: [ main ]
   pull_request:
-    branches: [ master ]
+    branches: [ main ]
 
 env:
   CARGO_TERM_COLOR: always
@@ -16,16 +16,13 @@ jobs:
     strategy:
       matrix:
         include:
-        - rust: 1.64.0  # MSRV
-        - rust: stable
-          features: unstable quickcheck rayon
-          test_all: --all
-        - rust: beta
-          test_all: --all
-        - rust: nightly
-          features: unstable quickcheck rayon
-          test_all: --all
-          bench: true
+          - rust: 1.76.0 # MSRV
+          - rust: stable
+            test_all: --all
+          - rust: beta
+            test_all: --all
+          - rust: nightly
+            test_all: --all
     steps:
       - uses: actions/checkout@v3
       - uses: actions-rs/toolchain@v1
@@ -35,17 +32,10 @@ jobs:
           override: true
       - name: Build
         run: |
-          cargo build --verbose --no-default-features
-          cargo build --verbose --features "${{ matrix.features }}"
+          cargo build --verbose
       - name: Tests
         run: |
-          cargo test --verbose --no-default-features
-          cargo test ${{ matrix.test_all }} --verbose --features "${{ matrix.features }}"
-      - name: Build benchmarks
-        if: ${{ matrix.bench }}
-        run: |
-          cargo bench --verbose --no-run
-          cargo bench --verbose --no-run --all-features
+          cargo test --verbose
 
   rustfmt:
     runs-on: ubuntu-latest
@@ -67,12 +57,3 @@ jobs:
       - name: Rustfmt
         if: matrix.rustfmt
         run: cargo fmt -- --check
-
-  miri:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v3
-      - uses: dtolnay/rust-toolchain@nightly
-        with:
-          components: miri
-      - run: cargo miri test
diff --git a/src/exceptions.rs b/src/exceptions.rs
@@ -1,6 +1,6 @@
-use std::{fmt, io};
 use std::error::Error;
 use std::path::PathBuf;
+use std::{fmt, io};
 
 #[derive(Debug)]
 pub enum TopCatError {

diff --git a/src/output.rs b/src/output.rs
@@ -152,7 +152,7 @@ mod tests {
         let d = append_string_to_file_content("SELECT 1 FROM table;".to_string(), ";");
         assert_eq!(d, "SELECT 1 FROM table;\n");
 
-        let d = append_string_to_file_content("SELECT 1 FROM table;\n\n\n".to_string(), "\\");
+        let d = append_string_to_file_content("SELECT 1 FROM table;\n\n\n".to_string(), ";");
         assert_eq!(d, "SELECT 1 FROM table;\n");
     }
 }