ci: update publish workflow

.github/workflows/ci.yml

@@ -9,112 +9,30 @@ env:
   RUSTFLAGS: --deny warnings
   RUSTDOCFLAGS: --deny warnings
 jobs:
-  # Run tests
-  test:
-    name: Tests
+  build-and-test:
     runs-on: ubuntu-latest
-    timeout-minutes: 30
+    env:
+      SCCACHE_GHA_ENABLED: "true"
+      RUSTC_WRAPPER: "sccache"
     steps:
-      - name: Checkout repository
-        uses: actions/checkout@v4
-      - name: Install Rust toolchain
+      - name: Checkout code
+        uses: actions/checkout@v5
+      - name: Install Rust
         uses: dtolnay/rust-toolchain@stable
-      - name: Install dependencies
-        run: |
-          sudo apt-get update
-          sudo apt-get install --no-install-recommends \
-            libasound2-dev libudev-dev libwayland-dev \
-            libxkbcommon-dev
-      - name: Populate target directory from cache
-        uses: Leafwing-Studios/cargo-cache@v2
         with:
-          sweep-cache: true
+          toolchain: stable
+          components: clippy, rustfmt
+      - name: Run sccache-cache
+        uses: mozilla-actions/sccache-action@v0.0.9
       - name: Install cargo-nextest
-        run: cargo install cargo-nextest --locked
-      - name: Run tests with nextest
+        uses: taiki-e/install-action@cargo-nextest
+      - name: Run Clippy
+        run: cargo clippy --locked --workspace --all-targets --all-features -- -D warnings
+      - name: Run formatting
+        run: cargo fmt --all --check
+      - name: Run Tests
         run: |
-          cargo nextest run \
-            --all-features \
-            --all-targets
-          # Workaround for https://github.com/rust-lang/cargo/issues/6669
-          cargo test \
-            --locked \
-            --workspace \
-            --all-features \
-            --doc
-  # Run clippy lints
-  clippy:
-    name: Clippy
-    runs-on: ubuntu-latest
-    timeout-minutes: 30
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v4
-      - name: Install Rust toolchain
-        uses: dtolnay/rust-toolchain@stable
-        with:
-          components: clippy
-      - name: Install dependencies
-        run: |
-          sudo apt-get update
-          sudo apt-get install --no-install-recommends \
-            libasound2-dev libudev-dev libwayland-dev \
-            libxkbcommon-dev
-      - name: Populate target directory from cache
-        uses: Leafwing-Studios/cargo-cache@v2
-        with:
-          sweep-cache: true
-      - name: Run clippy lints
-        run: |
-          cargo clippy \
-            --locked \
-            --workspace \
-            --all-features \
-            -- \
-            --deny warnings
-  # Check formatting
-  format:
-    name: Format
-    runs-on: ubuntu-latest
-    timeout-minutes: 30
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v4
-      - name: Install Rust toolchain
-        uses: dtolnay/rust-toolchain@stable
-        with:
-          components: rustfmt
-      - name: Run cargo fmt
-        run: |
-          cargo fmt \
-            --all \
-            -- \
-            --check
-  # Check documentation
-  doc:
-    name: Docs
-    runs-on: ubuntu-latest
-    timeout-minutes: 30
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v4
-      - name: Install Rust toolchain
-        uses: dtolnay/rust-toolchain@stable
-      - name: Install dependencies
-        run: |
-          sudo apt-get update
-          sudo apt-get install --no-install-recommends \
-            libasound2-dev libudev-dev libwayland-dev \
-            libxkbcommon-dev
-      - name: Populate target directory from cache
-        uses: Leafwing-Studios/cargo-cache@v2
-        with:
-          sweep-cache: true
-      - name: Check documentation
-        run: |
-          cargo doc \
-            --locked \
-            --workspace \
-            --all-features \
-            --document-private-items \
-            --no-deps
+          cargo nextest run --all-features --all-targets
+          cargo test --locked --workspace --all-features --doc
+      - name: Check Documentation
+        run: cargo doc --locked --workspace --all-features --document-private-items --no-deps

.github/workflows/publish.yml

@@ -15,10 +15,9 @@ on:
 jobs:
   audit:
     name: Audit
-    runs-on: ubuntu-latest
     timeout-minutes: 10
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - uses: actions-rust-lang/audit@v1
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
@@ -28,11 +27,17 @@ jobs:
       - audit
     runs-on: ubuntu-latest
     timeout-minutes: 25
+    env:
+      SCCACHE_GHA_ENABLED: "true"
+      RUSTC_WRAPPER: "sccache"
     steps:
-      - uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
+      - uses: actions/checkout@v5
       - uses: dtolnay/rust-toolchain@stable
+        with:
+          toolchain: stable
+          components: clippy, rustfmt
+      - name: Run sccache-cache
+        uses: mozilla-actions/sccache-action@v0.0.9
       - name: cargo-release Cache
         id: cargo_release_cache
         uses: actions/cache@v4
@@ -60,11 +65,4 @@ jobs:
         # to the tag while building, which is a detached head
 
         run: |
-          cargo release \
-            publish \
-            --workspace \
-            --all-features \
-            --allow-branch HEAD \
-            --no-confirm \
-            --no-verify \
-            --execute
+          cargo release publish --workspace --all-features --allow-branch HEAD --no-confirm --no-verify --execute

filecaster-derive/src/from_file.rs

@@ -174,13 +174,13 @@ fn parse_default(list: &MetaList) -> Result<Option<Expr>> {
             let value = meta.value()?;
             let expr = value.parse::<Expr>()?;
 
-            if let Expr::Lit(expr_lit) = &expr {
-                if let Lit::Str(lit_str) = &expr_lit.lit {
-                    default_expr = Some(parse_quote! {
-                        #lit_str.to_string()
-                    });
-                    return Ok(());
-                }
+            if let Expr::Lit(expr_lit) = &expr
+                && let Lit::Str(lit_str) = &expr_lit.lit
+            {
+                default_expr = Some(parse_quote! {
+                    #lit_str.to_string()
+                });
+                return Ok(());
             }
             default_expr = Some(expr);
         }

filecaster/examples/simple.rs

@@ -40,9 +40,9 @@ fn main() {
     // Example assertions (adjust based on your actual file contents)
     assert_eq!(json_data.key, "json key".to_string());
     assert_eq!(json_data.number, 123);
-    assert_eq!(json_data.exists, false); // `bool::default()` is `false`
+    assert!(!json_data.exists); // `bool::default()` is `false`
 
     assert_eq!(toml_data.key, "default key".to_string());
     assert_eq!(toml_data.number, 456);
-    assert_eq!(toml_data.exists, true);
+    assert!(toml_data.exists);
 }

filecaster/tests/ui/enum_not_supported.stderr

@@ -0,0 +1,6 @@
+error: FromFile only works on structs.
+       Enums are not supported.
+ --> tests/ui/enum_not_supported.rs:4:6
+  |
+4 | enum MyEnum {
+  |      ^^^^^^

filecaster/tests/ui/invalid_attr.rs

@@ -1,9 +0,0 @@
-use filecaster::FromFile;
-
-#[derive(FromFile)]
-struct MyStruct {
-    #[from_file(unknown)]
-    field: i32,
-}
-
-fn main() {}

filecaster/tests/ui/tuple_struct_not_supported.stderr

@@ -0,0 +1,6 @@
+error: FromFile only works on structs with *named* fields.
+       Tuple structs and unit structs are not supported.
+ --> tests/ui/tuple_struct_not_supported.rs:4:8
+  |
+4 | struct MyTuple(i32, String);
+  |        ^^^^^^^