Skip to content

Commit

Permalink
Merge 31409a2 into bd352e5
Browse files Browse the repository at this point in the history
  • Loading branch information
sharksforarms authored May 21, 2024
2 parents bd352e5 + 31409a2 commit 532e6bb
Show file tree
Hide file tree
Showing 8 changed files with 39 additions and 33 deletions.
12 changes: 8 additions & 4 deletions .github/workflows/coverage.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,18 +8,22 @@ jobs:
env:
CARGO_TERM_COLOR: always
steps:
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
- uses: dtolnay/rust-toolchain@be73d7920c329f220ce78e0234b8f96b7ae60248 # master
- uses: actions/checkout@v4
- uses: dtolnay/rust-toolchain@master
with:
toolchain: stable

- name: Install cargo-llvm-cov
uses: taiki-e/install-action@e8c64729e2a2a2c3cfa6751fa496b34ca19f390c # cargo-llvm-cov
uses: taiki-e/install-action@v2
with:
tool: cargo-llvm-cov

- name: Generate code coverage
run: cargo llvm-cov --workspace --codecov --output-path codecov.json

- name: Upload coverage to Codecov
uses: codecov/codecov-action@eaaf4bedf32dbdc6b720b63067d99c4d77d6047d # v3.1.4
uses: codecov/codecov-action@v4
with:
token: ${{ secrets.CODECOV_TOKEN }}
files: codecov.json
fail_ci_if_error: true
22 changes: 11 additions & 11 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ jobs:
- stable

steps:
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
- uses: dtolnay/rust-toolchain@be73d7920c329f220ce78e0234b8f96b7ae60248 # master
- uses: actions/checkout@v4
- uses: dtolnay/rust-toolchain@master
with:
toolchain: ${{ matrix.toolchain }}

Expand All @@ -30,11 +30,11 @@ jobs:
matrix:
toolchain:
# msrv
- 1.67.1
- 1.71

steps:
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
- uses: dtolnay/rust-toolchain@be73d7920c329f220ce78e0234b8f96b7ae60248 # master
- uses: actions/checkout@v4
- uses: dtolnay/rust-toolchain@master
with:
toolchain: ${{ matrix.toolchain }}

Expand All @@ -44,8 +44,8 @@ jobs:
fmt-clippy-check:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
- uses: dtolnay/rust-toolchain@be73d7920c329f220ce78e0234b8f96b7ae60248 # master
- uses: actions/checkout@v4
- uses: dtolnay/rust-toolchain@master
with:
toolchain: stable

Expand All @@ -56,8 +56,8 @@ jobs:
name: Ensure no_std
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
- uses: dtolnay/rust-toolchain@be73d7920c329f220ce78e0234b8f96b7ae60248 # master
- uses: actions/checkout@v4
- uses: dtolnay/rust-toolchain@master
with:
toolchain: nightly
targets: thumbv7em-none-eabihf
Expand All @@ -67,8 +67,8 @@ jobs:
name: Ensure wasm
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
- uses: dtolnay/rust-toolchain@be73d7920c329f220ce78e0234b8f96b7ae60248 # master
- uses: actions/checkout@v4
- uses: dtolnay/rust-toolchain@master
with:
toolchain: nightly
- uses: jetli/wasm-pack-action@v0.3.0
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/pull_request.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,13 @@ jobs:
name: Benchmark
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
- uses: actions/checkout@v4
with:
fetch-depth: 0
- uses: dtolnay/rust-toolchain@be73d7920c329f220ce78e0234b8f96b7ae60248 # master
- uses: dtolnay/rust-toolchain@master
with:
toolchain: stable
- uses: boa-dev/criterion-compare-action@adfd3a94634fe2041ce5613eb7df09d247555b87 # v3.2.4
- uses: boa-dev/criterion-compare-action@v3
with:
branchName: ${{ github.base_ref }}
token: ${{ secrets.GITHUB_TOKEN }}
18 changes: 9 additions & 9 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ keywords = ["deku", "bits", "serialization", "deserialization", "struct"]
categories = ["encoding", "parsing", "no-std"]
description = "bit level serialization/deserialization proc-macro for structs"
readme = "README.md"
rust-version = "1.67.1"
rust-version = "1.71"

[lib]
bench = false
Expand All @@ -29,19 +29,19 @@ no-assert-string = ["deku_derive/no-assert-string"]
[dependencies]
deku_derive = { version = "^0.16.0", path = "deku-derive", default-features = false}
bitvec = { version = "1.0.1", default-features = false }
log = { version = "0.4.17", optional = true }
no_std_io = { version = "0.5.0", default-features = false, features = ["alloc"] }
rustversion = "1.0.15"
log = { version = "0.4.21", optional = true }
no_std_io = { version = "0.6.0", default-features = false, features = ["alloc"] }
rustversion = "1.0.16"

[dev-dependencies]
rstest = "0.18.0"
rstest = "0.19.0"
hexlit = "0.5.5"
criterion = "0.4.0"
criterion = "0.5.1"
alloc_counter = "0.0.4"
trybuild = "1.0.77"
trybuild = "1.0.95"
rustc-hash = "1.1.0"
env_logger = "0.10.0"
assert_hex = "0.2.2"
env_logger = "0.11.3"
assert_hex = "0.4.1"

[[bench]]
name = "deku"
Expand Down
4 changes: 2 additions & 2 deletions deku-derive/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ syn = "2.0"
# syn = {version = "1.0", features = ["extra-traits"]}
proc-macro2 = "1.0"
darling = "0.20"
proc-macro-crate = { version = "1.3.0", optional = true }
proc-macro-crate = { version = "3.1.0", optional = true }

[dev-dependencies]
rstest = "0.18"
rstest = "0.19"
6 changes: 4 additions & 2 deletions deku-derive/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -269,12 +269,14 @@ impl DekuData {

/// Emit a reader. On error, a compiler error is emitted
fn emit_reader(&self) -> TokenStream {
self.emit_reader_checked().unwrap_or_else(|e| e.to_compile_error())
self.emit_reader_checked()
.unwrap_or_else(|e| e.to_compile_error())
}

/// Emit a writer. On error, a compiler error is emitted
fn emit_writer(&self) -> TokenStream {
self.emit_writer_checked().unwrap_or_else(|e| e.to_compile_error())
self.emit_writer_checked()
.unwrap_or_else(|e| e.to_compile_error())
}

/// Same as `emit_reader`, but won't auto convert error to compile error
Expand Down
2 changes: 1 addition & 1 deletion ensure_no_std/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -21,5 +21,5 @@ alloc = []
[dependencies]
cortex-m-rt = "0.7.3"
deku = { path = "../", default-features = false, features = ["alloc"] }
embedded-alloc = "0.5.0"
embedded-alloc = "0.5.1"

2 changes: 1 addition & 1 deletion ensure_wasm/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ crate-type = ["cdylib", "rlib"]
default = ["console_error_panic_hook", "wee_alloc"]

[dependencies]
wasm-bindgen = "0.2.73"
wasm-bindgen = "0.2.92"

# The `console_error_panic_hook` crate provides better debugging of panics by
# logging them with `console.error`. This is great for development, but requires
Expand Down

0 comments on commit 532e6bb

Please sign in to comment.