Moved find_manifest functions from sway_util into forc_util (Fu…

…elLabs#957)

* moved `find_manifest` functions into `forc_util`

Co-authored-by: John Adler <[email protected]>

forc-util/src/lib.rs

@@ -17,6 +17,32 @@ pub mod restricted;
 
 pub const DEFAULT_OUTPUT_DIRECTORY: &str = "out";
 
+/// Continually go up in the file tree until a specified file is found.
+#[allow(clippy::branches_sharing_code)]
+pub fn find_parent_dir_with_file(starter_path: &Path, file_name: &str) -> Option<PathBuf> {
+    let mut path = std::fs::canonicalize(starter_path).ok()?;
+    let empty_path = PathBuf::from("/");
+    while path != empty_path {
+        path.push(file_name);
+        if path.exists() {
+            path.pop();
+            return Some(path);
+        } else {
+            path.pop();
+            path.pop();
+        }
+    }
+    None
+}
+/// Continually go up in the file tree until a Forc manifest file is found.
+pub fn find_manifest_dir(starter_path: &Path) -> Option<PathBuf> {
+    find_parent_dir_with_file(starter_path, constants::MANIFEST_FILE_NAME)
+}
+/// Continually go up in the file tree until a Cargo manifest file is found.
+pub fn find_cargo_manifest_dir(starter_path: &Path) -> Option<PathBuf> {
+    find_parent_dir_with_file(starter_path, "Cargo.toml")
+}
+
 pub fn is_sway_file(file: &Path) -> bool {
     let res = file.extension();
     Some(OsStr::new(constants::SWAY_EXTENSION)) == res

forc/src/ops/forc_build.rs

@@ -1,12 +1,12 @@
 use crate::cli::BuildCommand;
 use anyhow::{anyhow, bail, Result};
 use forc_pkg::{self as pkg, lock, Lock, Manifest};
-use forc_util::{default_output_directory, lock_path};
+use forc_util::{default_output_directory, find_manifest_dir, lock_path};
 use std::{
     fs::{self, File},
     path::PathBuf,
 };
-use sway_utils::{find_manifest_dir, MANIFEST_FILE_NAME};
+use sway_utils::MANIFEST_FILE_NAME;
 
 pub fn build(command: BuildCommand) -> Result<pkg::Compiled> {
     let BuildCommand {

forc/src/ops/forc_clean.rs

@@ -1,8 +1,8 @@
 use crate::cli::CleanCommand;
 use anyhow::{anyhow, bail, Result};
-use forc_util::default_output_directory;
+use forc_util::{default_output_directory, find_cargo_manifest_dir, find_manifest_dir};
 use std::{path::PathBuf, process};
-use sway_utils::{find_cargo_manifest_dir, find_manifest_dir, MANIFEST_FILE_NAME};
+use sway_utils::MANIFEST_FILE_NAME;
 
 pub fn clean(command: CleanCommand) -> Result<()> {
     let CleanCommand { path } = command;

forc/src/ops/forc_deploy.rs

@@ -3,12 +3,13 @@ use crate::ops::forc_build;
 use crate::utils::cli_error::CliError;
 use anyhow::Result;
 use forc_pkg::Manifest;
+use forc_util::find_manifest_dir;
 use fuel_gql_client::client::FuelClient;
 use fuel_tx::{Output, Salt, Transaction};
 use fuel_vm::prelude::*;
 use std::path::PathBuf;
 use sway_core::{parse, TreeType};
-use sway_utils::{constants::*, find_manifest_dir};
+use sway_utils::constants::*;
 
 pub async fn deploy(command: DeployCommand) -> Result<fuel_tx::ContractId, CliError> {
     let curr_dir = if let Some(ref path) = command.path {

forc/src/ops/forc_fmt.rs

@@ -1,11 +1,11 @@
 use crate::cli::{BuildCommand, FormatCommand};
 use crate::ops::forc_build;
-use forc_util::{println_green, println_red};
+use forc_util::{find_manifest_dir, println_green, println_red};
 use prettydiff::{basic::DiffOp, diff_lines};
 use std::default::Default;
 use std::{fmt, fs, io, path::Path, sync::Arc};
 use sway_fmt::{get_formatted_data, FormattingOptions};
-use sway_utils::{constants, find_manifest_dir, get_sway_files};
+use sway_utils::{constants, get_sway_files};
 use taplo::formatter as taplo_fmt;
 
 pub fn format(command: FormatCommand) -> Result<(), FormatError> {

forc/src/ops/forc_run.rs

@@ -2,13 +2,14 @@ use crate::cli::{BuildCommand, RunCommand};
 use crate::ops::forc_build;
 use crate::utils::cli_error::CliError;
 use forc_pkg::Manifest;
+use forc_util::find_manifest_dir;
 use fuel_gql_client::client::FuelClient;
 use fuel_tx::Transaction;
 use futures::TryFutureExt;
 use std::path::PathBuf;
 use std::str::FromStr;
 use sway_core::{parse, TreeType};
-use sway_utils::{constants::*, find_manifest_dir};
+use sway_utils::constants::*;
 use tokio::process::Child;
 
 pub async fn run(command: RunCommand) -> Result<(), CliError> {

forc/src/ops/forc_update.rs

@@ -1,9 +1,8 @@
 use crate::cli::UpdateCommand;
 use anyhow::{anyhow, Result};
 use forc_pkg::{self as pkg, lock, Lock, Manifest};
-use forc_util::lock_path;
+use forc_util::{find_manifest_dir, lock_path};
 use std::{fs, path::PathBuf};
-use sway_utils::find_manifest_dir;
 
 /// Running `forc update` will check for updates for the entire dependency graph and commit new
 /// semver-compatible versions to the `Forc.lock` file. For git dependencies, the commit is updated

sway-lsp/Cargo.toml

@@ -10,6 +10,7 @@ description = "LSP server for Sway."
 
 [dependencies]
 dashmap = "4.0.2"
+forc-util = { version = "0.7.0", path = "../forc-util" }
 tower-lsp = "0.16.0"
 ropey = "1.2"
 serde_json = "1.0.60"

sway-lsp/src/server.rs

@@ -3,8 +3,9 @@ use crate::core::{
     document::{DocumentError, TextDocument},
     session::Session,
 };
+use forc_util::find_manifest_dir;
 use std::sync::Arc;
-use sway_utils::helpers::{find_manifest_dir, get_sway_files};
+use sway_utils::helpers::get_sway_files;
 use tower_lsp::lsp_types::*;
 use tower_lsp::{jsonrpc, Client, LanguageServer};
 

sway-utils/src/helpers.rs

@@ -4,31 +4,6 @@ use std::ffi::OsStr;
 use std::fs;
 use std::path::{Path, PathBuf};
 
-/// Continually go up in the file tree until a specified file is found.
-#[allow(clippy::branches_sharing_code)]
-pub fn find_parent_dir_with_file(starter_path: &Path, file_name: &str) -> Option<PathBuf> {
-    let mut path = std::fs::canonicalize(starter_path).ok()?;
-    let empty_path = PathBuf::from("/");
-    while path != empty_path {
-        path.push(file_name);
-        if path.exists() {
-            path.pop();
-            return Some(path);
-        } else {
-            path.pop();
-            path.pop();
-        }
-    }
-    None
-}
-/// Continually go up in the file tree until a Forc manifest file is found.
-pub fn find_manifest_dir(starter_path: &Path) -> Option<PathBuf> {
-    find_parent_dir_with_file(starter_path, constants::MANIFEST_FILE_NAME)
-}
-/// Continually go up in the file tree until a Cargo manifest file is found.
-pub fn find_cargo_manifest_dir(starter_path: &Path) -> Option<PathBuf> {
-    find_parent_dir_with_file(starter_path, "Cargo.toml")
-}
 pub fn get_sway_files(path: PathBuf) -> Vec<PathBuf> {
     let mut files = vec![];
     let mut dir_entries = vec![path];