Skip to content

Commit

Permalink
Merge branch 'multiformats:master' into arbitrary-codetable
Browse files Browse the repository at this point in the history
  • Loading branch information
expede authored Jun 26, 2024
2 parents 483d87a + 1c63fb1 commit eb2989f
Show file tree
Hide file tree
Showing 5 changed files with 15 additions and 7 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
uses: actions/checkout@v4

- name: Cache Dependencies & Build Outputs
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: ~/.cargo
key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}
Expand Down Expand Up @@ -110,7 +110,7 @@ jobs:
run: cargo tarpaulin --verbose --all-features --workspace --timeout 120 --out Xml

- name: Upload Code Coverage
uses: codecov/codecov-action@v3
uses: codecov/codecov-action@v4

cargo-deny:
name: Cargo Deny
Expand Down
2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ parity-scale-codec = { version = "3.0.0", default-features = false, features = [
quickcheck = { version = "1.0.3", optional = true }
rand = { version = "0.8.5", optional = true, features = ["small_rng"] }
serde = { version = "1.0.116", optional = true, default-features = false }
unsigned-varint = { version = "0.7.1", default-features = false }
unsigned-varint = { version = "0.8.0", default-features = false }
arbitrary = { version = "1.1.0", optional = true }

core2 = { version = "0.4.0", default-features = false }
Expand Down
2 changes: 1 addition & 1 deletion codetable/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ arbitrary = { version = "1.3.2", default-features = false, optional = true, feat

[dev-dependencies]
hex = "0.4.2"
unsigned-varint = { version = "0.7.1", default-features = false }
unsigned-varint = { version = "0.8.0", default-features = false }
criterion = "0.5.1"
rand = "0.8.5"

Expand Down
2 changes: 1 addition & 1 deletion derive-impl/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ proc-macro = true

[dependencies]
proc-macro2 = { version = "1.0.24", features = ["span-locations"] }
proc-macro-crate = "2.0.0"
proc-macro-crate = "3.1.0"
proc-macro-error = "1.0.4"
quote = "1.0.7"
syn = "2.0.66"
Expand Down
12 changes: 10 additions & 2 deletions derive-impl/src/utils.rs
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,12 @@ pub fn use_crate(name: &str) -> Result<syn::Ident, Error> {
}

#[derive(Debug)]
pub struct Attrs<A> {
pub(crate) struct Attrs<A> {
// The information is part of the parsed AST, we preserve it even if it isn't used yet.
#[allow(dead_code)]
pub ident: syn::Ident,
// The information is part of the parsed AST, we preserve it even if it isn't used yet.
#[allow(dead_code)]
pub paren: syn::token::Paren,
pub attrs: Punctuated<A, syn::token::Comma>,
}
Expand All @@ -35,8 +39,12 @@ impl<A: Parse> Parse for Attrs<A> {
}

#[derive(Debug)]
pub struct Attr<K, V> {
pub(crate) struct Attr<K, V> {
// The information is part of the parsed AST, we preserve it even if it isn't used yet.
#[allow(dead_code)]
pub key: K,
// The information is part of the parsed AST, we preserve it even if it isn't used yet.
#[allow(dead_code)]
pub eq: syn::token::Eq,
pub value: V,
}
Expand Down

0 comments on commit eb2989f

Please sign in to comment.