Hector Alfaro
407924d5a6
## Objective The doc comment links for `Settings::PRESERVED_KEYS` point to `[FileContent](Self::FileContent)` but that associated type was removed by the settings refactor in https://github.com/zed-industries/zed/pull/38367. `Settings::from_settings` now takes `&SettingsContent` directly. The dead link causes `rustdoc::broken_intra_doc_links` warnings when building docs for the `settings` crate: ``` warning: unresolved link to `Self::FileContent` --> crates/settings/src/settings_store.rs:61:53 | 61 | /// The name of the keys in the [`FileContent`](Self::FileContent) that should | ^^^^^^^^^^^^^^^^^ the trait `Settings` has no associated item named `FileContent` ``` Fixes #57310 ## Solution Replaced both `[FileContent](Self::FileContent)` occurrences in `crates/settings/src/settings_store.rs` with `[SettingsContent]`, which is already in scope via the existing `use` at the top of the file and resolves correctly. Docs-only change, no runtime behavior change. ## Testing - Verified with `cargo doc -p settings --no-deps`, which now completes without any `broken_intra_doc_links` warnings (previously emitted two). - No runtime code touched — doc comments only, so no other testing applies. ## Self-Review Checklist: - [x] I've reviewed my own diff for quality, security, and reliability - [x] Unsafe blocks (if any) have justifying comments - [x] The content adheres to Zed's UI standards ([UX/UI](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist) and [icon](https://github.com/zed-industries/zed/blob/main/crates/icons/README.md) guidelines) - [x] Tests cover the new/changed behavior - [x] Performance impact has been considered and is acceptable --- Release Notes: - N/A
Zed
Welcome to Zed, a high-performance, multiplayer code editor from the creators of Atom and Tree-sitter.
Installation
On macOS, Linux, and Windows you can download Zed directly or install Zed via your local package manager (macOS/Linux/Windows).
Other platforms are not yet available:
- Web (tracking discussion)
Developing Zed
Contributing
See CONTRIBUTING.md for ways you can contribute to Zed.
Also... we're hiring! Check out our jobs page for open roles.
Licensing
Zed source code is licensed primarily under GPL-3.0-or-later, with Apache-2.0 components where marked.
License information for third party dependencies must be correctly provided for CI to pass.
We use cargo-about to automatically comply with open source licenses. If CI is failing, check the following:
- Is it showing a
no license specifiederror for a crate you've created? If so, addpublish = falseunder[package]in your crate's Cargo.toml. - Is the error
failed to satisfy license requirementsfor a dependency? If so, first determine what license the project has and whether this system is sufficient to comply with this license's requirements. If you're unsure, ask a lawyer. Once you've verified that this system is acceptable add the license's SPDX identifier to theacceptedarray inscript/licenses/zed-licenses.toml. - Is
cargo-aboutunable to find the license for a dependency? If so, add a clarification field at the end ofscript/licenses/zed-licenses.toml, as specified in the cargo-about book.
Sponsorship
Zed is developed by Zed Industries, Inc., a for-profit company.
If you’d like to financially support the project, you can do so via GitHub Sponsors. Sponsorships go directly to Zed Industries and are used as general company revenue. There are no perks or entitlements associated with sponsorship.