Skip to content

Commit f3b7772

Browse files
committed
toolchain: update to Rust 1.68.0
Routine update to the latest version of Rust. Release post: https://blog.rust-lang.org/2023/03/09/Rust-1.68.0.html I don't see anything exciting for nearcore in the release. Maybe `pin!` for custom futures could be useful. The commit also includes clippy renaming `derive_hash_xor_eq` to `derived_hash_with_manual_eq`. There is also a new [future incompatibility warning](rust-lang/rust#103418) which we hit in `fs_extra v1.2.0` and `wasmparser v0.78.2`. I don't think we can get rid of the second anytime soon, assuming we hang on to replayability.
1 parent d230eaf commit f3b7772

File tree

5 files changed

+6
-6
lines changed

5 files changed

+6
-6
lines changed

Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -257,4 +257,4 @@ opt-level = 3
257257
[workspace.package]
258258
edition = "2021"
259259
authors = ["Near Inc <[email protected]>"]
260-
rust-version = "1.67.1"
260+
rust-version = "1.68.0"

core/crypto/src/signature.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,7 @@ impl PublicKey {
160160

161161
// This `Hash` implementation is safe since it retains the property
162162
// `k1 == k2 ⇒ hash(k1) == hash(k2)`.
163-
#[allow(clippy::derive_hash_xor_eq)]
163+
#[allow(clippy::derived_hash_with_manual_eq)]
164164
impl Hash for PublicKey {
165165
fn hash<H: Hasher>(&self, state: &mut H) {
166166
match self {
@@ -493,7 +493,7 @@ pub enum Signature {
493493

494494
// This `Hash` implementation is safe since it retains the property
495495
// `k1 == k2 ⇒ hash(k1) == hash(k2)`.
496-
#[allow(clippy::derive_hash_xor_eq)]
496+
#[allow(clippy::derived_hash_with_manual_eq)]
497497
impl Hash for Signature {
498498
fn hash<H: Hasher>(&self, state: &mut H) {
499499
match self {

core/primitives-core/src/hash.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -211,7 +211,7 @@ impl fmt::Display for CryptoHash {
211211

212212
// This implementation is compatible with derived PartialEq.
213213
// Custom PartialEq implementation was explicitly removed in #4220.
214-
#[allow(clippy::derive_hash_xor_eq)]
214+
#[allow(clippy::derived_hash_with_manual_eq)]
215215
impl Hash for CryptoHash {
216216
fn hash<H: Hasher>(&self, state: &mut H) {
217217
state.write(self.as_ref());

runtime/runtime-params-estimator/emu-cost/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# our local base image
2-
FROM rust:1.67.1
2+
FROM rust:1.68.0
33

44
LABEL description="Container for builds"
55

rust-toolchain.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,6 @@
22
# This specifies the version of Rust we use to build.
33
# Individual crates in the workspace may support a lower version, as indicated by `rust-version` field in each crate's `Cargo.toml`.
44
# The version specified below, should be at least as high as the maximum `rust-version` within the workspace.
5-
channel = "1.67.1"
5+
channel = "1.68.0"
66
components = [ "rustfmt" ]
77
targets = [ "wasm32-unknown-unknown" ]

0 commit comments

Comments
 (0)