zed-industries/zed
1
1
Fork 0
mirror of https://github.com/zed-industries/zed.git synced 2024-12-26 19:44:04 +03:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
This reverts commit 6184278faf.

We can't upgrade to Rust 1.77 until there are Rust 1.77 Docker images
available
(https://github.com/docker-library/official-images/pull/16457).


Release Notes:

- N/A
This commit is contained in:
Marshall Bowers 2024-03-21 14:07:22 -04:00 committed by GitHub
parent b6201a34b9
commit d557f8e36c
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
6 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Dockerfile
View File

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

1
crates/journal/src/journal.rs
View File

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

7
crates/language/src/language_registry.rs
View File

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

2
crates/project/src/prettier_support.rs
View File

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

4
crates/project/src/task_inventory.rs
View File

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

2
rust-toolchain.toml
View File

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