Merge pull request #45 from mobusoperandi/no-workspace

build: no cargo workspace
mobusoperandi · Jan 28, 2024 · c48bc42 · c48bc42
2 parents 6052ee1 + 6c93fdb
commit c48bc42
Show file tree

Hide file tree

Showing 18 changed files with 33 additions and 66 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,14 +1,33 @@
-[workspace]
-members = ["crates/*"]
-resolver = "2"
-
-[workspace.package]
+[package]
+name = "eelco"
+description = "Nix doctests CLI"
 version = "0.1.0"
 edition = "2021"
 license = "MIT"
 repository = "https://github.com/mobusoperandi/eelco"
 keywords = ["nix", "doctest", "cli", "documentation", "test"]
 categories = ["command-line-utilities", "development-tools::testing"]
 
-[workspace.dependencies]
-util = { path = "crates/util" }
+[dependencies]
+anyhow = { version = "1.0.72", features = ["backtrace"] }
+camino = "1.1.6"
+clap = "4.3.21"
+comrak = "0.18.0"
+derive_more = { version = "1.0.0-beta.2", features = ["deref", "display", "into_iterator", "constructor"] }
+futures = "0.3.28"
+glob = "0.3.1"
+indoc = "2.0.3"
+itertools = "0.11.0"
+strip-ansi-escapes = "0.1.1"
+tokio = { version = "1.29.1", features = ["macros", "rt-multi-thread", "io-util"] }
+
+[dependencies.pty-process]
+version = "0.4.0"
+features = ["async"]
+git = "https://github.com/mobusoperandi/pty-process.git"
+rev = "7889630"
+
+[dev-dependencies]
+assert_cmd = "2.0.12"
+assert_fs = "1.0.13"
+indoc = "2.0.3"
diff --git a/crates/eelco/README.md → README.md b/crates/eelco/README.md → README.md
diff --git a/crates/eelco/Cargo.toml b/crates/eelco/Cargo.toml
diff --git a/crates/util/Cargo.toml b/crates/util/Cargo.toml
diff --git a/flake.nix b/flake.nix
@@ -22,9 +22,7 @@
 
       commonArgs = {
         src = craneLib.cleanCargoSource (craneLib.path ./.);
-        inherit (craneLib.crateNameFromCargoToml {cargoToml = ./crates/eelco/Cargo.toml;}) pname;
         buildInputs = optional pkgs.stdenv.isDarwin pkgs.iconv;
-        cargoExtraArgs = "--package eelco";
       };
 
       cargoArtifacts = craneLib.buildDepsOnly commonArgs;

diff --git a/crates/eelco/src/app.rs → src/app.rs b/crates/eelco/src/app.rs → src/app.rs
diff --git a/crates/eelco/src/app/state.rs → src/app/state.rs b/crates/eelco/src/app/state.rs → src/app/state.rs
diff --git a/crates/eelco/src/app/state/repl_state.rs → src/app/state/repl_state.rs b/crates/eelco/src/app/state/repl_state.rs → src/app/state/repl_state.rs
diff --git a/crates/eelco/src/example_id.rs → src/example_id.rs b/crates/eelco/src/example_id.rs → src/example_id.rs
diff --git a/crates/eelco/src/examples.rs → src/examples.rs b/crates/eelco/src/examples.rs → src/examples.rs
diff --git a/crates/eelco/src/main.rs → src/main.rs b/crates/eelco/src/main.rs → src/main.rs
diff --git a/crates/eelco/src/repl.rs → src/repl.rs b/crates/eelco/src/repl.rs → src/repl.rs
diff --git a/crates/eelco/src/repl/driver.rs → src/repl/driver.rs b/crates/eelco/src/repl/driver.rs → src/repl/driver.rs
diff --git a/crates/eelco/src/repl/example.rs → src/repl/example.rs b/crates/eelco/src/repl/example.rs → src/repl/example.rs
diff --git a/crates/eelco/tests/misc.rs → tests/misc.rs b/crates/eelco/tests/misc.rs → tests/misc.rs
@@ -1,3 +1,5 @@
+mod util;
+
 use util::with_eelco;
 
 #[test]

diff --git a/crates/eelco/tests/repl.rs → tests/repl.rs b/crates/eelco/tests/repl.rs → tests/repl.rs
@@ -1,3 +1,5 @@
+mod util;
+
 use assert_fs::prelude::FileWriteStr;
 use indoc::{formatdoc, indoc};
 use util::with_eelco;

diff --git a/crates/util/src/lib.rs → tests/util/mod.rs b/crates/util/src/lib.rs → tests/util/mod.rs