mixa/zed
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bump Rust version to 1.92 (#44649)

Browse Source 
Release Notes:

- N/A

---------

Co-authored-by: Julia Ryan <juliaryan3.14@gmail.com>
This commit is contained in:
Piotr Osiewicz
2025-12-17 01:42:04 +01:00
committed by GitHub
parent 4fe6dc06ea
commit 975a76bbf0
11 changed files with 31 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Dockerfile-collab
View File

@@ -1,6 +1,6 @@
# syntax = docker/dockerfile:1.2 # syntax = docker/dockerfile:1.2
FROM rust:1.91.1-bookworm as builder FROM rust:1.92-bookworm as builder
WORKDIR app WORKDIR app
COPY . . COPY . .

7
crates/editor/src/editor.rs
View File

@@ -15534,10 +15534,9 @@ impl Editor {
I: IntoIterator<Item = P>, I: IntoIterator<Item = P>,
P: AsRef<[u8]>, P: AsRef<[u8]>,
{ {
let case_sensitive = self.select_next_is_case_sensitive.map_or_else( let case_sensitive = self
|| EditorSettings::get_global(cx).search.case_sensitive, .select_next_is_case_sensitive
|value| value, .unwrap_or_else(|| EditorSettings::get_global(cx).search.case_sensitive);
);
let mut builder = AhoCorasickBuilder::new(); let mut builder = AhoCorasickBuilder::new();
builder.ascii_case_insensitive(!case_sensitive); builder.ascii_case_insensitive(!case_sensitive);

6
crates/git_ui/src/branch_picker.rs
View File

@@ -969,12 +969,12 @@ impl PickerDelegate for BranchListDelegate {
"No commits found".into(), "No commits found".into(),
|subject| { |subject| {
if show_author_name if show_author_name
&& author_name.is_some() && let Some(author) =
author_name
{ {
format!( format!(
"{} • {}", "{} • {}",
author_name.unwrap(), author, subject
subject
) )
} else { } else {
subject.to_string() subject.to_string()

1
crates/gpui/src/elements/surface.rs
View File

@@ -29,6 +29,7 @@ pub struct Surface {
} }
/// Create a new surface element. /// Create a new surface element.
#[cfg(target_os = "macos")]
pub fn surface(source: impl Into<SurfaceSource>) -> Surface { pub fn surface(source: impl Into<SurfaceSource>) -> Surface {
Surface { Surface {
source: source.into(), source: source.into(),

4
crates/gpui/src/elements/uniform_list.rs
View File

@@ -712,8 +712,8 @@ mod test {
#[gpui::test] #[gpui::test]
fn test_scroll_strategy_nearest(cx: &mut TestAppContext) { fn test_scroll_strategy_nearest(cx: &mut TestAppContext) {
use crate::{ use crate::{
Context, FocusHandle, ScrollStrategy, UniformListScrollHandle, Window, actions, div, Context, FocusHandle, ScrollStrategy, UniformListScrollHandle, Window, div, prelude::*,
prelude::*, px, uniform_list, px, uniform_list,
}; };
use std::ops::Range; use std::ops::Range;

3
crates/language/src/buffer.rs
View File

@@ -3303,8 +3303,7 @@ impl BufferSnapshot {
// set its end to the outdent position // set its end to the outdent position
if let Some(range_to_truncate) = indent_ranges if let Some(range_to_truncate) = indent_ranges
.iter_mut() .iter_mut()
.filter(|indent_range| indent_range.contains(&outdent_position)) .rfind(|indent_range| indent_range.contains(&outdent_position))
.next_back()
{ {
range_to_truncate.end = outdent_position; range_to_truncate.end = outdent_position;
} }

14
crates/project/src/lsp_store.rs
View File

@@ -2285,12 +2285,10 @@ impl LocalLspStore {
&& lsp_action.data.is_some() && lsp_action.data.is_some()
&& (lsp_action.command.is_none() || lsp_action.edit.is_none()) && (lsp_action.command.is_none() || lsp_action.edit.is_none())
{ {
*lsp_action = Box::new( **lsp_action = lang_server
lang_server .request::<lsp::request::CodeActionResolveRequest>(*lsp_action.clone())
.request::<lsp::request::CodeActionResolveRequest>(*lsp_action.clone()) .await
.await .into_response()?;
.into_response()?,
);
} }
} }
LspAction::CodeLens(lens) => { LspAction::CodeLens(lens) => {
@@ -6480,7 +6478,7 @@ impl LspStore {
server_id == *completion_server_id, server_id == *completion_server_id,
"server_id mismatch, applying completion resolve for {server_id} but completion server id is {completion_server_id}" "server_id mismatch, applying completion resolve for {server_id} but completion server id is {completion_server_id}"
); );
*lsp_completion = Box::new(resolved_completion); **lsp_completion = resolved_completion;
*resolved = true; *resolved = true;
} }
Ok(()) Ok(())
@@ -6639,7 +6637,7 @@ impl LspStore {
server_id == *completion_server_id, server_id == *completion_server_id,
"remote server_id mismatch, applying completion resolve for {server_id} but completion server id is {completion_server_id}" "remote server_id mismatch, applying completion resolve for {server_id} but completion server id is {completion_server_id}"
); );
*lsp_completion = Box::new(resolved_lsp_completion); **lsp_completion = resolved_lsp_completion;
*resolved = true; *resolved = true;
} }

8
crates/vim/src/motion.rs
View File

@@ -1,5 +1,5 @@
use editor::{ use editor::{
Anchor, Bias, BufferOffset, DisplayPoint, Editor, MultiBufferOffset, RowExt, ToOffset, ToPoint, Anchor, Bias, BufferOffset, DisplayPoint, Editor, MultiBufferOffset, RowExt, ToOffset,
display_map::{DisplayRow, DisplaySnapshot, FoldPoint, ToDisplayPoint}, display_map::{DisplayRow, DisplaySnapshot, FoldPoint, ToDisplayPoint},
movement::{ movement::{
self, FindRange, TextLayoutDetails, find_boundary, find_preceding_boundary_display_point, self, FindRange, TextLayoutDetails, find_boundary, find_preceding_boundary_display_point,
@@ -2262,7 +2262,6 @@ fn go_to_line(map: &DisplaySnapshot, display_point: DisplayPoint, line: usize) -
.offset_to_point(excerpt.map_offset_from_buffer(BufferOffset(offset))); .offset_to_point(excerpt.map_offset_from_buffer(BufferOffset(offset)));
return map.clip_point(map.point_to_display_point(point, Bias::Left), Bias::Left); return map.clip_point(map.point_to_display_point(point, Bias::Left), Bias::Left);
} }
let mut last_position = None;
for (excerpt, buffer, range) in map.buffer_snapshot().excerpts() { for (excerpt, buffer, range) in map.buffer_snapshot().excerpts() {
let excerpt_range = language::ToOffset::to_offset(&range.context.start, buffer) let excerpt_range = language::ToOffset::to_offset(&range.context.start, buffer)
..language::ToOffset::to_offset(&range.context.end, buffer); ..language::ToOffset::to_offset(&range.context.end, buffer);
@@ -2273,14 +2272,9 @@ fn go_to_line(map: &DisplaySnapshot, display_point: DisplayPoint, line: usize) -
} else if offset <= excerpt_range.start { } else if offset <= excerpt_range.start {
let anchor = Anchor::in_buffer(excerpt, range.context.start); let anchor = Anchor::in_buffer(excerpt, range.context.start);
return anchor.to_display_point(map); return anchor.to_display_point(map);
} else {
last_position = Some(Anchor::in_buffer(excerpt, range.context.end));
} }
} }
let mut last_point = last_position.unwrap().to_point(&map.buffer_snapshot());
last_point.column = point.column;
map.clip_point( map.clip_point(
map.point_to_display_point( map.point_to_display_point(
map.buffer_snapshot().clip_point(point, Bias::Left), map.buffer_snapshot().clip_point(point, Bias::Left),

2
crates/zed/src/zed.rs
View File

@@ -353,6 +353,8 @@ pub fn initialize_workspace(
) { ) {
let mut _on_close_subscription = bind_on_window_closed(cx); let mut _on_close_subscription = bind_on_window_closed(cx);
cx.observe_global::<SettingsStore>(move |cx| { cx.observe_global::<SettingsStore>(move |cx| {
// A 1.92 regression causes unused-assignment to trigger on this variable.
_ = _on_close_subscription.is_some();
_on_close_subscription = bind_on_window_closed(cx); _on_close_subscription = bind_on_window_closed(cx);
}) })
.detach(); .detach();

22
flake.lock generated
View File

@@ -2,11 +2,11 @@
"nodes": { "nodes": {
"crane": { "crane": {
"locked": { "locked": {
"lastModified": 1762538466, "lastModified": 1765145449,
"narHash": "sha256-8zrIPl6J+wLm9MH5ksHcW7BUHo7jSNOu0/hA0ohOOaM=", "narHash": "sha256-aBVHGWWRzSpfL++LubA0CwOOQ64WNLegrYHwsVuVN7A=",
"owner": "ipetkov", "owner": "ipetkov",
"repo": "crane", "repo": "crane",
"rev": "0cea393fffb39575c46b7a0318386467272182fe", "rev": "69f538cdce5955fcd47abfed4395dc6d5194c1c5",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -17,11 +17,11 @@
}, },
"flake-compat": { "flake-compat": {
"locked": { "locked": {
"lastModified": 1761588595, "lastModified": 1765121682,
"narHash": "sha256-XKUZz9zewJNUj46b4AJdiRZJAvSZ0Dqj2BNfXvFlJC4=", "narHash": "sha256-4VBOP18BFeiPkyhy9o4ssBNQEvfvv1kXkasAYd0+rrA=",
"owner": "edolstra", "owner": "edolstra",
"repo": "flake-compat", "repo": "flake-compat",
"rev": "f387cd2afec9419c8ee37694406ca490c3f34ee5", "rev": "65f23138d8d09a92e30f1e5c87611b23ef451bf3",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -53,16 +53,14 @@
}, },
"rust-overlay": { "rust-overlay": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": ["nixpkgs"]
"nixpkgs"
]
}, },
"locked": { "locked": {
"lastModified": 1762915112, "lastModified": 1765465581,
"narHash": "sha256-d9j1g8nKmYDHy+/bIOPQTh9IwjRliqaTM0QLHMV92Ic=", "narHash": "sha256-fCXT0aZXmTalM3NPCTedVs9xb0egBG5BOZkcrYo5PGE=",
"owner": "oxalica", "owner": "oxalica",
"repo": "rust-overlay", "repo": "rust-overlay",
"rev": "aa1e85921cfa04de7b6914982a94621fbec5cc02", "rev": "99cc5667eece98bb35dcf35f7e511031a8b7a125",
"type": "github" "type": "github"
}, },
"original": { "original": {

2
rust-toolchain.toml
View File

@@ -1,5 +1,5 @@
[toolchain] [toolchain]
channel = "1.91.1" channel = "1.92"
profile = "minimal" profile = "minimal"
components = [ "rustfmt", "clippy" ] components = [ "rustfmt", "clippy" ]
targets = [ targets = [