Skip to content

Commit 694ddb3

Browse files
authored
Rollup merge of #148570 - TomFryersMidsummer:dir-locals, r=chenyukang
Fix mismatched brackets in generated .dir-locals.el This caused Emacs to throw errors when opening files. Introduced in 3fe3edb.
2 parents 3f1bce5 + 72cec24 commit 694ddb3

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

src/bootstrap/src/core/build_steps/setup.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -587,7 +587,7 @@ Select which editor you would like to set up [default: None]: ";
587587
"631c837b0e98ae35fd48b0e5f743b1ca60adadf2d0a2b23566ba25df372cf1a9",
588588
"080955765db84bb6cbf178879f489c4e2369397626a6ecb3debedb94a9d0b3ce",
589589
"f501475c6654187091c924ae26187fa5791d74d4a8ab3fb61fbbe4c0275aade1",
590-
"e260553b71e4773c30a63c4b23b42b279fc73e72f95b775c47b7b7c511c51595",
590+
"54bc48fe1996177f5eef86d7231b33978e6d8b737cb0a899e622b7e975c95308",
591591
],
592592
EditorKind::Helix => &[
593593
"2d3069b8cf1b977e5d4023965eb6199597755e6c96c185ed5f2854f98b83d233",

src/etc/rust_analyzer_eglot.el

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
"--build-dir"
2929
"build-rust-analyzer"
3030
"--json-output"
31-
"--compile-time-deps"])]
31+
"--compile-time-deps"])
3232
:sysrootSrc "./library"
3333
:extraEnv (:RUSTC_BOOTSTRAP "1"))
3434
:rustc ( :source "./Cargo.toml" )))))))

0 commit comments

Comments
 (0)