Revert "Revert "chore: Bump Rust version to 1.77 (#9631)"" (#9672)

Piotr Osiewicz created 2 years ago

Reverts zed-industries/zed#9658, as the Docker image is now available.

Release notes:

- N/A

Change summary

Dockerfile                               | 2 +-
crates/journal/src/journal.rs            | 1 +
crates/language/src/language_registry.rs | 7 +++++--
crates/project/src/prettier_support.rs   | 2 +-
crates/project/src/task_inventory.rs     | 4 ++--
rust-toolchain.toml                      | 2 +-
6 files changed, 11 insertions(+), 7 deletions(-)

Detailed changes

Dockerfile

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

crates/journal/src/journal.rs

@@ -94,6 +94,7 @@ pub fn new_journal_entry(app_state: Arc<AppState>, cx: &mut WindowContext) {
         std::fs::create_dir_all(month_dir)?;
         OpenOptions::new()
             .create(true)
+            .truncate(false)
             .write(true)
             .open(&entry_path)?;
         Ok::<_, std::io::Error>((journal_dir, entry_path))

crates/language/src/language_registry.rs

@@ -80,8 +80,11 @@ struct AvailableLanguage {
 
 enum AvailableGrammar {
     Native(tree_sitter::Language),
-    Loaded(#[allow(dead_code)] PathBuf, tree_sitter::Language),
-    Loading(PathBuf, Vec<oneshot::Sender<Result<tree_sitter::Language>>>),
+    Loaded(#[allow(unused)] PathBuf, tree_sitter::Language),
+    Loading(
+        #[allow(unused)] PathBuf,
+        Vec<oneshot::Sender<Result<tree_sitter::Language>>>,
+    ),
     Unloaded(PathBuf),
 }
 

crates/project/src/prettier_support.rs

@@ -530,7 +530,7 @@ impl Project {
         if buffer_language.prettier_parser_name().is_none() {
             return Task::ready(None);
         }
-        let Some(node) = self.node.as_ref().map(Arc::clone) else {
+        let Some(node) = self.node.clone() else {
             return Task::ready(None);
         };
         match File::from_dyn(buffer_file).map(|file| (file.worktree_id(cx), file.abs_path(cx))) {

crates/project/src/task_inventory.rs

@@ -590,7 +590,7 @@ mod tests {
             (TaskSourceKind::UserInput, common_name.to_string()),
             (TaskSourceKind::UserInput, "user_input".to_string()),
         ];
-        let worktree_1_tasks = vec![
+        let worktree_1_tasks = [
             (
                 TaskSourceKind::Worktree {
                     id: worktree_1,
@@ -606,7 +606,7 @@ mod tests {
                 "worktree_1".to_string(),
             ),
         ];
-        let worktree_2_tasks = vec![
+        let worktree_2_tasks = [
             (
                 TaskSourceKind::Worktree {
                     id: worktree_2,

rust-toolchain.toml

@@ -1,5 +1,5 @@
 [toolchain]
-channel = "1.76"
+channel = "1.77"
 profile = "minimal"
 components = [ "rustfmt", "clippy" ]
 targets = [ "x86_64-apple-darwin", "aarch64-apple-darwin", "x86_64-unknown-linux-gnu", "wasm32-wasi" ]