From cafbac0591af0f151defbefe36b64738ca19eaf1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9my=20Rakic?= Date: Wed, 13 Sep 2023 14:34:47 +0000 Subject: [PATCH 1/2] fix r-a rustfmt command --- src/etc/rust_analyzer_settings.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/etc/rust_analyzer_settings.json b/src/etc/rust_analyzer_settings.json index 6e5e2c35005a6..39df45f8ba5a7 100644 --- a/src/etc/rust_analyzer_settings.json +++ b/src/etc/rust_analyzer_settings.json @@ -16,7 +16,7 @@ "compiler/rustc_codegen_gcc/Cargo.toml" ], "rust-analyzer.rustfmt.overrideCommand": [ - "./build/host/rustfmt/bin/rustfmt", + "${workspaceFolder}/build/host/rustfmt/bin/rustfmt", "--edition=2021" ], "rust-analyzer.procMacro.server": "./build/host/stage0/libexec/rust-analyzer-proc-macro-srv", From ee79684402b9949bfad70eb992bb3d89658a0d6d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9my=20Rakic?= Date: Wed, 13 Sep 2023 15:18:51 +0000 Subject: [PATCH 2/2] update `SETTINGS_HASHES` to the latest revision --- src/bootstrap/setup.rs | 1 + 1 file changed, 1 insertion(+) diff --git a/src/bootstrap/setup.rs b/src/bootstrap/setup.rs index 30730f50491fe..0e4fcce7ed8f9 100644 --- a/src/bootstrap/setup.rs +++ b/src/bootstrap/setup.rs @@ -33,6 +33,7 @@ static SETTINGS_HASHES: &[&str] = &[ "af1b5efe196aed007577899db9dae15d6dbc923d6fa42fa0934e68617ba9bbe0", "3468fea433c25fff60be6b71e8a215a732a7b1268b6a83bf10d024344e140541", "47d227f424bf889b0d899b9cc992d5695e1b78c406e183cd78eafefbe5488923", + "ff705f15d76357e2b7c98d6ed9983ac63acde9f1fbf58d10528c00df1d86d554", ]; static RUST_ANALYZER_SETTINGS: &str = include_str!("../etc/rust_analyzer_settings.json");