Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion tools/rust_analyzer/bin/discover_rust_project.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
//! Binary used for automatic Rust workspace discovery by `rust-analyzer`.
//! See [rust-analyzer documentation][rd] for a thorough description of this interface.
//! [rd]: <https://rust-analyzer.github.io/manual.html#rust-analyzer.workspace.discoverConfig>.
//! [rd]: <https://rust-analyzer.github.io/book/configuration.html#workspace.discoverConfig>.

use std::{
env,
Expand Down
8 changes: 4 additions & 4 deletions tools/rust_analyzer/rust_project.rs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
//! Library for generating rust_project.json files from a `Vec<CrateSpec>`
//! See official documentation of file format at https://rust-analyzer.github.io/manual.html
//! See official documentation of file format at https://rust-analyzer.github.io/book/non_cargo_based_projects.html

use core::fmt;
use std::{
Expand Down Expand Up @@ -57,7 +57,7 @@ impl FromStr for RustAnalyzerArg {

/// The format that `rust_analyzer` expects as a response when automatically invoked.
/// See [rust-analyzer documentation][rd] for a thorough description of this interface.
/// [rd]: <https://rust-analyzer.github.io/manual.html#rust-analyzer.workspace.discoverConfig>.
/// [rd]: <https://rust-analyzer.github.io/book/configuration.html#workspace.discoverConfig>.
// `Progress` carries an `&fmt::Arguments` for in-flight log lines, which can't
// be deserialized; the cache stores the inner `RustProject`, never the
// discovery envelope, so Serialize is all we need here.
Expand All @@ -80,7 +80,7 @@ pub enum DiscoverProject<'a> {

/// A `rust-project.json` workspace representation. See
/// [rust-analyzer documentation][rd] for a thorough description of this interface.
/// [rd]: https://rust-analyzer.github.io/manual.html#non-cargo-based-projects
/// [rd]: https://rust-analyzer.github.io/book/non_cargo_based_projects.html
#[derive(Debug, Serialize, Deserialize)]
pub struct RustProject {
/// The path to a Rust sysroot.
Expand All @@ -103,7 +103,7 @@ pub struct RustProject {

/// A `rust-project.json` crate representation. See
/// [rust-analyzer documentation][rd] for a thorough description of this interface.
/// [rd]: https://rust-analyzer.github.io/manual.html#non-cargo-based-projects
/// [rd]: https://rust-analyzer.github.io/book/non_cargo_based_projects.html
#[derive(Debug, Serialize, Deserialize)]
pub struct Crate {
/// A name used in the package's project declaration
Expand Down
Loading