From 0659de1a2ab09e733fc41f2b24f64dc88526107c Mon Sep 17 00:00:00 2001 From: Maurice Hieronymus Date: Tue, 10 Dec 2024 18:06:30 +0100 Subject: [PATCH] Downgrade compiler back to nightly-2024-11-09 The newer versions have a faulty rust-analyzer which does not work well with the Helix editor. The auto completion sometimes changes while cycling through them. We need to wait until this is fixed either here https://github.com/helix-editor/helix/issues/12119 or here https://github.com/rust-lang/rust-analyzer/issues/18547 --- Cargo.toml | 2 +- common/Cargo.toml | 2 +- kernel/Cargo.toml | 2 +- rust-toolchain | 2 +- userspace/Cargo.toml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 5be62ad9..7a87782b 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -5,7 +5,7 @@ members = [ "userspace", ] default-members = ["kernel"] -resolver = "3" +resolver = "2" [workspace.package] description = "Yet another Rust Operating System (YaROS)" diff --git a/common/Cargo.toml b/common/Cargo.toml index b255c2a7..45756a9b 100644 --- a/common/Cargo.toml +++ b/common/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "common" -edition = "2024" +edition = "2021" description.workspace = true authors.workspace = true version.workspace = true diff --git a/kernel/Cargo.toml b/kernel/Cargo.toml index 715ec5d4..5da6ce30 100644 --- a/kernel/Cargo.toml +++ b/kernel/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "yaros" -edition = "2024" +edition = "2021" version.workspace = true authors.workspace = true description.workspace = true diff --git a/rust-toolchain b/rust-toolchain index 43050d66..ee84f7d3 100644 --- a/rust-toolchain +++ b/rust-toolchain @@ -1,3 +1,3 @@ [toolchain] -channel = "nightly-2024-12-04" +channel = "nightly-2024-11-09" targets = ["riscv64gc-unknown-none-elf"] diff --git a/userspace/Cargo.toml b/userspace/Cargo.toml index 8800710d..b29cea23 100644 --- a/userspace/Cargo.toml +++ b/userspace/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "userspace" -edition = "2024" +edition = "2021" version.workspace = true authors.workspace = true description.workspace = true