chore: upgrade rust to 1.86.0 and fix new clippy lints (Templar-Protocol#312)

peer2f00l · web-flow · commit 4a417558fbaa · 2025-12-02T15:57:55.000Z
diff --git a/.github/actions/rust/action.yml b/.github/actions/rust/action.yml
@@ -13,7 +13,7 @@ runs:
   using: composite
   steps:
     - name: Install Rust toolchain
-      uses: dtolnay/rust-toolchain@1.85.0
+      uses: dtolnay/rust-toolchain@1.86.0
       with:
         targets: ${{ inputs.targets }}
         components: ${{ inputs.components }}
diff --git a/.github/workflows/undeploy-staging.yml b/.github/workflows/undeploy-staging.yml
@@ -57,7 +57,7 @@ jobs:
           rpc_api_key: "${{ secrets.NEAR_CONTRACT_STAGING_RPC_API_KEY }}"
 
       - name: Install Rust toolchain
-        uses: dtolnay/rust-toolchain@1.85.0
+        uses: dtolnay/rust-toolchain@1.86.0
 
       - uses: actions/cache@v4
         with:
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,5 +1,5 @@
 [workspace]
-resolver = "2"
+resolver = "3"
 members = [
   "common",
   "contract/*",
diff --git a/common/src/borrow.rs b/common/src/borrow.rs
@@ -720,7 +720,7 @@ impl<'a> BorrowPositionGuard<'a> {
     ///
     /// - If this record is not eligible for liquidation.
     /// - If the liquidator requests to liquidate too much collateral from the
-    ///     position.
+    ///   position.
     /// - If the calculation of the collateral value fails.
     /// - If the liquidator offers too little to purchase the collateral.
     pub fn record_liquidation_initial(
diff --git a/common/src/vault.rs b/common/src/vault.rs
@@ -164,7 +164,7 @@ pub trait VaultExt {
 // Add a 20% buffer to a gas estimate
 #[must_use]
 pub const fn buffer(size: u64) -> Gas {
-    Gas::from_tgas((size * 6 + 4) / 5)
+    Gas::from_tgas((size * 6).div_ceil(5))
 }
 
 // Fetching a position
diff --git a/contract/lst-oracle/Cargo.toml b/contract/lst-oracle/Cargo.toml
@@ -12,9 +12,9 @@ crate-type = ["cdylib", "rlib"]
 # in https://github.com/near/NEPs/blob/master/neps/nep-0330.md
 [package.metadata.near.reproducible_build]
 # docker image, descriptor of build environment
-image = "sourcescan/cargo-near:0.13.4-rust-1.85.0"
+image = "sourcescan/cargo-near:0.17.0-rust-1.86.0"
 # tag after colon above serves only descriptive purpose; image is identified by digest
-image_digest = "sha256:a9d8bee7b134856cc8baa142494a177f2ba9ecfededfcdd38f634e14cca8aae2"
+image_digest = "sha256:1784ca6310f3496f0048356ce420921c8f5fdf71ee8124d43a2e1ceb1f70db8a"
 # build command inside of docker container
 # if docker image from default gallery is used https://hub.docker.com/r/sourcescan/cargo-near/tags,
 # the command may be any combination of flags of `cargo-near`,
diff --git a/contract/market/Cargo.toml b/contract/market/Cargo.toml
@@ -12,9 +12,9 @@ crate-type = ["cdylib", "rlib"]
 # in https://github.com/near/NEPs/blob/master/neps/nep-0330.md
 [package.metadata.near.reproducible_build]
 # docker image, descriptor of build environment
-image = "sourcescan/cargo-near:0.13.4-rust-1.85.0"
+image = "sourcescan/cargo-near:0.17.0-rust-1.86.0"
 # tag after colon above serves only descriptive purpose; image is identified by digest
-image_digest = "sha256:a9d8bee7b134856cc8baa142494a177f2ba9ecfededfcdd38f634e14cca8aae2"
+image_digest = "sha256:1784ca6310f3496f0048356ce420921c8f5fdf71ee8124d43a2e1ceb1f70db8a"
 # build command inside of docker container
 # if docker image from default gallery is used https://hub.docker.com/r/sourcescan/cargo-near/tags,
 # the command may be any combination of flags of `cargo-near`,
diff --git a/contract/market/src/impl_market_external.rs b/contract/market/src/impl_market_external.rs
@@ -233,7 +233,6 @@ impl MarketExternalInterface for Contract {
                 WithdrawalAttempt::EmptyPosition => {
                     self.withdrawal_queue.pop();
                     depth_cleared += requested_amount;
-                    continue;
                 }
                 WithdrawalAttempt::NoLiquidity => {
                     break;
diff --git a/contract/registry/Cargo.toml b/contract/registry/Cargo.toml
@@ -12,9 +12,9 @@ crate-type = ["cdylib", "rlib"]
 # in https://github.com/near/NEPs/blob/master/neps/nep-0330.md
 [package.metadata.near.reproducible_build]
 # docker image, descriptor of build environment
-image = "sourcescan/cargo-near:0.13.4-rust-1.85.0"
+image = "sourcescan/cargo-near:0.17.0-rust-1.86.0"
 # tag after colon above serves only descriptive purpose; image is identified by digest
-image_digest = "sha256:a9d8bee7b134856cc8baa142494a177f2ba9ecfededfcdd38f634e14cca8aae2"
+image_digest = "sha256:1784ca6310f3496f0048356ce420921c8f5fdf71ee8124d43a2e1ceb1f70db8a"
 # build command inside of docker container
 # if docker image from default gallery is used https://hub.docker.com/r/sourcescan/cargo-near/tags,
 # the command may be any combination of flags of `cargo-near`,
diff --git a/contract/universal-account/Cargo.toml b/contract/universal-account/Cargo.toml
@@ -12,9 +12,9 @@ crate-type = ["cdylib", "rlib"]
 # in https://github.com/near/NEPs/blob/master/neps/nep-0330.md
 [package.metadata.near.reproducible_build]
 # docker image, descriptor of build environment
-image = "sourcescan/cargo-near:0.13.4-rust-1.85.0"
+image = "sourcescan/cargo-near:0.17.0-rust-1.86.0"
 # tag after colon above serves only descriptive purpose; image is identified by digest
-image_digest = "sha256:a9d8bee7b134856cc8baa142494a177f2ba9ecfededfcdd38f634e14cca8aae2"
+image_digest = "sha256:1784ca6310f3496f0048356ce420921c8f5fdf71ee8124d43a2e1ceb1f70db8a"
 # build command inside of docker container
 # if docker image from default gallery is used https://hub.docker.com/r/sourcescan/cargo-near/tags,
 # the command may be any combination of flags of `cargo-near`,
diff --git a/contract/vault/Cargo.toml b/contract/vault/Cargo.toml
@@ -12,9 +12,9 @@ crate-type = ["cdylib", "rlib"]
 # in https://github.com/near/NEPs/blob/master/neps/nep-0330.md
 [package.metadata.near.reproducible_build]
 # docker image, descriptor of build environment
-image = "sourcescan/cargo-near:0.13.4-rust-1.85.0"
+image = "sourcescan/cargo-near:0.17.0-rust-1.86.0"
 # tag after colon above serves only descriptive purpose; image is identified by digest
-image_digest = "sha256:a9d8bee7b134856cc8baa142494a177f2ba9ecfededfcdd38f634e14cca8aae2"
+image_digest = "sha256:1784ca6310f3496f0048356ce420921c8f5fdf71ee8124d43a2e1ceb1f70db8a"
 # build command inside of docker container
 # if docker image from default gallery is used https://hub.docker.com/r/sourcescan/cargo-near/tags,
 # the command may be any combination of flags of `cargo-near`,
diff --git a/contract/vault/examples/gas_report.rs b/contract/vault/examples/gas_report.rs
@@ -1,4 +1,4 @@
-#![allow(clippy::pedantic)]
+#![allow(clippy::pedantic, clippy::unwrap_used)]
 
 use near_sdk::{json_types::U128, Gas};
 use rand::Rng as _;
diff --git a/contract/vault/src/governance.rs b/contract/vault/src/governance.rs
@@ -351,7 +351,7 @@ impl Contract {
             self.apply_immediately(&action);
         } else {
             panic_with_message("No pending change");
-        };
+        }
     }
 
     /// Revokes any pending timelock change.
@@ -384,7 +384,7 @@ impl Contract {
             self.apply_immediately(&action);
         } else {
             panic_with_message("No pending cap change for this market");
-        };
+        }
     }
 
     /// Revokes any pending cap change for `market`.
diff --git a/contract/vault/src/impl_callbacks.rs b/contract/vault/src/impl_callbacks.rs
@@ -43,7 +43,7 @@ impl Contract {
     ) -> PromiseOrValue<()> {
         if let Err(e) = self.ctx_allocating(op_id) {
             return self.stop_and_exit(Some(&e));
-        };
+        }
 
         match accepted {
             Err(_) => {
diff --git a/contract/vault/src/lib.rs b/contract/vault/src/lib.rs
@@ -351,7 +351,7 @@ impl Contract {
 
         if let Err(e) = self.resolve_withdraw_market(market_index) {
             return self.stop_and_exit(Some(&e));
-        };
+        }
 
         PromiseOrValue::Promise(
             ext_ft_core::ext(self.underlying_asset.contract_id().into())
diff --git a/rust-toolchain.toml b/rust-toolchain.toml
@@ -1,4 +1,4 @@
 [toolchain]
-channel = "1.85.0"
+channel = "1.86.0"
 components = ["rustfmt", "cargo"]
 targets = ["wasm32-unknown-unknown"]
diff --git a/service/liquidator/src/inventory.rs b/service/liquidator/src/inventory.rs
@@ -247,7 +247,11 @@ impl InventoryManager {
                         if balance.0 != old_balance {
                             updated_assets.push(format!(
                                 "{}({}→{})",
-                                asset.to_string().split(':').last().unwrap_or("unknown"),
+                                asset
+                                    .to_string()
+                                    .split(':')
+                                    .next_back()
+                                    .unwrap_or("unknown"),
                                 old_balance,
                                 balance.0
                             ));
@@ -291,7 +295,11 @@ impl InventoryManager {
                         "unknown".to_string()
                     }
                 } else {
-                    asset_str.split(':').last().unwrap_or("unknown").to_string()
+                    asset_str
+                        .split(':')
+                        .next_back()
+                        .unwrap_or("unknown")
+                        .to_string()
                 };
                 Some(readable_name)
             })
diff --git a/service/liquidator/src/service.rs b/service/liquidator/src/service.rs
@@ -235,7 +235,6 @@ impl LiquidatorService {
 
                             if self.markets.is_empty() {
                                 tracing::warn!("No markets available yet, skipping liquidation round");
-                                continue;
                             }
                         }
                     }
diff --git a/service/liquidator/src/swap/oneclick.rs b/service/liquidator/src/swap/oneclick.rs
@@ -8,26 +8,27 @@
 //! 2. **Deposit**: Transfer tokens to deposit address
 //! 3. **Poll**: Monitor swap status until completion
 
+use std::{fmt::Write, sync::Arc};
+
+use near_account_id::AccountType;
 use near_crypto::Signer;
 use near_jsonrpc_client::JsonRpcClient;
-use near_primitives::views::FinalExecutionStatus;
+use near_primitives::{
+    action::Action,
+    transaction::{Transaction, TransactionV0},
+    types::AccountId,
+    views::FinalExecutionStatus,
+};
 use near_sdk::{
     json_types::U128,
     serde::{Deserialize, Serialize},
 };
-use std::sync::Arc;
+
 use templar_common::asset::{AssetClass, FungibleAsset, FungibleAssetAmount};
 
 use crate::rpc::{get_access_key_data, send_tx, view, AppError, AppResult};
 use crate::swap::SwapProvider;
 
-use near_account_id::AccountType;
-use near_primitives::{
-    action::Action,
-    transaction::{Transaction, TransactionV0},
-    types::AccountId,
-};
-
 /// 1-Click API base URL
 const ONECLICK_API_BASE: &str = "https://1click.chaindefuser.com";
 
@@ -668,7 +669,7 @@ impl OneClickSwap {
             _ => {
                 tracing::warn!(status = ?outcome.status, "Unexpected transaction status");
             }
-        };
+        }
 
         // Check if the deposit was refunded by fetching transaction outcome and checking receipts
         match self
@@ -879,7 +880,7 @@ impl OneClickSwap {
 
             let mut url = format!("{ONECLICK_API_BASE}/v0/status?depositAddress={deposit_address}");
             if let Some(m) = memo {
-                url.push_str(&format!("&depositMemo={m}"));
+                let _ = write!(url, "&depositMemo={m}");
             }
 
             let mut req = self.http_client.get(&url);
diff --git a/service/relayer/Dockerfile b/service/relayer/Dockerfile
@@ -1,6 +1,6 @@
 # syntax=docker/dockerfile:1
 
-FROM rust:1.85.0 AS builder
+FROM rust:1.86.0 AS builder
 
 WORKDIR /usr/src/relayer
 
diff --git a/service/relayer/compose.dev.yaml b/service/relayer/compose.dev.yaml
@@ -12,7 +12,7 @@ services:
       - 5432:5432
 
   relayer:
-    image: rust:1.85.0
+    image: rust:1.86.0
     volumes:
       - ../..:/usr/src/relayer
       - rustup_home:/usr/local/rustup

Original file line number	Diff line number	Diff line change
`@@ -164,7 +164,7 @@ pub trait VaultExt {`
`164`	`164`	`// Add a 20% buffer to a gas estimate`
`165`	`165`	`#[must_use]`
`166`	`166`	`pub const fn buffer(size: u64) -> Gas {`
`167`		`- Gas::from_tgas((size * 6 + 4) / 5)`
	`167`	`+ Gas::from_tgas((size * 6).div_ceil(5))`
`168`	`168`	`}`
`169`	`169`
`170`	`170`	`// Fetching a position`
Original file line number	Diff line number	Diff line change
`@@ -233,7 +233,6 @@ impl MarketExternalInterface for Contract {`
`233`	`233`	`WithdrawalAttempt::EmptyPosition => {`
`234`	`234`	`self.withdrawal_queue.pop();`
`235`	`235`	`depth_cleared += requested_amount;`
`236`		`- continue;`
`237`	`236`	`}`
`238`	`237`	`WithdrawalAttempt::NoLiquidity => {`
`239`	`238`	`break;`