From 4e3f5cc7293d97aef4630ea30b8e9ad6931589a8 Mon Sep 17 00:00:00 2001
From: Aleksey Kladov <aleksey.kladov@gmail.com>
Date: Sat, 31 Aug 2019 14:47:37 +0300
Subject: cleanup main loop

---
 crates/ra_lsp_server/src/cargo_target_spec.rs | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

(limited to 'crates/ra_lsp_server/src/cargo_target_spec.rs')

diff --git a/crates/ra_lsp_server/src/cargo_target_spec.rs b/crates/ra_lsp_server/src/cargo_target_spec.rs
index 050c5fd95..a083bb311 100644
--- a/crates/ra_lsp_server/src/cargo_target_spec.rs
+++ b/crates/ra_lsp_server/src/cargo_target_spec.rs
@@ -1,10 +1,7 @@
-use crate::{
-    project_model::{self, TargetKind},
-    world::WorldSnapshot,
-    Result,
-};
-
 use ra_ide_api::{FileId, RunnableKind};
+use ra_project_model::{self, ProjectWorkspace, TargetKind};
+
+use crate::{world::WorldSnapshot, Result};
 
 pub(crate) fn runnable_args(
     world: &WorldSnapshot,
@@ -66,7 +63,7 @@ impl CargoTargetSpec {
         let file_id = world.analysis().crate_root(crate_id)?;
         let path = world.vfs.read().file2path(ra_vfs::VfsFile(file_id.0));
         let res = world.workspaces.iter().find_map(|ws| match ws {
-            project_model::ProjectWorkspace::Cargo { cargo, .. } => {
+            ProjectWorkspace::Cargo { cargo, .. } => {
                 let tgt = cargo.target_by_root(&path)?;
                 Some(CargoTargetSpec {
                     package: tgt.package(&cargo).name(&cargo).to_string(),
@@ -74,7 +71,7 @@ impl CargoTargetSpec {
                     target_kind: tgt.kind(&cargo),
                 })
             }
-            project_model::ProjectWorkspace::Json { .. } => None,
+            ProjectWorkspace::Json { .. } => None,
         });
         Ok(res)
     }
-- 
cgit v1.2.3