diff --git a/Dockerfile-collab b/Dockerfile-collab index 50af874200a..fbbcb0df048 100644 --- a/Dockerfile-collab +++ b/Dockerfile-collab @@ -1,6 +1,6 @@ # syntax = docker/dockerfile:1.2 -FROM rust:1.93-bookworm as builder +FROM rust:1.94-bookworm as builder WORKDIR app COPY . . diff --git a/crates/dap/src/client.rs b/crates/dap/src/client.rs index aa2e53f43cb..966445e4480 100644 --- a/crates/dap/src/client.rs +++ b/crates/dap/src/client.rs @@ -284,6 +284,7 @@ mod tests { #[gpui::test] pub async fn test_initialize_client(cx: &mut TestAppContext) { + #![expect(clippy::result_large_err)] init_test(cx); let client = DebugAdapterClient::start( diff --git a/crates/debugger_ui/src/tests/attach_modal.rs b/crates/debugger_ui/src/tests/attach_modal.rs index 4e8839f82f4..0b89b8c1339 100644 --- a/crates/debugger_ui/src/tests/attach_modal.rs +++ b/crates/debugger_ui/src/tests/attach_modal.rs @@ -1,3 +1,4 @@ +#![expect(clippy::result_large_err)] use crate::{ attach_modal::{Candidate, ModalIntent}, tests::start_debug_session_with, diff --git a/crates/debugger_ui/src/tests/console.rs b/crates/debugger_ui/src/tests/console.rs index fad483b0f4a..9e672be080a 100644 --- a/crates/debugger_ui/src/tests/console.rs +++ b/crates/debugger_ui/src/tests/console.rs @@ -1,3 +1,4 @@ +#![expect(clippy::result_large_err)] use crate::{ tests::{active_debug_session_panel, start_debug_session}, *, diff --git a/crates/debugger_ui/src/tests/dap_logger.rs b/crates/debugger_ui/src/tests/dap_logger.rs index ff2b0f695f6..3b40e27aa43 100644 --- a/crates/debugger_ui/src/tests/dap_logger.rs +++ b/crates/debugger_ui/src/tests/dap_logger.rs @@ -1,3 +1,4 @@ +#![expect(clippy::result_large_err)] use crate::tests::{init_test, init_test_workspace, start_debug_session}; use dap::requests::{StackTrace, Threads}; use debugger_tools::LogStore; diff --git a/crates/debugger_ui/src/tests/debugger_panel.rs b/crates/debugger_ui/src/tests/debugger_panel.rs index e4c258a8d2a..223ed13142d 100644 --- a/crates/debugger_ui/src/tests/debugger_panel.rs +++ b/crates/debugger_ui/src/tests/debugger_panel.rs @@ -1,3 +1,4 @@ +#![expect(clippy::result_large_err)] use crate::{ persistence::DebuggerPaneItem, tests::{start_debug_session, start_debug_session_with}, diff --git a/crates/debugger_ui/src/tests/inline_values.rs b/crates/debugger_ui/src/tests/inline_values.rs index 3ca29f7cc3e..c82276d8243 100644 --- a/crates/debugger_ui/src/tests/inline_values.rs +++ b/crates/debugger_ui/src/tests/inline_values.rs @@ -1,3 +1,4 @@ +#![expect(clippy::result_large_err)] use std::{path::Path, sync::Arc}; use dap::{Scope, StackFrame, Variable, requests::Variables}; diff --git a/crates/debugger_ui/src/tests/module_list.rs b/crates/debugger_ui/src/tests/module_list.rs index 09c90cbc4a3..21b5ec67c20 100644 --- a/crates/debugger_ui/src/tests/module_list.rs +++ b/crates/debugger_ui/src/tests/module_list.rs @@ -1,3 +1,4 @@ +#![expect(clippy::result_large_err)] use crate::{ debugger_panel::DebugPanel, persistence::DebuggerPaneItem, diff --git a/crates/debugger_ui/src/tests/new_process_modal.rs b/crates/debugger_ui/src/tests/new_process_modal.rs index 54c38d8b1ce..01e83b533eb 100644 --- a/crates/debugger_ui/src/tests/new_process_modal.rs +++ b/crates/debugger_ui/src/tests/new_process_modal.rs @@ -1,3 +1,4 @@ +#![expect(clippy::result_large_err)] use dap::DapRegistry; use editor::Editor; use gpui::{BackgroundExecutor, TestAppContext, VisualTestContext}; diff --git a/crates/debugger_ui/src/tests/persistence.rs b/crates/debugger_ui/src/tests/persistence.rs index f5fb4f0ab2d..ca04828c40b 100644 --- a/crates/debugger_ui/src/tests/persistence.rs +++ b/crates/debugger_ui/src/tests/persistence.rs @@ -1,3 +1,4 @@ +#![expect(clippy::result_large_err)] use std::iter::zip; use crate::{ diff --git a/crates/debugger_ui/src/tests/stack_frame_list.rs b/crates/debugger_ui/src/tests/stack_frame_list.rs index 7e1763f6650..dd1ddcdf7a1 100644 --- a/crates/debugger_ui/src/tests/stack_frame_list.rs +++ b/crates/debugger_ui/src/tests/stack_frame_list.rs @@ -1,3 +1,4 @@ +#![expect(clippy::result_large_err)] use crate::{ debugger_panel::DebugPanel, session::running::stack_frame_list::{ diff --git a/crates/debugger_ui/src/tests/variable_list.rs b/crates/debugger_ui/src/tests/variable_list.rs index 4cfdae093f6..8e6c1259921 100644 --- a/crates/debugger_ui/src/tests/variable_list.rs +++ b/crates/debugger_ui/src/tests/variable_list.rs @@ -1,3 +1,4 @@ +#![expect(clippy::result_large_err)] use std::sync::{ Arc, atomic::{AtomicBool, Ordering}, diff --git a/crates/eval_cli/Dockerfile b/crates/eval_cli/Dockerfile index f733ca42cbe..c0ce40f6032 100644 --- a/crates/eval_cli/Dockerfile +++ b/crates/eval_cli/Dockerfile @@ -7,12 +7,12 @@ # Or use the helper script: # crates/eval_cli/script/build-linux -FROM rust:1.93 AS builder +FROM rust:1.94.1 AS builder WORKDIR /app # Pre-install the toolchain specified in rust-toolchain.toml so it is cached. -RUN rustup toolchain install 1.93 --profile minimal \ +RUN rustup toolchain install 1.94.1 --profile minimal \ --component rustfmt --component clippy --component rust-analyzer --component rust-src \ --target wasm32-wasip2 --target wasm32-unknown-unknown --target x86_64-unknown-linux-musl --target x86_64-unknown-linux-gnu diff --git a/crates/project/src/debugger/test.rs b/crates/project/src/debugger/test.rs index 53b88323e63..7ccbafa0e55 100644 --- a/crates/project/src/debugger/test.rs +++ b/crates/project/src/debugger/test.rs @@ -1,3 +1,4 @@ +#![expect(clippy::result_large_err)] use std::{path::Path, sync::Arc}; use dap::client::DebugAdapterClient; diff --git a/crates/rpc/src/message_stream.rs b/crates/rpc/src/message_stream.rs index 023e916df31..34888d98147 100644 --- a/crates/rpc/src/message_stream.rs +++ b/crates/rpc/src/message_stream.rs @@ -7,7 +7,6 @@ use futures::{SinkExt as _, StreamExt as _}; use proto::Message as _; use std::time::Instant; use std::{fmt::Debug, io}; -use zstd::zstd_safe::WriteBuf; const KIB: usize = 1024; const MIB: usize = KIB * 1024; @@ -87,7 +86,10 @@ where let received_at = Instant::now(); match bytes? { WebSocketMessage::Binary(bytes) => { - zstd::stream::copy_decode(bytes.as_slice(), &mut self.encoding_buffer)?; + zstd::stream::copy_decode( + zstd::zstd_safe::WriteBuf::as_slice(&*bytes), + &mut self.encoding_buffer, + )?; let envelope = Envelope::decode(self.encoding_buffer.as_slice()) .map_err(io::Error::from)?; diff --git a/rust-toolchain.toml b/rust-toolchain.toml index 89b3c648ca2..15b4a8f0fc9 100644 --- a/rust-toolchain.toml +++ b/rust-toolchain.toml @@ -1,5 +1,5 @@ [toolchain] -channel = "1.93" +channel = "1.94.1" profile = "minimal" components = [ "rustfmt", "clippy", "rust-analyzer", "rust-src" ] targets = [