Skip to content

Upgrade rust toolchain to 1.86.0 for dual-verse-dag #4612

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
sanlee42 merged 4 commits into from
Aug 21, 2025
Merged

Upgrade rust toolchain to 1.86.0 for dual-verse-dag #4612

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
82059c2
update rust-toolchain to 1.86.0
simonjiao Aug 21, 2025
10cd408
fix clippy and format code
simonjiao Aug 21, 2025
6564c10
fix compiling errror and warnings
simonjiao Aug 21, 2025
278ce86
update cargo-nextest version
simonjiao Aug 21, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
update rust-toolchain to 1.86.0 
* keep edition 2021 not changed
  • Loading branch information
@simonjiao
simonjiao committed Aug 21, 2025
commit 82059c2120449e2bf2ea99845326c9e15ba2bc51
19 changes: 10 additions & 9 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,3 @@
[patch."https://github.com/starcoinorg/starcoin"]
starcoin-vm-types = { path = "vm2/vm-types" }
starcoin-types = { path = "vm2/types" }
starcoin-vm-runtime = { path = "vm2/vm-runtime" }
starcoin-cached-packages = { path = "vm2/framework/cached-packages" }
starcoin-framework = { path = "vm2/framework" }
starcoin-transaction-builder = { path = "vm2/transaction-builder", package = "starcoin-vm2-transaction-builder" }

[workspace]
resolver = "2"
members = [
Expand Down Expand Up @@ -274,7 +266,7 @@ homepage = "https://starcoin.org"
license = "Apache-2.0"
publish = false
repository = "https://github.com/starcoinorg/starcoin"
rust-version = "1.82"
rust-version = "1.86"
version = "1.13.19"

[workspace.dependencies]
Expand Down Expand Up @@ -684,3 +676,12 @@ debug = false
[patch.crates-io]
x25519-dalek = { git = "https://github.com/aptos-labs/x25519-dalek", branch = "zeroize_v1" }
merlin = { git = "https://github.com/aptos-labs/merlin" }

[patch."https://github.com/starcoinorg/starcoin"]
starcoin-vm-types = { path = "vm2/vm-types" }
starcoin-types = { path = "vm2/types" }
starcoin-vm-runtime = { path = "vm2/vm-runtime" }
starcoin-cached-packages = { path = "vm2/framework/cached-packages" }
starcoin-framework = { path = "vm2/framework" }
starcoin-transaction-builder = { path = "vm2/transaction-builder", package = "starcoin-vm2-transaction-builder" }

2 changes: 1 addition & 1 deletion rust-toolchain.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@
# The default profile includes rustc, rust-std, cargo, rust-docs, rustfmt and clippy.
# https://rust-lang.github.io/rustup/concepts/profiles.html
profile = "default"
channel = "1.82.0"
channel = "1.86.0"