Skip to content

Commit

Permalink
chore: upgrade Rust to 1.64.0 (near#7669)
Browse files Browse the repository at this point in the history
https://blog.rust-lang.org/2022/09/22/Rust-1.64.0.html

Notable changes:

* rust-analyzer is now available via rustup :o)
* cargo supports "workspace inheritance". We can use this to cut some
  repeated deps and avoid repating rust-version everywhere. I'll handle
  that in a separate PR
* poll_fn and ready! are stabilized, we might use them for some of our
  async stuff
* add Nintendo Switch as tier 3 target so I guess we can run neard on
  switch now?
  • Loading branch information
matklad authored Sep 22, 2022
1 parent 9aa06b9 commit a33205a
Show file tree
Hide file tree
Showing 68 changed files with 74 additions and 81 deletions.
2 changes: 1 addition & 1 deletion chain/chain-primitives/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ version = "0.0.0"
authors = ["Near Inc <[email protected]>"]
publish = true
# Please update rust-toolchain.toml as well when changing version here:
rust-version = "1.63.0"
rust-version = "1.64.0"
edition = "2021"
license = "MIT OR Apache-2.0"
repository = "https://github.com/near/nearcore"
Expand Down
2 changes: 1 addition & 1 deletion chain/chunks-primitives/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ version = "0.0.0"
authors = ["Near Inc <[email protected]>"]
publish = true
# Please update rust-toolchain.toml as well when changing version here:
rust-version = "1.63.0"
rust-version = "1.64.0"
edition = "2021"
license = "MIT OR Apache-2.0"
repository = "https://github.com/near/nearcore"
Expand Down
2 changes: 1 addition & 1 deletion chain/chunks/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ version = "0.0.0"
authors = ["Near Inc <[email protected]>"]
publish = false
# Please update rust-toolchain.toml as well when changing version here:
rust-version = "1.63.0"
rust-version = "1.64.0"
edition = "2021"

[dependencies]
Expand Down
2 changes: 1 addition & 1 deletion chain/client-primitives/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ version = "0.0.0"
authors = ["Near Inc <[email protected]>"]
publish = true
# Please update rust-toolchain.toml as well when changing version here:
rust-version = "1.63.0"
rust-version = "1.64.0"
edition = "2021"
license = "MIT OR Apache-2.0"
repository = "https://github.com/near/nearcore"
Expand Down
2 changes: 1 addition & 1 deletion chain/client/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ version = "0.0.0"
authors = ["Near Inc <[email protected]>"]
publish = false
# Please update rust-toolchain.toml as well when changing version here:
rust-version = "1.63.0"
rust-version = "1.64.0"
edition = "2021"

[dependencies]
Expand Down
2 changes: 1 addition & 1 deletion chain/epoch-manager/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ version = "0.0.0"
authors = ["Near Inc <[email protected]>"]
publish = false
# Please update rust-toolchain.toml as well when changing version here:
rust-version = "1.63.0"
rust-version = "1.64.0"
edition = "2021"


Expand Down
2 changes: 1 addition & 1 deletion chain/indexer-primitives/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ version = "0.0.0"
authors = ["Near Inc <[email protected]>"]
publish = true
# Please update rust-toolchain.toml as well when changing version here:
rust-version = "1.63.0"
rust-version = "1.64.0"
edition = "2021"
license = "MIT OR Apache-2.0"
repository = "https://github.com/near/nearcore"
Expand Down
2 changes: 1 addition & 1 deletion chain/indexer/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ version = "0.0.0"
authors = ["Near Inc <[email protected]>"]
publish = false
# Please update rust-toolchain.toml as well when changing version here:
rust-version = "1.63.0"
rust-version = "1.64.0"
edition = "2021"

[dependencies]
Expand Down
2 changes: 1 addition & 1 deletion chain/jsonrpc-adversarial-primitives/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ version = "0.0.0"
authors = ["Near Inc <[email protected]>"]
publish = false
# Please update rust-toolchain.toml as well when changing version here:
rust-version = "1.63.0"
rust-version = "1.64.0"
edition = "2021"

