Skip to content

Commit 34aa5c2

Browse files
committed
Auto merge of #137284 - matthiaskrgr:rollup-deuhk46, r=matthiaskrgr
Rollup of 9 pull requests Successful merges: - #127793 (Added project-specific Zed IDE settings) - #134995 (Stabilize const_slice_flatten) - #136301 (Improve instant docs) - #136347 (Add a bullet point to `std::fs::copy`) - #136794 (Stabilize file_lock) - #137094 (x86_win64 ABI: do not use xmm0 with softfloat ABI) - #137227 (docs(dev): Update the feature-gate instructions) - #137232 (Don't mention `FromResidual` on bad `?`) - #137251 (coverage: Get hole spans from nested items without fully visiting them) r? `@ghost` `@rustbot` modify labels: rollup
2 parents 654035f + 523648b commit 34aa5c2

File tree

2 files changed

+12
-3
lines changed

2 files changed

+12
-3
lines changed

Diff for: src/building/suggested.md

+11
Original file line numberDiff line numberDiff line change
@@ -154,6 +154,16 @@ You can run `./x setup editor` and select `helix`, which will prompt you to
154154
create `languages.toml` with the recommended configuration for Helix. The
155155
recommended settings live at [`src/etc/rust_analyzer_helix.toml`].
156156

157+
### Zed
158+
159+
Zed comes with built-in LSP and rust-analyzer support.
160+
It can be configured through `.zed/settings.json`, as described
161+
[here](https://zed.dev/docs/configuring-languages). Selecting `zed`
162+
in `./x setup editor` will prompt you to create a `.zed/settings.json`
163+
file which will configure Zed with the recommended configuration. The
164+
recommended `rust-analyzer` settings live
165+
at [`src/etc/rust_analyzer_zed.json`].
166+
157167
## Check, check, and check again
158168

159169
When doing simple refactoring, it can be useful to run `./x check`
@@ -381,4 +391,5 @@ load this completion.
381391
[`src/etc/rust_analyzer_settings.json`]: https://github.com/rust-lang/rust/blob/master/src/etc/rust_analyzer_settings.json
382392
[`src/etc/rust_analyzer_eglot.el`]: https://github.com/rust-lang/rust/blob/master/src/etc/rust_analyzer_eglot.el
383393
[`src/etc/rust_analyzer_helix.toml`]: https://github.com/rust-lang/rust/blob/master/src/etc/rust_analyzer_helix.toml
394+
[`src/etc/rust_analyzer_zed.json`]: https://github.com/rust-lang/rust/blob/master/src/etc/rust_analyzer_zed.json
384395
[`src/etc/pre-push.sh`]: https://github.com/rust-lang/rust/blob/master/src/etc/pre-push.sh

Diff for: src/implementing_new_features.md

+1-3
Original file line numberDiff line numberDiff line change
@@ -167,9 +167,7 @@ a new unstable feature:
167167

168168
1. Prevent usage of the new feature unless the feature gate is set.
169169
You can check it in most places in the compiler using the
170-
expression `tcx.features().$feature_name` (or
171-
`sess.features_untracked().$feature_name` if the
172-
tcx is unavailable)
170+
expression `tcx.features().$feature_name()`
173171

174172
If the feature gate is not set, you should either maintain
175173
the pre-feature behavior or raise an error, depending on

0 commit comments

Comments
 (0)