Skip to content

Commit 9361781

Browse files
committed
Auto merge of #149463 - cyrgani:comma-fix, r=chenyukang
add a missing comma to default r-a settings file
2 parents 3ff30e7 + 33f2e82 commit 9361781

File tree

3 files changed

+6
-4
lines changed

3 files changed

+6
-4
lines changed

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -625,6 +625,7 @@ Select which editor you would like to set up [default: None]: ";
625625
"a61df796c0c007cb6512127330564e49e57d558dec715703916a928b072a1054",
626626
"02a49ac2d31f00ef6e4531c44e00dac51cea895112e480553f1ba060b3942a47",
627627
"0aa4748848de0d1cb7ece92a0123c8897fef6de2f58aff8fda1426f098b7a798",
628+
"e5e357862e5d6d0d9da335e9823c07b8a7dc42bbf18d72cc5206ad1049cd8fcc",
628629
],
629630
EditorKind::Zed => &[
630631
"bbce727c269d1bd0c98afef4d612eb4ce27aea3c3a8968c5f10b31affbc40b6c",
@@ -634,6 +635,7 @@ Select which editor you would like to set up [default: None]: ";
634635
"f0bb3d23ab1a49175ab0ef5c4071af95bb03d01d460776cdb716d91333443382",
635636
"5ef83292111d9a8bb63b6afc3abf42d0bc78fe24985f0d2e039e73258b5dab8f",
636637
"74420c13094b530a986b37c4f1d23cb58c0e8e2295f5858ded129fb1574e66f9",
638+
"2d3b592c089b2ad2c528686a1e371af49922edad1c59accd5d5f31612a441568",
637639
],
638640
}
639641
}

src/etc/rust_analyzer_settings.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,9 @@
3535
"x.py",
3636
"check",
3737
"--json-output",
38-
"--compile-time-deps"
38+
"--compile-time-deps",
3939
"--build-dir",
40-
"build-rust-analyzer",
40+
"build-rust-analyzer"
4141
],
4242
"rust-analyzer.server.extraEnv": {
4343
"RUSTUP_TOOLCHAIN": "nightly"

src/etc/rust_analyzer_zed.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,10 +46,10 @@
4646
"python3",
4747
"x.py",
4848
"check",
49-
"--json-output"
49+
"--json-output",
5050
"--compile-time-deps",
5151
"--build-dir",
52-
"build-rust-analyzer",
52+
"build-rust-analyzer"
5353
]
5454
}
5555
},

0 commit comments

Comments
 (0)