Skip to content

armgit / zed

Public Imported from GitHub
0

Code at the speed of thought – Zed is a high-performance, multiplayer code editor from the creators of Atom and Tree-sitter.

Use proper editions (#63733)

Kirill Bulatov5a9b9558db01
diff --git a/crates/codestral/Cargo.toml b/crates/codestral/Cargo.toml
index 801221d3128..1802f2a2d72 100644
--- a/crates/codestral/Cargo.toml
+++ b/crates/codestral/Cargo.toml
@@ -1,7 +1,7 @@
[package]
name = "codestral"
version = "0.1.0"
-edition = "2021"
+edition.workspace = true
publish = false
license = "GPL-3.0-or-later"
diff --git a/crates/codestral/src/codestral.rs b/crates/codestral/src/codestral.rs
index c495167593a..917e8a54525 100644
--- a/crates/codestral/src/codestral.rs
+++ b/crates/codestral/src/codestral.rs
@@ -239,10 +239,10 @@ impl EditPredictionDelegate for CodestralEditPredictionDelegate {
let snapshot = buffer.read(cx).snapshot();
// Check if current completion is still valid
- if let Some(current_completion) = self.current_completion.as_ref() {
- if current_completion.interpolate(&snapshot).is_some() {
- return;
- }
+ if let Some(current_completion) = self.current_completion.as_ref()
+ && current_completion.interpolate(&snapshot).is_some()
+ {
+ return;
}
let http_client = self.http_client.clone();
diff --git a/crates/grammars/Cargo.toml b/crates/grammars/Cargo.toml
index 00b35ce9642..5640cd7bc58 100644
--- a/crates/grammars/Cargo.toml
+++ b/crates/grammars/Cargo.toml
@@ -1,7 +1,7 @@
[package]
name = "grammars"
version = "0.1.0"
-edition = "2024"
+edition.workspace = true
publish = false
[lints]
diff --git a/crates/language_core/Cargo.toml b/crates/language_core/Cargo.toml
index 54ec3ce12d4..672d0dabd50 100644
--- a/crates/language_core/Cargo.toml
+++ b/crates/language_core/Cargo.toml
@@ -1,7 +1,7 @@
[package]
name = "language_core"
version = "0.1.0"
-edition = "2024"
+edition.workspace = true
publish = false
[lib]