diff --git a/Dockerfile-collab b/Dockerfile-collab index 50af874200a6ef3bc3c882b7d08257ec41f944de..fbbcb0df0484c26a65823171cc976de8cb838b8c 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 aa2e53f43cb13511e7eee2e9685a4939b07243b9..966445e4480c12a11bb7e331d14a32bb9118096a 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 4e8839f82f4de69fd1851ef50ff0d55ad09d0aa9..0b89b8c133956791892ea1f1959d06a20df8d005 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 fad483b0f4af19826f9da0d32659c8ac83712f1f..9e672be080aad417ca299a16c8de126617a3bce6 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 ff2b0f695f6a2e7f0ca65b49938e0129efb04326..3b40e27aa43e3ec251b12b020b1d9bced829875e 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 e4c258a8d2af0b865f13c28430c44a66117a11cd..223ed13142d91584eb1ec309e33e2442a3601782 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 3ca29f7cc3e99514d8a664d9218593c3640b27dc..c82276d824349c5d5e588cbde68ee3ae9bc5370f 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 09c90cbc4a3af71aa9fb7273cf3535e9f7ece592..21b5ec67c20b5fda509df501e206919d0e83be08 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 54c38d8b1cec8d043748338830d643d63479e533..01e83b533eb21e178bfaacaf9184757fcb207738 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 f5fb4f0ab2d5957240c6981d20526a025f54a387..ca04828c40b3b33467b6fed8f623d9e6919aeb65 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 7e1763f6650127be12803f4d64bc16f0ab3c9989..dd1ddcdf7a160e051a18993983da59a50dba71fd 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 4cfdae093f6a1464b178c053e629a6ebe6d76d02..8e6c1259921b45fe6c63099fae04d284c3c134fc 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 f733ca42cbe5b37f25f25f510eee3fc57e102495..c0ce40f6032a23b6de995bf00393e68f01111616 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 53b88323e6326fe7d6d74f79a5e92845514c6b61..7ccbafa0e5507e3b7362a31df5170e285d7532f0 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 023e916df3113e73adafdc0d38948121ad2e9cec..34888d98147124c5c971843d0124fceb95e47cde 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 89b3c648ca2a8a9b893d1b0924697f8170047761..15b4a8f0fc9f93064f08046bcb1edff01e6c6d44 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 = [