Skip to content

Commit

Permalink
Upgrade versions of some dependencies (#1886)
Browse files Browse the repository at this point in the history
* Upgrade some code for MSRV 1.65

Now that our MSRV is 1.65, we can clean up some code.

Makes progress on #67

* Upgrade versions of some dependencies

Now that our MSRV is 1.65, it unlocks upgrading some dependencies'
versions.
  • Loading branch information
joshlf authored Oct 12, 2024
1 parent 7349fe0 commit 19ab41c
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 17 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -191,7 +191,7 @@ jobs:
set -eo pipefail
# Override the exising `syn` dependency with one which requires an exact
# version.
cargo add -p zerocopy-derive 'syn@=2.0.46'
cargo add -p zerocopy-derive 'syn@=2.0.79'
- name: Configure environment variables
run: |
Expand Down Expand Up @@ -613,7 +613,7 @@ jobs:
#
# TODO(#1595): Debug why this step is still necessary after #1564 and
# maybe remove it.
cargo add -p zerocopy-derive 'syn@=2.0.46' &> /dev/null
cargo add -p zerocopy-derive 'syn@=2.0.79' &> /dev/null
cargo check --workspace --tests &> /dev/null &
cargo metadata &> /dev/null &
Expand Down
8 changes: 4 additions & 4 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -71,16 +71,16 @@ zerocopy-derive = { version = "=0.9.0-alpha.0", path = "zerocopy-derive", option
zerocopy-derive = { version = "=0.9.0-alpha.0", path = "zerocopy-derive" }

[dev-dependencies]
itertools = "0.11"
itertools = "0.13.0"
rand = { version = "0.8.5", default-features = false, features = ["small_rng"] }
rustversion = "1.0"
static_assertions = "1.1"
rustversion = "1.0.17"
static_assertions = "1.1.0"
testutil = { path = "testutil" }
# Pinned to a specific version so that the version used for local development
# and the version used in CI are guaranteed to be the same. Future versions
# sometimes change the output format slightly, so a version mismatch can cause
# CI test failures.
trybuild = { version = "=1.0.89", features = ["diff"] }
trybuild = { version = "=1.0.90", features = ["diff"] }
# In tests, unlike in production, zerocopy-derive is not optional
zerocopy-derive = { version = "=0.9.0-alpha.0", path = "zerocopy-derive" }
# TODO(#381) Remove this dependency once we have our own layout gadgets.
Expand Down
16 changes: 5 additions & 11 deletions zerocopy-derive/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -32,23 +32,17 @@ proc-macro = true
[dependencies]
proc-macro2 = "1.0.1"
quote = "1.0.10"
syn = { version = "2.0.46", features = ["full"] }
syn = { version = "2.0.79", features = ["full"] }

[dev-dependencies]
dissimilar = "1.0.9"
# We don't use this directly, but trybuild does. On the MSRV toolchain, the
# version resolver fails to select any version for once_cell unless we
# depend on it directly.
once_cell = "=1.9"
# This is the latest version which is compatible with `syn` 2.0.46, which we pin
# to in CI for MSRV compatibility reasons.
prettyplease = "=0.2.17"
rustversion = "1.0"
static_assertions = "1.1"
prettyplease = "0.2.22"
rustversion = "1.0.17"
static_assertions = "1.1.0"
testutil = { path = "../testutil" }
# Pinned to a specific version so that the version used for local development
# and the version used in CI are guaranteed to be the same. Future versions
# sometimes change the output format slightly, so a version mismatch can cause
# CI test failures.
trybuild = { version = "=1.0.89", features = ["diff"] }
trybuild = { version = "=1.0.90", features = ["diff"] }
zerocopy = { path = "../", features = ["derive"] }

0 comments on commit 19ab41c

Please sign in to comment.