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

Jump to bottom

chore: upgrade to rust 1.61.0 #6924

Merged
merged 3 commits into from
Jun 6, 2022
Merged

chore: upgrade to rust 1.61.0 #6924

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6b937ee
chore: upgrade to rust 1.61.0
matklad May 31, 2022
fa4b6cb
fix formatting with new rustfmt
matklad May 31, 2022
d0be6ca
Merge branch 'master' into m/up-rust
mina86 Jun 6, 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.60.0"
rust-version = "1.61.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.60.0"
rust-version = "1.61.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.60.0"
rust-version = "1.61.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.60.0"
rust-version = "1.61.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.60.0"
rust-version = "1.61.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.60.0"
rust-version = "1.61.0"
edition = "2021"


Expand Down
4 changes: 2 additions & 2 deletions 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.60.0"
rust-version = "1.61.0"
edition = "2021"
license = "MIT OR Apache-2.0"
repository = "https://github.com/near/nearcore"
Expand All @@ -16,4 +16,4 @@ description = "This crate hosts structures for the NEAR Indexer Framework types"
serde = { version = "1", features = [ "derive" ] }
serde_json = "1.0.55"

near-primitives = { path = "../../core/primitives" }
near-primitives = { path = "../../core/primitives" }
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.60.0"
rust-version = "1.61.0"
edition = "2021"

[dependencies]
Expand Down
4 changes: 2 additions & 2 deletions 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.60.0"
rust-version = "1.61.0"
edition = "2021"

[dependencies]
Expand All @@ -15,5 +15,5 @@ near-network-primitives = { path = "../network-primitives" }
deepsize = { version = "0.2.0", optional = true }

[features]
test_features = ["near-network-primitives/test_features"]
test_features = ["near-network-primitives/test_features"]
deepsize_feature = ["deepsize", "near-primitives/deepsize_feature"]
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.60.0"
rust-version = "1.61.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.60.0"
rust-version = "1.61.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.60.0"
rust-version = "1.61.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.60.0"
rust-version = "1.61.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.60.0"
rust-version = "1.61.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.60.0"
rust-version = "1.61.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.60.0"
rust-version = "1.61.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.60.0"
rust-version = "1.61.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.60.0"
rust-version = "1.61.0"
edition = "2021"

# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
Expand Down
4 changes: 2 additions & 2 deletions chain/rosetta-rpc/src/models.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -582,8 +582,8 @@ pub(crate) struct MempoolTransactionResponse {
#[derive(Debug, Clone, PartialEq, serde::Serialize, serde::Deserialize, Apiv2Schema)]
pub(crate) struct MetadataRequest {
// Rosetta Spec optionally provides, but we don't have any use for it:
// #[serde(skip_serializing_if = "Option::is_none")]
// pub metadata: Option<serde_json::Value>,
// #[serde(skip_serializing_if = "Option::is_none")]
// pub metadata: Option<serde_json::Value>,
}

/// The network_identifier specifies which network a particular object is
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.60.0"
rust-version = "1.61.0"
edition = "2021"

[dependencies]
Expand Down
2 changes: 0 additions & 2 deletions core/account-id/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,5 +22,3 @@ deepsize = { version = "0.2.0", optional = true }

[dev-dependencies]
serde_json = "1"


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.60.0"
rust-version = "1.61.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.60.0"
rust-version = "1.61.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.60.0"
rust-version = "1.61.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/metrics/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.60.0"
rust-version = "1.61.0"
edition = "2021"
repository = "https://github.com/near/nearcore"
description = "A fork of the lighthouse_metrics crate used to implement prometheus"
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.60.0"
rust-version = "1.61.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.60.0"
rust-version = "1.61.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.60.0"
rust-version = "1.61.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.60.0"
rust-version = "1.61.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.60.0"
rust-version = "1.61.0"
edition = "2021"

[dependencies]
Expand Down
4 changes: 2 additions & 2 deletions 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.60.0"
rust-version = "1.61.0"
edition = "2021"

[dependencies]
Expand All @@ -19,4 +19,4 @@ near-crypto = { path = "../../core/crypto" }
near-primitives = { path = "../../core/primitives" }
near-store = { path = "../../core/store" }
near-chain = { path = "../../chain/chain" }
near-test-contracts = { path = "../../runtime/near-test-contracts" }
near-test-contracts = { path = "../../runtime/near-test-contracts" }
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.60.0"
rust-version = "1.61.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.60.0"
rust-version = "1.61.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.60.0"
rust-version = "1.61.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.60.0"
rust-version = "1.61.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.60.0"
rust-version = "1.61.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.60.0"
rust-version = "1.61.0"
edition = "2018"

[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.60.0"
rust-version = "1.61.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.60.0"
rust-version = "1.61.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.60.0"
rust-version = "1.61.0"
edition = "2021"
license = "MIT OR Apache-2.0"
readme = "README.md"
Expand Down
2 changes: 1 addition & 1 deletion runtime/near-vm-runner-standalone/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.60.0"
rust-version = "1.61.0"
edition = "2021"
license = "Apache-2.0"
readme = "README.md"
Expand Down
2 changes: 1 addition & 1 deletion 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.60.0"
rust-version = "1.61.0"
edition = "2021"
license = "MIT OR Apache-2.0"
readme = "README.md"
Expand Down
Loading