mirror of
https://github.com/zed-industries/zed.git
synced 2026-04-18 07:47:53 +00:00
Bump Rust version to 1.94 (#51086)
Closes #ISSUE Before you mark this PR as ready for review, make sure that you have: - [ ] Added a solid test coverage and/or screenshots from doing manual testing - [ ] Done a self-review taking into account security and performance aspects - [ ] Aligned any UI changes with the [UI checklist](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist) Release Notes: - N/A
This commit is contained in:
+1
-1
@@ -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 . .
|
||||
|
||||
|
||||
@@ -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(
|
||||
|
||||
@@ -1,3 +1,4 @@
|
||||
#![expect(clippy::result_large_err)]
|
||||
use crate::{
|
||||
attach_modal::{Candidate, ModalIntent},
|
||||
tests::start_debug_session_with,
|
||||
|
||||
@@ -1,3 +1,4 @@
|
||||
#![expect(clippy::result_large_err)]
|
||||
use crate::{
|
||||
tests::{active_debug_session_panel, start_debug_session},
|
||||
*,
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -1,3 +1,4 @@
|
||||
#![expect(clippy::result_large_err)]
|
||||
use crate::{
|
||||
persistence::DebuggerPaneItem,
|
||||
tests::{start_debug_session, start_debug_session_with},
|
||||
|
||||
@@ -1,3 +1,4 @@
|
||||
#![expect(clippy::result_large_err)]
|
||||
use std::{path::Path, sync::Arc};
|
||||
|
||||
use dap::{Scope, StackFrame, Variable, requests::Variables};
|
||||
|
||||
@@ -1,3 +1,4 @@
|
||||
#![expect(clippy::result_large_err)]
|
||||
use crate::{
|
||||
debugger_panel::DebugPanel,
|
||||
persistence::DebuggerPaneItem,
|
||||
|
||||
@@ -1,3 +1,4 @@
|
||||
#![expect(clippy::result_large_err)]
|
||||
use dap::DapRegistry;
|
||||
use editor::Editor;
|
||||
use gpui::{BackgroundExecutor, TestAppContext, VisualTestContext};
|
||||
|
||||
@@ -1,3 +1,4 @@
|
||||
#![expect(clippy::result_large_err)]
|
||||
use std::iter::zip;
|
||||
|
||||
use crate::{
|
||||
|
||||
@@ -1,3 +1,4 @@
|
||||
#![expect(clippy::result_large_err)]
|
||||
use crate::{
|
||||
debugger_panel::DebugPanel,
|
||||
session::running::stack_frame_list::{
|
||||
|
||||
@@ -1,3 +1,4 @@
|
||||
#![expect(clippy::result_large_err)]
|
||||
use std::sync::{
|
||||
Arc,
|
||||
atomic::{AtomicBool, Ordering},
|
||||
|
||||
@@ -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
|
||||
|
||||
|
||||
@@ -1,3 +1,4 @@
|
||||
#![expect(clippy::result_large_err)]
|
||||
use std::{path::Path, sync::Arc};
|
||||
|
||||
use dap::client::DebugAdapterClient;
|
||||
|
||||
@@ -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)?;
|
||||
|
||||
|
||||
+1
-1
@@ -1,5 +1,5 @@
|
||||
[toolchain]
|
||||
channel = "1.93"
|
||||
channel = "1.94.1"
|
||||
profile = "minimal"
|
||||
components = [ "rustfmt", "clippy", "rust-analyzer", "rust-src" ]
|
||||
targets = [
|
||||
|
||||
Reference in New Issue
Block a user