Compare commits

...

6 Commits
v0.2.3 ... main

Author SHA1 Message Date
087fdc7ea5
ci: update publish workflow
Some checks failed
CI / build-and-test (push) Has been cancelled
2025-09-25 11:12:43 +03:00
523cf95b6b
fix: clippy errors 2025-09-25 11:01:22 +03:00
b900680235
ci: change rust toolchain 2025-09-25 10:53:26 +03:00
0b9994a689
fix: typo 2025-09-25 10:45:02 +03:00
6f60d8f5f1
ci: update CI workflows 2025-09-25 10:43:12 +03:00
e20000513a
refactor: add better messages
Some checks failed
CI / Tests (push) Has been cancelled
CI / Clippy (push) Has been cancelled
CI / Format (push) Has been cancelled
CI / Docs (push) Has been cancelled
2025-08-12 00:04:09 +03:00
12 changed files with 127 additions and 127 deletions

View File

@ -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

View File

@ -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

46
Cargo.lock generated
View File

@ -58,6 +58,7 @@ dependencies = [
"serde_json",
"tempfile",
"toml",
"trybuild",
]
[[package]]
@ -87,6 +88,12 @@ dependencies = [
"wasi",
]
[[package]]
name = "glob"
version = "0.3.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0cc23270f6e1808e30a928bdc84dea0b9b4136a8bc82338574f23baf47bbd280"
[[package]]
name = "hashbrown"
version = "0.15.4"
@ -281,6 +288,12 @@ dependencies = [
"unicode-ident",
]
[[package]]
name = "target-triple"
version = "0.1.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1ac9aa371f599d22256307c24a9d748c041e548cbf599f35d890f9d365361790"
[[package]]
name = "tempfile"
version = "3.20.0"
@ -294,6 +307,15 @@ dependencies = [
"windows-sys 0.59.0",
]
[[package]]
name = "termcolor"
version = "1.4.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "06794f8f6c5c898b3275aebefa6b8a1cb24cd2c6c79397ab15774837a0bc5755"
dependencies = [
"winapi-util",
]
[[package]]
name = "toml"
version = "0.9.2"
@ -333,6 +355,21 @@ version = "1.0.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "fcc842091f2def52017664b53082ecbbeb5c7731092bad69d2c63050401dfd64"
[[package]]
name = "trybuild"
version = "1.0.110"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "32e257d7246e7a9fd015fb0b28b330a8d4142151a33f03e6a497754f4b1f6a8e"
dependencies = [
"glob",
"serde",
"serde_derive",
"serde_json",
"target-triple",
"termcolor",
"toml",
]
[[package]]
name = "unicode-ident"
version = "1.0.18"
@ -348,6 +385,15 @@ dependencies = [
"wit-bindgen-rt",
]
[[package]]
name = "winapi-util"
version = "0.1.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "cf221c93e13a30d793f7645a0e7762c55d169dbb0a49671918a2319d289b10bb"
dependencies = [
"windows-sys 0.59.0",
]
[[package]]
name = "windows-sys"
version = "0.59.0"

View File

@ -12,6 +12,7 @@ claims = "0.8"
serde_json = "1.0"
tempfile = "3.10"
toml = "0.9"
trybuild = "1.0"
[workspace.lints.clippy]
pedantic = "warn"

View File

@ -60,12 +60,14 @@ fn extract_named_fields(input: &DeriveInput) -> Result<&FieldsNamed> {
Fields::Named(fields) => Ok(fields),
_ => Err(Error::new_spanned(
&input.ident,
"FromFile can only be derived for structs with named fields",
r#"FromFile only works on structs with *named* fields.
Tuple structs and unit structs are not supported."#,
)),
},
_ => Err(Error::new_spanned(
&input.ident,
"FromFile can only be derived for structs",
r#"FromFile only works on structs.
Enums are not supported."#,
)),
}
}
@ -172,14 +174,14 @@ 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 {
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);
}
Ok(())

View File

@ -28,3 +28,4 @@ merge = { workspace = true, optional = true }
serde_json.workspace = true
tempfile.workspace = true
toml.workspace = true
trybuild.workspace = true

View File

@ -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);
}

7
filecaster/tests/ui.rs Normal file
View File

@ -0,0 +1,7 @@
use trybuild::TestCases;
#[test]
fn ui() {
let t = TestCases::new();
t.compile_fail("tests/ui/*.rs");
}

View File

@ -0,0 +1,9 @@
use filecaster::FromFile;
#[derive(FromFile)]
enum MyEnum {
A,
B,
}
fn main() {}

View File

@ -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 {
| ^^^^^^

View File

@ -0,0 +1,6 @@
use filecaster::FromFile;
#[derive(FromFile)]
struct MyTuple(i32, String);
fn main() {}

View File

@ -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);
| ^^^^^^^