Merge branch 'master' into gd/shl

crates/fm/src/lib.rs

@@ -149,7 +149,7 @@ mod tests {
 
     fn create_dummy_file(dir: &TempDir, file_name: &Path) {
         let file_path = dir.path().join(file_name);
-        let _file = std::fs::File::create(file_path.clone()).unwrap();
+        let _file = std::fs::File::create(file_path).unwrap();
     }
 
     #[test]
@@ -175,7 +175,7 @@ mod tests {
 
         let mut fm = FileManager::new(dir.path());
 
-        let file_id = fm.add_file(&file_name).unwrap();
+        let file_id = fm.add_file(file_name).unwrap();
 
         assert!(fm.path(file_id).ends_with("foo"));
     }
@@ -189,7 +189,7 @@ mod tests {
         let file_name = Path::new("lib.nr");
         create_dummy_file(&dir, file_name);
 
-        let file_id = fm.add_file(&file_name).unwrap();
+        let file_id = fm.add_file(file_name).unwrap();
 
         // Create a sub directory
         // we now have:
@@ -238,7 +238,7 @@ mod tests {
         let second_file_name = PathBuf::from(sub_sub_dir.path()).join("./../../lib.nr");
 
         // Add both files to the file manager
-        let file_id = fm.add_file(&file_name).unwrap();
+        let file_id = fm.add_file(file_name).unwrap();
         let second_file_id = fm.add_file(&second_file_name).unwrap();
 
         assert_eq!(file_id, second_file_id);

crates/nargo/Cargo.toml

@@ -14,10 +14,11 @@ rustc_version = "0.4.0"
 acvm.workspace = true
 noirc_abi.workspace = true
 noirc_driver.workspace = true
+noirc_frontend.workspace = true
 iter-extended.workspace = true
-toml.workspace = true
 serde.workspace = true
 serde_json.workspace = true
 thiserror.workspace = true
 noirc_errors.workspace = true
-base64.workspace = true
+base64.workspace = true
+regex = "1.9.1"

crates/nargo_cli/src/constants.rs → crates/nargo/src/constants.rs

@@ -1,23 +1,23 @@
 // Directories
 /// The directory for the `nargo contract` command output
-pub(crate) const CONTRACT_DIR: &str = "contract";
+pub const CONTRACT_DIR: &str = "contract";
 /// The directory to store serialized circuit proofs.
-pub(crate) const PROOFS_DIR: &str = "proofs";
+pub const PROOFS_DIR: &str = "proofs";
 /// The directory to store Noir source files
-pub(crate) const SRC_DIR: &str = "src";
+pub const SRC_DIR: &str = "src";
 /// The directory to store circuits' serialized ACIR representations.
-pub(crate) const TARGET_DIR: &str = "target";
+pub const TARGET_DIR: &str = "target";
 
 // Files
 /// The file from which Nargo pulls prover inputs
-pub(crate) const PROVER_INPUT_FILE: &str = "Prover";
+pub const PROVER_INPUT_FILE: &str = "Prover";
 /// The file from which Nargo pulls verifier inputs
-pub(crate) const VERIFIER_INPUT_FILE: &str = "Verifier";
+pub const VERIFIER_INPUT_FILE: &str = "Verifier";
 /// The package definition file for a Noir project.
-pub(crate) const PKG_FILE: &str = "Nargo.toml";
+pub const PKG_FILE: &str = "Nargo.toml";
 
 // Extensions
 /// The extension for files containing circuit proofs.
-pub(crate) const PROOF_EXT: &str = "proof";
+pub const PROOF_EXT: &str = "proof";
 /// The extension for files containing proof witnesses.
-pub(crate) const WITNESS_EXT: &str = "tr";
+pub const WITNESS_EXT: &str = "tr";

crates/nargo/src/lib.rs

@@ -8,8 +8,10 @@
 //! Noir Package Manager abbreviated is npm, which is already taken.
 
 pub mod artifacts;
+pub mod constants;
 mod errors;
-pub mod manifest;
 pub mod ops;
+pub mod package;
+pub mod workspace;
 
 pub use self::errors::NargoError;