From c3dcc7477be49f91bfa5d2f7ac717ca38feaeff0 Mon Sep 17 00:00:00 2001 From: Justin Wood Date: Fri, 19 Apr 2024 12:01:47 -0400 Subject: [PATCH] Create the devenv_core package This will be filled out in another PR to move some functionality from the devenv package so that it can be used in devenv-test-all. --- Cargo.lock | 6 ++++++ Cargo.toml | 3 ++- devenv-run-tests/Cargo.toml | 4 +++- devenv/Cargo.toml | 2 ++ devenv_core/Cargo.toml | 8 ++++++++ devenv_core/src/lib.rs | 14 ++++++++++++++ package.nix | 1 + 7 files changed, 36 insertions(+), 2 deletions(-) create mode 100644 devenv_core/Cargo.toml create mode 100644 devenv_core/src/lib.rs diff --git a/Cargo.lock b/Cargo.lock index ba4d9f3e4..4bf3f35d4 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -418,6 +418,7 @@ dependencies = [ "ansiterm", "clap 4.5.1", "cli-table", + "devenv_core", "dotlock", "fs2", "hex", @@ -444,8 +445,13 @@ name = "devenv-run-tests" version = "0.1.0" dependencies = [ "clap 3.2.25", + "devenv_core", ] +[[package]] +name = "devenv_core" +version = "0.1.0" + [[package]] name = "digest" version = "0.10.7" diff --git a/Cargo.toml b/Cargo.toml index 6e0add60e..903a10fc1 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -3,4 +3,5 @@ resolver = "2" members = [ "devenv", "devenv-run-tests", -] \ No newline at end of file + "devenv_core", +] diff --git a/devenv-run-tests/Cargo.toml b/devenv-run-tests/Cargo.toml index 8f3258ed6..918e02a45 100644 --- a/devenv-run-tests/Cargo.toml +++ b/devenv-run-tests/Cargo.toml @@ -4,4 +4,6 @@ version = "0.1.0" edition = "2018" [dependencies] -clap = { version = "3", features = ["derive"] } \ No newline at end of file +clap = { version = "3", features = ["derive"] } + +devenv_core = { path = "../devenv_core" } diff --git a/devenv/Cargo.toml b/devenv/Cargo.toml index 17b433f46..ee8abe9b2 100644 --- a/devenv/Cargo.toml +++ b/devenv/Cargo.toml @@ -27,3 +27,5 @@ tracing = "0.1.40" which = "6.0.0" whoami = "1.5.1" xdg = "2.5.2" + +devenv_core = { path = "../devenv_core" } diff --git a/devenv_core/Cargo.toml b/devenv_core/Cargo.toml new file mode 100644 index 000000000..bfa3b5aff --- /dev/null +++ b/devenv_core/Cargo.toml @@ -0,0 +1,8 @@ +[package] +name = "devenv_core" +version = "0.1.0" +edition = "2021" + +# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html + +[dependencies] diff --git a/devenv_core/src/lib.rs b/devenv_core/src/lib.rs new file mode 100644 index 000000000..7d12d9af8 --- /dev/null +++ b/devenv_core/src/lib.rs @@ -0,0 +1,14 @@ +pub fn add(left: usize, right: usize) -> usize { + left + right +} + +#[cfg(test)] +mod tests { + use super::*; + + #[test] + fn it_works() { + let result = add(2, 2); + assert_eq!(result, 4); + } +} diff --git a/package.nix b/package.nix index adb2bcf14..d40a56945 100644 --- a/package.nix +++ b/package.nix @@ -9,6 +9,7 @@ pkgs.rustPlatform.buildRustPackage { "Cargo.lock" "devenv(/\.*)?" "devenv-run-tests(/\.*)?" + "devenv_core(/\.*)?" ]; cargoLock = {