Merge pull request #1235 from ankhers/devenv_as_lib

Turn devenv into a library
cachix · May 27, 2024 · 60ed3db · 60ed3db
2 parents a1290a1 + 784fc12
commit 60ed3db
Show file tree

Hide file tree

Showing 9 changed files with 9 additions and 32 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -3,5 +3,4 @@ resolver = "2"
 members = [
     "devenv",
     "devenv-run-tests",
-    "devenv_core",
 ]
diff --git a/devenv-run-tests/Cargo.toml b/devenv-run-tests/Cargo.toml
@@ -6,4 +6,4 @@ edition = "2018"
 [dependencies]
 clap = { version = "3", features = ["derive"] }
 
-devenv_core = { path = "../devenv_core" }
+devenv= { path = "../devenv" }
diff --git a/devenv-run-tests/src/main.rs b/devenv-run-tests/src/main.rs
@@ -1,4 +1,6 @@
 use clap::Parser;
+use devenv::log::Level;
+use devenv::log::Logger;
 use std::fs;
 use std::path::PathBuf;
 
@@ -30,6 +32,10 @@ struct TestResult {
 }
 
 fn run_tests_in_directory(args: &Args) -> Result<Vec<TestResult>, Box<dyn std::error::Error>> {
+    let logger = Logger::new(Level::Info);
+
+    logger.info("Running Tests");
+
     let cwd = std::env::current_dir()?;
     let cwd = cwd.display();
 

diff --git a/devenv/Cargo.toml b/devenv/Cargo.toml
@@ -28,5 +28,4 @@ which = "6.0.0"
 whoami = "1.5.1"
 xdg = "2.5.2"
 
-devenv_core = { path = "../devenv_core" }
 schemars = "0.8.16"
diff --git a/devenv/src/lib.rs b/devenv/src/lib.rs
@@ -0,0 +1 @@
+pub mod log;
diff --git a/devenv_core/Cargo.toml b/devenv_core/Cargo.toml
diff --git a/devenv_core/src/lib.rs b/devenv_core/src/lib.rs
diff --git a/package.nix b/package.nix
@@ -9,7 +9,6 @@ pkgs.rustPlatform.buildRustPackage {
     "Cargo.lock"
     "devenv(/\.*)?"
     "devenv-run-tests(/\.*)?"
-    "devenv_core(/\.*)?"
   ];
 
   cargoLock = {