Rename json_project -> project_json

[rust.git] / crates / ra_project_model / src / lib.rs

diff --git a/crates/ra_project_model/src/lib.rs b/crates/ra_project_model/src/lib.rs
index ac88532f07c4febfcee95497ed0ffe24e1cc9c33..7e8e00df8b2c4da841ac5731bc8991ceb524ce60 100644 (file)
--- a/crates/ra_project_model/src/lib.rs
+++ b/crates/ra_project_model/src/lib.rs
@@ -1,7 +1,7 @@
 //! FIXME: write short doc here
 
 mod cargo_workspace;
-mod json_project;
+mod project_json;
 mod sysroot;
 
 use std::{
@@ -20,7 +20,7 @@
 
 pub use crate::{
     cargo_workspace::{CargoConfig, CargoWorkspace, Package, Target, TargetKind},
-    json_project::JsonProject,
+    project_json::ProjectJson,
     sysroot::Sysroot,
 };
 pub use ra_proc_macro::ProcMacroClient;
@@ -30,7 +30,7 @@ pub enum ProjectWorkspace {
     /// Project workspace was discovered by running `cargo metadata` and `rustc --print sysroot`.
     Cargo { cargo: CargoWorkspace, sysroot: Sysroot },
     /// Project workspace was manually specified using a `rust-project.json` file.
-    Json { project: JsonProject, project_location: AbsPathBuf },
+    Json { project: ProjectJson, project_location: AbsPathBuf },
 }
 
 /// `PackageRoot` describes a package root folder.
@@ -259,8 +259,8 @@ pub fn to_crate_graph(
                         let file_path = project_location.join(&krate.root_module);
                         let file_id = load(&file_path)?;
                         let edition = match krate.edition {
-                            json_project::Edition::Edition2015 => Edition::Edition2015,
-                            json_project::Edition::Edition2018 => Edition::Edition2018,
+                            project_json::Edition::Edition2015 => Edition::Edition2015,
+                            project_json::Edition::Edition2018 => Edition::Edition2018,
                         };
                         let cfg_options = {
                             let mut opts = CfgOptions::default();
@@ -290,7 +290,7 @@ pub fn to_crate_graph(
                             .map(|it| proc_macro_client.by_dylib_path(&it));
                         // FIXME: No crate name in json definition such that we cannot add OUT_DIR to env
                         Some((
-                            json_project::CrateId(seq_index),
+                            project_json::CrateId(seq_index),
                             crate_graph.add_crate_root(
                                 file_id,
                                 edition,
@@ -306,7 +306,7 @@ pub fn to_crate_graph(
 
                 for (id, krate) in project.crates.iter().enumerate() {
                     for dep in &krate.deps {
-                        let from_crate_id = json_project::CrateId(id);
+                        let from_crate_id = project_json::CrateId(id);
                         let to_crate_id = dep.krate;
                         if let (Some(&from), Some(&to)) =
                             (crates.get(&from_crate_id), crates.get(&to_crate_id))
@@ -528,7 +528,7 @@ pub fn workspace_root_for(&self, path: &Path) -> Option<&Path> {
             ProjectWorkspace::Cargo { cargo, .. } => {
                 Some(cargo.workspace_root()).filter(|root| path.starts_with(root))
             }
-            ProjectWorkspace::Json { project: JsonProject { roots, .. }, .. } => roots
+            ProjectWorkspace::Json { project: ProjectJson { roots, .. }, .. } => roots
                 .iter()
                 .find(|root| path.starts_with(&root.path))
                 .map(|root| root.path.as_ref()),