Skip to content

Commit

Permalink
v1.16: Bump and unpin tokio (backport of solana-labs#32430)
Browse files Browse the repository at this point in the history
* Bump tokio to current, and unpin

* Remove patch since ntapi is not longer in tree

(cherry picked from commit c020211)
  • Loading branch information
Tyera authored and andreisilviudragnea committed Aug 20, 2023
1 parent 771944c commit 1aeb454
Show file tree
Hide file tree
Showing 4 changed files with 72 additions and 54 deletions.
111 changes: 70 additions & 41 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 1 addition & 5 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -380,7 +380,7 @@ tempfile = "3.5.0"
test-case = "2.2.2"
thiserror = "1.0.40"
tiny-bip39 = "0.8.2"
tokio = "~1.14.1"
tokio = "1.29.1"
tokio-serde = "0.8"
tokio-stream = "0.1.12"
tokio-tungstenite = "0.17.2"
Expand All @@ -404,10 +404,6 @@ zstd = "0.11.2"
# for details, see https://github.com/solana-labs/crossbeam/commit/fd279d707025f0e60951e429bf778b4813d1b6bf
crossbeam-epoch = { git = "https://github.com/solana-labs/crossbeam", rev = "fd279d707025f0e60951e429bf778b4813d1b6bf" }

# Rust 1.69+ broke ntapi v0.3.x, which doesn't contain proper fix:
# https://github.com/MSxDOS/ntapi/pull/12
ntapi = { git = "https://github.com/solana-labs/ntapi", rev = "97ede981a1777883ff86d142b75024b023f04fad" }

# We include the following crates as our dependencies above from crates.io:
#
# * spl-associated-token-account
Expand Down
4 changes: 0 additions & 4 deletions programs/sbf/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -160,10 +160,6 @@ members = [
targets = ["x86_64-unknown-linux-gnu"]

[patch.crates-io]
# Rust 1.69+ broke ntapi v0.3.x, which doesn't contain proper fix:
# https://github.com/MSxDOS/ntapi/pull/12
ntapi = { git = "https://github.com/solana-labs/ntapi", rev = "97ede981a1777883ff86d142b75024b023f04fad" }

# We include the following crates as our dependencies from crates.io:
#
# * spl-associated-token-account
Expand Down
5 changes: 1 addition & 4 deletions scripts/cargo-install-all.sh
Original file line number Diff line number Diff line change
Expand Up @@ -144,10 +144,7 @@ mkdir -p "$installDir/bin"
if [[ -z "$validatorOnly" ]]; then
# the patch-related configs are needed for rust 1.69+ on Windows; see Cargo.toml
# shellcheck disable=SC2086 # Don't want to double quote $rust_version
"$cargo" $maybeRustVersion \
--config 'patch.crates-io.ntapi.git="https://github.com/solana-labs/ntapi"' \
--config 'patch.crates-io.ntapi.rev="97ede981a1777883ff86d142b75024b023f04fad"' \
install --locked spl-token-cli --root "$installDir"
"$cargo" $maybeRustVersion install --locked spl-token-cli --root "$installDir"
fi
)

Expand Down

0 comments on commit 1aeb454

Please sign in to comment.