[dependencies]
Expand Down
2 changes: 1 addition & 1 deletion chain/jsonrpc-primitives/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ version = "0.0.0"
authors = ["Near Inc <[email protected]>"]
publish = true
# Please update rust-toolchain.toml as well when changing version here:
rust-version = "1.63.0"
rust-version = "1.64.0"
edition = "2021"
license = "MIT OR Apache-2.0"
repository = "https://github.com/near/nearcore"
Expand Down
2 changes: 1 addition & 1 deletion chain/jsonrpc/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ version = "0.0.0"
authors = ["Near Inc <[email protected]>"]
publish = false
# Please update rust-toolchain.toml as well when changing version here:
rust-version = "1.63.0"
rust-version = "1.64.0"
edition = "2021"

[dependencies]
Expand Down
2 changes: 1 addition & 1 deletion chain/jsonrpc/client/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ version = "0.0.0"
authors = ["Near Inc <[email protected]>"]
publish = false
# Please update rust-toolchain.toml as well when changing version here:
rust-version = "1.63.0"
rust-version = "1.64.0"
edition = "2021"

[dependencies]
Expand Down
2 changes: 1 addition & 1 deletion chain/jsonrpc/fuzz/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ version = "0.0.0"
authors = ["Near Inc <[email protected]>"]
publish = false
# Please update rust-toolchain.toml as well when changing version here:
rust-version = "1.63.0"
rust-version = "1.64.0"
edition = "2021"

[package.metadata]
Expand Down
2 changes: 1 addition & 1 deletion chain/jsonrpc/jsonrpc-tests/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ version = "0.0.0"
authors = ["Near Inc <[email protected]>"]
publish = false
# Please update rust-toolchain.toml as well when changing version here:
rust-version = "1.63.0"
rust-version = "1.64.0"
edition = "2021"

[dependencies]
Expand Down
2 changes: 1 addition & 1 deletion chain/network-primitives/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ version = "0.0.0"
authors = ["Near Inc <[email protected]>"]
edition = "2021"
# Please update rust-toolchain.toml as well when changing version here:
rust-version = "1.63.0"
rust-version = "1.64.0"
description = "This crate hosts NEAR network-related primitive types"
repository = "https://github.com/near/nearcore"
license = "MIT OR Apache-2.0"
Expand Down
2 changes: 1 addition & 1 deletion chain/network/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ version = "0.0.0"
authors = ["Near Inc <[email protected]>"]
edition = "2021"
# Please update rust-toolchain.toml as well when changing version here:
rust-version = "1.63.0"
rust-version = "1.64.0"
publish = false

[build-dependencies]
Expand Down
2 changes: 1 addition & 1 deletion chain/pool/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ license = "MIT OR Apache-2.0"
authors = ["Near Inc <[email protected]>"]
publish = false
# Please update rust-toolchain.toml as well when changing version here:
rust-version = "1.63.0"
rust-version = "1.64.0"
edition = "2021"

[dependencies]
Expand Down
2 changes: 1 addition & 1 deletion chain/rosetta-rpc/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ version = "0.0.0"
authors = ["Near Inc <[email protected]>"]
publish = false
# Please update rust-toolchain.toml as well when changing version here:
rust-version = "1.63.0"
rust-version = "1.64.0"
edition = "2021"

# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
Expand Down
2 changes: 1 addition & 1 deletion chain/telemetry/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ version = "0.0.0"
authors = ["Near Inc <[email protected]>"]
publish = false
# Please update rust-toolchain.toml as well when changing version here:
rust-version = "1.63.0"
rust-version = "1.64.0"
edition = "2021"

[dependencies]
Expand Down
2 changes: 1 addition & 1 deletion core/account-id/fuzz/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ version = "0.0.0"
authors = ["Near Inc <[email protected]>"]
publish = false
# Please update rust-toolchain.toml as well when changing version here:
rust-version = "1.63.0"
rust-version = "1.64.0"
edition = "2021"

