Skip to content
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

chore: upgrade Rust to 1.64.0 #7669

Merged
merged 3 commits into from
Sep 22, 2022
Merged

chore: upgrade Rust to 1.64.0 #7669

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6ecf78b
chore: upgrade Rust to 1.64.0
matklad Sep 22, 2022
03a078e
fix new warnings
matklad Sep 22, 2022
5291ad6
Merge branch 'master' into m/new-rust
jakmeier Sep 22, 2022
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
2 changes: 1 addition & 1 deletion chain/chain-primitives/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ version = "0.0.0"
authors = ["Near Inc <hello@nearprotocol.com>"]
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
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ version = "0.0.0"
authors = ["Near Inc <hello@nearprotocol.com>"]
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
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ version = "0.0.0"
authors = ["Near Inc <hello@nearprotocol.com>"]
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
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ version = "0.0.0"
authors = ["Near Inc <hello@nearprotocol.com>"]
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
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ version = "0.0.0"
authors = ["Near Inc <hello@nearprotocol.com>"]
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
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ version = "0.0.0"
authors = ["Near Inc <hello@nearprotocol.com>"]
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
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ version = "0.0.0"
authors = ["Near Inc <hello@nearprotocol.com>"]
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
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ version = "0.0.0"
authors = ["Near Inc <hello@nearprotocol.com>"]
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
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ version = "0.0.0"
authors = ["Near Inc <hello@nearprotocol.com>"]
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
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ version = "0.0.0"
authors = ["Near Inc <hello@nearprotocol.com>"]
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
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ version = "0.0.0"
authors = ["Near Inc <hello@nearprotocol.com>"]
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
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ version = "0.0.0"
authors = ["Near Inc <hello@nearprotocol.com>"]
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
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ version = "0.0.0"
authors = ["Near Inc <hello@nearprotocol.com>"]
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
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ version = "0.0.0"
authors = ["Near Inc <hello@nearprotocol.com>"]
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
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ version = "0.0.0"
authors = ["Near Inc <hello@nearprotocol.com>"]
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
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ version = "0.0.0"
authors = ["Near Inc <hello@nearprotocol.com>"]
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
View file
Open in desktop
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 <hello@nearprotocol.com>"]
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
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ version = "0.0.0"
authors = ["Near Inc <hello@nearprotocol.com>"]
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
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ version = "0.0.0"
authors = ["Near Inc <hello@nearprotocol.com>"]
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
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ version = "0.0.0"
authors = ["Near Inc <hello@nearprotocol.com>"]
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
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ version = "0.0.0"
authors = ["Near Inc <hello@nearprotocol.com>"]
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
View file
Open in desktop
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 <hello@nearprotocol.com>"]
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
View file
Open in desktop
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
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ version = "0.0.0"
authors = ["Near Inc <hello@nearprotocol.com>"]
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
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ version = "0.0.0"
authors = ["Near Inc <hello@nearprotocol.com>"]
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
View file
Open in desktop
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 <hello@nearprotocol.com>"]
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
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ version = "0.0.0"
authors = ["Near Inc <hello@nearprotocol.com>"]
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
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ version = "0.0.0"
authors = ["Near Inc <hello@nearprotocol.com>"]
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
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ version = "0.0.0"
authors = ["Near Inc <hello@nearprotocol.com>"]
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
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ version = "0.0.0"
authors = ["Near Inc <hello@nearprotocol.com>"]
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
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ version = "0.0.0"
authors = ["Near Inc <hello@nearprotocol.com>"]
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
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ version = "0.0.0"
authors = ["Near Inc <hello@nearprotocol.com>"]
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
View file
Open in desktop
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 <hello@nearprotocol.com>"]
# 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
2 changes: 1 addition & 1 deletion runtime/near-test-contracts/contract-for-fuzzing-rs/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ version = "0.1.0"
authors = ["Near Inc <hello@nearprotocol.com>"]
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
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ version = "0.1.0"
authors = ["Near Inc <hello@nearprotocol.com>"]
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
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ version = "0.1.0"
authors = ["Near Inc <hello@nearprotocol.com>"]
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
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ version = "0.0.0"
authors = ["Near Inc <hello@nearprotocol.com>"]
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
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ version = "0.0.0"
authors = ["Near Inc <hello@nearprotocol.com>"]
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
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ version = "0.0.0"
authors = ["Near Inc <hello@nearprotocol.com>"]
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
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ version = "0.0.0"
authors = ["Near Inc <hello@nearprotocol.com>"]
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
View file
Open in desktop
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
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ version = "0.0.0"
authors = ["Near Inc <hello@nearprotocol.com>"]
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