aboutsummaryrefslogtreecommitdiff
path: root/crates/rust-analyzer/src/main_loop.rs
diff options
context:
space:
mode:
authorbors[bot] <26634292+bors[bot]@users.noreply.github.com>2020-06-24 15:25:56 +0100
committerGitHub <[email protected]>2020-06-24 15:25:56 +0100
commit1a3b507a007d0373a83bde203d780b860ea55ce1 (patch)
treefd9b9d3295963b17f65d2a0960189adeae38c3a2 /crates/rust-analyzer/src/main_loop.rs
parent97c4d06258bace7c9caf211d3a307fff05bdb58e (diff)
parente6c61d5072e600372ba4a38ad8893af37aaa77e6 (diff)
Merge #5034
5034: Cleanup project.json deserialization r=matklad a=matklad bors r+ 🤖 Co-authored-by: Aleksey Kladov <[email protected]>
Diffstat (limited to 'crates/rust-analyzer/src/main_loop.rs')
-rw-r--r--crates/rust-analyzer/src/main_loop.rs5
1 files changed, 1 insertions, 4 deletions
diff --git a/crates/rust-analyzer/src/main_loop.rs b/crates/rust-analyzer/src/main_loop.rs
index b9d296856..390c66dfc 100644
--- a/crates/rust-analyzer/src/main_loop.rs
+++ b/crates/rust-analyzer/src/main_loop.rs
@@ -114,10 +114,7 @@ pub fn main_loop(config: Config, connection: Connection) -> Result<()> {
114 .ok() 114 .ok()
115 } 115 }
116 LinkedProject::InlineJsonProject(it) => { 116 LinkedProject::InlineJsonProject(it) => {
117 Some(ra_project_model::ProjectWorkspace::Json { 117 Some(ra_project_model::ProjectWorkspace::Json { project: it.clone() })
118 project: it.clone(),
119 project_location: config.root_path.clone(),
120 })
121 } 118 }
122 }) 119 })
123 .collect::<Vec<_>>() 120 .collect::<Vec<_>>()