diff --git a/Dockerfile b/Dockerfile index 9759422518..0bd1b8dd7f 100644 --- a/Dockerfile +++ b/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 . . diff --git a/crates/journal/src/journal.rs b/crates/journal/src/journal.rs index 43191817bf..386b2eb606 100644 --- a/crates/journal/src/journal.rs +++ b/crates/journal/src/journal.rs @@ -94,6 +94,7 @@ pub fn new_journal_entry(app_state: Arc, 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)) diff --git a/crates/language/src/language_registry.rs b/crates/language/src/language_registry.rs index b5a85f34e5..ab4189aed6 100644 --- a/crates/language/src/language_registry.rs +++ b/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>>), + Loaded(#[allow(unused)] PathBuf, tree_sitter::Language), + Loading( + #[allow(unused)] PathBuf, + Vec>>, + ), Unloaded(PathBuf), } diff --git a/crates/project/src/prettier_support.rs b/crates/project/src/prettier_support.rs index 43679ccea6..22463f7210 100644 --- a/crates/project/src/prettier_support.rs +++ b/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))) { diff --git a/crates/project/src/task_inventory.rs b/crates/project/src/task_inventory.rs index 991d47554a..f157c78756 100644 --- a/crates/project/src/task_inventory.rs +++ b/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, diff --git a/rust-toolchain.toml b/rust-toolchain.toml index f71bbee6be..df6ae34590 100644 --- a/rust-toolchain.toml +++ b/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" ]