Unnamed repository; edit this file 'description' to name the repository.
Diffstat (limited to 'crates/project-model/src/project_json.rs')
| -rw-r--r-- | crates/project-model/src/project_json.rs | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/crates/project-model/src/project_json.rs b/crates/project-model/src/project_json.rs index b2df8e4703..d3e1f11d78 100644 --- a/crates/project-model/src/project_json.rs +++ b/crates/project-model/src/project_json.rs @@ -53,7 +53,7 @@ use base_db::{CrateDisplayName, CrateName}; use cfg::CfgAtom; use paths::{AbsPath, AbsPathBuf, Utf8PathBuf}; use rustc_hash::{FxHashMap, FxHashSet}; -use serde::{de, Deserialize, Serialize}; +use serde::{Deserialize, Serialize, de}; use span::Edition; use crate::{ManifestPath, TargetKind}; @@ -85,8 +85,7 @@ impl ProjectJson { /// /// * `manifest` - The path to the `rust-project.json`. /// * `base` - The path to the workspace root (i.e. the folder containing `rust-project.json`) - /// * `data` - The parsed contents of `rust-project.json`, or project json that's passed via - /// configuration. + /// * `data` - The parsed contents of `rust-project.json`, or project json that's passed via configuration. pub fn new( manifest: Option<ManifestPath>, base: &AbsPath, @@ -452,7 +451,7 @@ pub enum TargetKindData { } /// Identifies a crate by position in the crates array. /// -/// This will differ from `CrateId` when multiple `ProjectJson` +/// This will differ from `Crate` when multiple `ProjectJson` /// workspaces are loaded. #[derive(Serialize, Deserialize, Debug, Clone, Copy, Eq, PartialEq, Hash)] #[serde(transparent)] |