Workspace 2

cargo-shuttle/src/lib.rs

@@ -7,7 +7,7 @@ mod init;
 use shuttle_common::project::ProjectName;
 use std::collections::BTreeMap;
 use std::ffi::OsString;
-use std::fs::{read_to_string, File};
+use std::fs::{read_dir, read_to_string, File};
 use std::io::stdout;
 use std::net::{Ipv4Addr, SocketAddr};
 use std::path::{Path, PathBuf};
@@ -208,9 +208,17 @@ impl Shuttle {
     }
 
     fn find_root_directory(dir: &Path) -> Option<PathBuf> {
-        dir.ancestors()
-            .find(|ancestor| ancestor.join("Cargo.toml").exists())
-            .map(|path| path.to_path_buf())
+        let ancestors = dir.ancestors();
+        for p in ancestors {
+            let has_cargo = read_dir(p)
+                .unwrap()
+                .into_iter()
+                .any(|p| p.unwrap().file_name() == *"Cargo.lock");
+            if has_cargo {
+                return Some(PathBuf::from(p));
+            }
+        }
+        None
     }
 
     pub fn load_project(&mut self, project_args: &mut ProjectArgs) -> Result<()> {

service/src/loader.rs

@@ -106,7 +106,7 @@ pub async fn build_crate(
     project_path: &Path,
     release_mode: bool,
     tx: Sender<Message>,
-) -> anyhow::Result<PathBuf> {
+) -> anyhow::Result<Vec<PathBuf>> {
     let (read, write) = pipe::pipe();
     let project_path = project_path.to_owned();
 
@@ -144,7 +144,11 @@ pub async fn build_crate(
     let opts = get_compile_options(&config, release_mode)?;
     let compilation = compile(&ws, &opts);
 
-    Ok(compilation?.cdylibs[0].path.clone())
+    Ok(compilation?
+        .cdylibs
+        .into_iter()
+        .map(|item| item.path)
+        .collect())
 }
 
 pub fn clean_crate(project_path: &Path, release_mode: bool) -> anyhow::Result<Vec<String>> {