[package.metadata]
Expand Down
2 changes: 1 addition & 1 deletion core/chain-configs/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ version = "0.0.0"
authors = ["Near Inc <[email protected]>"]
publish = true
# Please update rust-toolchain.toml as well when changing version here:
rust-version = "1.63.0"
rust-version = "1.64.0"
edition = "2021"
license = "MIT OR Apache-2.0"
repository = "https://github.com/near/nearcore"
Expand Down
2 changes: 1 addition & 1 deletion core/crypto/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ license = "MIT OR Apache-2.0"
authors = ["Near Inc <[email protected]>"]
publish = true
# Please update rust-toolchain.toml as well when changing version here:
rust-version = "1.63.0"
rust-version = "1.64.0"
edition = "2021"
repository = "https://github.com/near/nearcore"
description = "This is an internal crate for common cryptographic types"
Expand Down
2 changes: 1 addition & 1 deletion core/o11y/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ description = "Observability helpers for the near codebase"
edition = "2021"
publish = false
readme = "README.md"
rust-version = "1.63.0"
rust-version = "1.64.0"

[dependencies]
atty = "0.2"
Expand Down
2 changes: 1 addition & 1 deletion core/primitives-core/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ version = "0.0.0"
authors = ["Near Inc <[email protected]>"]
publish = true
# Please update rust-toolchain.toml as well when changing version here:
rust-version = "1.63.0"
rust-version = "1.64.0"
edition = "2021"
license = "MIT OR Apache-2.0"
repository = "https://github.com/near/nearcore"
Expand Down
2 changes: 1 addition & 1 deletion core/primitives/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ version = "0.0.0"
authors = ["Near Inc <[email protected]>"]
publish = true
# Please update rust-toolchain.toml as well when changing version here:
rust-version = "1.63.0"
rust-version = "1.64.0"
edition = "2021"
license = "MIT OR Apache-2.0"
repository = "https://github.com/near/nearcore"
Expand Down
2 changes: 1 addition & 1 deletion core/store/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ license = "MIT OR Apache-2.0"
authors = ["Near Inc <[email protected]>"]
publish = false
# Please update rust-toolchain.toml as well when changing version here:
rust-version = "1.63.0"
rust-version = "1.64.0"
edition = "2021"

[dependencies]
Expand Down
2 changes: 1 addition & 1 deletion genesis-tools/genesis-csv-to-json/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ version = "0.0.0"
authors = ["Near Inc <[email protected]>"]
publish = false
# Please update rust-toolchain.toml as well when changing version here:
rust-version = "1.63.0"
rust-version = "1.64.0"
edition = "2021"

[dependencies]
Expand Down
2 changes: 1 addition & 1 deletion genesis-tools/genesis-populate/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ version = "0.0.0"
authors = ["Near Inc <[email protected]>"]
publish = false
# Please update rust-toolchain.toml as well when changing version here:
rust-version = "1.63.0"
rust-version = "1.64.0"
edition = "2021"

[dependencies]
Expand Down
2 changes: 1 addition & 1 deletion genesis-tools/keypair-generator/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ version = "0.0.0"
authors = ["Near Inc <[email protected]>"]
publish = false
# Please update rust-toolchain.toml as well when changing version here:
rust-version = "1.63.0"
rust-version = "1.64.0"
edition = "2021"

[dependencies]
Expand Down
2 changes: 1 addition & 1 deletion integration-tests/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ version = "0.0.0"
authors = ["Near Inc <[email protected]>"]
publish = false
# Please update rust-toolchain.toml as well when changing version here:
rust-version = "1.63.0"
rust-version = "1.64.0"
edition = "2021"

[dependencies]
Expand Down
2 changes: 1 addition & 1 deletion nearcore/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ version = "0.0.0"
authors = ["Near Inc <[email protected]>"]
publish = false
# Please update rust-toolchain.toml as well when changing version here:
rust-version = "1.63.0"
rust-version = "1.64.0"
edition = "2021"

[dependencies]
Expand Down
2 changes: 1 addition & 1 deletion neard/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ version = "0.0.0"
authors = ["Near Inc <[email protected]>"]
publish = false
# Please update rust-toolchain.toml as well when changing version here:
rust-version = "1.63.0"
rust-version = "1.64.0"
edition = "2021"
default-run = "neard"

Expand Down
2 changes: 1 addition & 1 deletion runtime/near-test-contracts/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ version = "0.0.0"
publish = false
authors = ["Near Inc <[email protected]>"]
# Please update rust-toolchain.toml as well when changing version here:
rust-version = "1.63.0"
rust-version = "1.64.0"
edition = "2021"
license = "Apache-2.0"

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ version = "0.1.0"
authors = ["Near Inc <[email protected]>"]
publish = false
# Please update rust-toolchain.toml as well when changing version here:
rust-version = "1.63.0"
rust-version = "1.64.0"
edition = "2018"

