chore: upgrade to rust 1.85.0

rust/Dockerfile

@@ -1,6 +1,6 @@
 # syntax=docker/dockerfile:experimental
 
-FROM rust:1.80.1 as builder
+FROM rust:1.85.0 as builder
 WORKDIR /usr/src
 
 # 1a: Prepare for static linking

rust/main/chains/hyperlane-ethereum/src/rpc_clients/fallback.rs

@@ -215,7 +215,7 @@ where
         &'a self,
         method: &'a str,
         params: &'a Value,
-    ) -> FuturesUnordered<impl Future<Output = Result<Value, HttpClientError>> + Sized + '_> {
+    ) -> FuturesUnordered<impl Future<Output = Result<Value, HttpClientError>> + Sized + 'a> {
         let unordered = FuturesUnordered::new();
         self.inner
             .providers

rust/main/hyperlane-core/src/accumulator/merkle.rs

@@ -198,7 +198,7 @@ impl MerkleTree {
             Zero(_) => {
                 *self = MerkleTree::create(&[elem], depth);
             }
-            Node(ref mut hash, ref mut left, ref mut right) => {
+            Node(hash, left, right) => {
                 let left: &mut MerkleTree = &mut *left;
                 let right: &mut MerkleTree = &mut *right;
                 match (&*left, &*right) {

rust/main/hyperlane-core/src/chain.rs

@@ -31,7 +31,7 @@ pub struct ContractLocator<'a> {
 }
 
 #[cfg(feature = "strum")]
-impl<'a> std::fmt::Display for ContractLocator<'a> {
+impl std::fmt::Display for ContractLocator<'_> {
     fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
         write!(
             f,
@@ -93,7 +93,7 @@ impl<'de> Deserialize<'de> for ReorgPeriod {
 
         struct ReorgPeriodVisitor;
 
-        impl<'de> de::Visitor<'de> for ReorgPeriodVisitor {
+        impl de::Visitor<'_> for ReorgPeriodVisitor {
             type Value = ReorgPeriod;
 
             fn expecting(&self, f: &mut Formatter) -> std::fmt::Result {

rust/main/hyperlane-core/src/lib.rs

@@ -4,7 +4,6 @@
 #![warn(missing_docs)]
 #![deny(unsafe_code)]
 #![allow(unknown_lints)] // TODO: `rustc` 1.80.1 clippy issue
-#![forbid(where_clauses_object_safety)]
 extern crate core;
 
 pub use chain::*;

rust/main/hyperlane-core/src/types/primitive_types.rs

@@ -2,6 +2,7 @@
 
 #![allow(clippy::assign_op_pattern)]
 #![allow(clippy::reversed_empty_ranges)]
+#![allow(unexpected_cfgs)]
 
 use std::{
     ops::{Div, Mul},

rust/main/hyperlane-core/src/types/serialize.rs

@@ -196,7 +196,7 @@ pub enum ExpectedLen<'a> {
     Between(usize, &'a mut [u8]),
 }
 
-impl<'a> fmt::Display for ExpectedLen<'a> {
+impl fmt::Display for ExpectedLen<'_> {
     fn fmt(&self, fmt: &mut fmt::Formatter) -> fmt::Result {
         match *self {
             ExpectedLen::Exact(ref v) => write!(fmt, "{} bytes", v.len()),
@@ -271,7 +271,7 @@ where
         len: ExpectedLen<'a>,
     }
 
-    impl<'a, 'b> de::Visitor<'b> for Visitor<'a> {
+    impl<'b> de::Visitor<'b> for Visitor<'_> {
         type Value = usize;
 
         fn expecting(&self, formatter: &mut fmt::Formatter) -> fmt::Result {

rust/main/hyperlane-test/src/lib.rs

@@ -3,7 +3,6 @@
 #![forbid(unsafe_code)]
 #![cfg_attr(test, warn(missing_docs))]
 #![allow(unknown_lints)] // TODO: `rustc` 1.80.1 clippy issue
-#![forbid(where_clauses_object_safety)]
 
 /// Mock contracts
 pub mod mocks;

rust/main/rust-toolchain

@@ -1,3 +1,3 @@
 [toolchain]
-channel = "1.80.1"
+channel = "1.85.0"
 profile = "default"

rust/main/utils/abigen/src/lib.rs

@@ -5,6 +5,7 @@ use std::ffi::OsStr;
 use std::fs::{self, File};
 use std::io::Write;
 use std::path::Path;
+use std::path::PathBuf;
 
 use inflector::Inflector;
 
@@ -140,26 +141,11 @@ fn fmt_file(path: &Path) {
 
 /// Get the rustfmt binary path.
 #[cfg(feature = "fmt")]
-fn rustfmt_path() -> &'static Path {
-    use std::path::PathBuf;
-
-    // lazy static var
-    static mut PATH: Option<PathBuf> = None;
-
-    if let Some(path) = unsafe { PATH.as_ref() } {
-        return path;
-    }
-
+fn rustfmt_path() -> PathBuf {
     if let Ok(path) = std::env::var("RUSTFMT") {
-        unsafe {
-            PATH = Some(PathBuf::from(path));
-            PATH.as_ref().unwrap()
-        }
+        PathBuf::from(path)
     } else {
         // assume it is in PATH
-        unsafe {
-            PATH = Some(which::which("rustmft").unwrap_or_else(|_| "rustfmt".into()));
-            PATH.as_ref().unwrap()
-        }
+        which::which("rustmft").unwrap_or_else(|_| "rustfmt".into())
     }
 }

rust/sealevel/programs/helloworld/src/processor.rs

@@ -1,4 +1,5 @@
 //! HelloWorld program.
+#![allow(unexpected_cfgs)]
 
 use access_control::AccessControl;
 use account_utils::{create_pda_account, SizedData};