[lib]
Expand Down
2 changes: 1 addition & 1 deletion runtime/near-test-contracts/estimator-contract/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ version = "0.1.0"
authors = ["Near Inc <[email protected]>"]
publish = false
# Please update rust-toolchain.toml as well when changing version here:
rust-version = "1.63.0"
rust-version = "1.64.0"
edition = "2021"

[lib]
Expand Down
2 changes: 1 addition & 1 deletion runtime/near-test-contracts/test-contract-rs/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ version = "0.1.0"
authors = ["Near Inc <[email protected]>"]
publish = false
# Please update rust-toolchain.toml as well when changing version here:
rust-version = "1.63.0"
rust-version = "1.64.0"
edition = "2021"

[lib]
Expand Down
2 changes: 1 addition & 1 deletion runtime/near-vm-errors/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ version = "0.0.0"
authors = ["Near Inc <[email protected]>"]
publish = true
# Please update rust-toolchain.toml as well when changing version here:
rust-version = "1.63.0"
rust-version = "1.64.0"
edition = "2021"
license = "MIT OR Apache-2.0"
readme = "README.md"
Expand Down
2 changes: 1 addition & 1 deletion runtime/near-vm-logic/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ version = "0.0.0"
authors = ["Near Inc <[email protected]>"]
publish = true
# Please update rust-toolchain.toml as well when changing version here:
rust-version = "1.63.0"
rust-version = "1.64.0"
edition = "2021"
license = "MIT OR Apache-2.0"
readme = "README.md"
Expand Down
4 changes: 2 additions & 2 deletions runtime/near-vm-runner/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ version = "0.0.0"
authors = ["Near Inc <[email protected]>"]
publish = false
# Please update rust-toolchain.toml as well when changing version here:
rust-version = "1.63.0"
rust-version = "1.64.0"
edition = "2021"
license = "MIT OR Apache-2.0"
readme = "README.md"
Expand Down Expand Up @@ -109,7 +109,7 @@ io_trace = ["near-vm-logic/io_trace"]
protocol_feature_ed25519_verify = [
"near-primitives/protocol_feature_ed25519_verify",
"near-vm-logic/protocol_feature_ed25519_verify"
]
]

[package.metadata.cargo-udeps.ignore]
# `no_cache` feature leads to an unused `cached` crate
Expand Down
2 changes: 1 addition & 1 deletion runtime/near-vm-runner/fuzz/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ version = "0.0.0"
authors = ["Near Inc <[email protected]>"]
publish = false
# Please update rust-toolchain.toml as well when changing version here:
rust-version = "1.63.0"
rust-version = "1.64.0"
edition = "2021"

[package.metadata]
Expand Down
2 changes: 1 addition & 1 deletion runtime/near-vm-runner/src/wasmtime_runner.rs
Original file line number Diff line number Diff line change
Expand Up @@ -283,7 +283,7 @@ impl crate::runner::VM for WasmtimeVM {
Some(func) => match func.typed::<(), (), _>(&mut store) {
Ok(run) => match run.call(&mut store, ()) {
Ok(_) => VMResult::ok(logic),
Err(err) => (VMResult::abort(logic, err.into_vm_error())),
Err(err) => VMResult::abort(logic, err.into_vm_error()),
},
Err(err) => VMResult::abort(logic, err.into_vm_error()),
},
Expand Down
4 changes: 2 additions & 2 deletions runtime/runtime-params-estimator/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ version = "0.0.0"
authors = ["Near Inc <[email protected]>"]
publish = false
# Please update rust-toolchain.toml as well when changing version here:
rust-version = "1.63.0"
rust-version = "1.64.0"
edition = "2021"

[[bin]]
Expand Down Expand Up @@ -80,4 +80,4 @@ io_trace = ["near-store/io_trace", "near-o11y/io_trace", "near-vm-logic/io_trace
protocol_feature_ed25519_verify = [
"near-vm-logic/protocol_feature_ed25519_verify",
"near-vm-runner/protocol_feature_ed25519_verify"
]
]
Loading

0 comments on commit a33205a

Please sign in to comment.