Use Cargo workspaces

alecdotninja · Jan 15, 2024 · 44392da · 44392da
1 parent 0f3dc00
commit 44392da
Show file tree

Hide file tree

Showing 16 changed files with 55 additions and 46 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,5 +1,2 @@
 /target
-/impl/target
-**/*.rs.bk
 Cargo.lock
-*~
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,27 +1,18 @@
-[package]
-name = "tailcall"
+[workspace]
+
+members = [
+    "tailcall",
+    "tailcall-impl",
+]
+
+[workspace.package]
 description = "Safe, zero-cost tail recursion"
 documentation = "https://docs.rs/tailcall"
 repository = "https://github.com/alecdotninja/tailcall"
 readme = "README.md"
 keywords = ["recursion", "tail", "tailcall", "become"]
 categories = ["algorithms", "no-std"]
-exclude = ["/.github", ".gitignore"]
 license = "MIT OR Apache-2.0"
 authors = ["Alec Larsen <[email protected]>"]
 version = "1.0.0"
-edition = "2018"
-
-[badges]
-travis-ci = { repository = "alecdotninja/tailcall" }
-
-[dependencies]
-tailcall-impl = { path = "impl", version = "1.0.0" }
-
-[dev-dependencies]
-backtrace = "0.3.40"
-bencher = "0.1.5"
-
-[[bench]]
-name = "bench"
-harness = false
+edition = "2018"
diff --git a/README.md b/README.md
@@ -16,7 +16,7 @@ Add this to your `Cargo.toml`:
 
 ```toml
 [dependencies]
-tailcall = "1.0.0"
+tailcall = "~1"
 ```
 
 ## Usage

diff --git a/impl/Cargo.toml b/impl/Cargo.toml
diff --git a/tailcall-impl/Cargo.toml b/tailcall-impl/Cargo.toml
@@ -0,0 +1,20 @@
+[package]
+name = "tailcall-impl"
+description = "The procedural macro implementation for the tailcall crate"
+documentation.workspace = true
+repository.workspace = true
+readme.workspace = true
+keywords.workspace = true
+categories.workspace = true
+license.workspace = true
+authors.workspace = true
+version.workspace = true
+edition.workspace = true
+
+[dependencies]
+proc-macro2 = "~1"
+quote = "~1"
+syn = { version = "~1", features = ["full", "fold"] }
+
+[lib]
+proc-macro = true
diff --git a/impl/src/helpers.rs → tailcall-impl/src/helpers.rs b/impl/src/helpers.rs → tailcall-impl/src/helpers.rs
diff --git a/impl/src/lib.rs → tailcall-impl/src/lib.rs b/impl/src/lib.rs → tailcall-impl/src/lib.rs
@@ -31,7 +31,7 @@ use syn::{parse_macro_input, ItemFn};
 /// # Example
 ///
 /// ```
-/// use tailcall::tailcall;
+/// use tailcall_impl::tailcall;
 ///
 /// fn factorial(input: u64) -> u64 {
 ///     #[tailcall]
@@ -52,7 +52,7 @@ use syn::{parse_macro_input, ItemFn};
 /// - All recursive calls must be in [tail form]:
 ///
 /// ```compile_fail
-/// use tailcall::tailcall;
+/// use tailcall_impl::tailcall;
 ///   
 /// #[tailcall]
 /// fn factorial(input: u64) -> u64 {

diff --git a/impl/src/transforms.rs → tailcall-impl/src/transforms.rs b/impl/src/transforms.rs → tailcall-impl/src/transforms.rs
diff --git a/tailcall/Cargo.toml b/tailcall/Cargo.toml
@@ -0,0 +1,23 @@
+[package]
+name = "tailcall"
+description.workspace = true
+documentation.workspace = true
+repository.workspace = true
+readme.workspace = true
+keywords.workspace = true
+categories.workspace = true
+license.workspace = true
+authors.workspace = true
+version.workspace = true
+edition.workspace = true
+
+[dependencies]
+tailcall-impl = { path = "../tailcall-impl" }
+
+[dev-dependencies]
+backtrace = "~0.3"
+bencher = "~0.1"
+
+[[bench]]
+name = "bench"
+harness = false
diff --git a/benches/bench.rs → tailcall/benches/bench.rs b/benches/bench.rs → tailcall/benches/bench.rs
diff --git a/src/lib.rs → tailcall/src/lib.rs b/src/lib.rs → tailcall/src/lib.rs
diff --git a/src/trampoline.rs → tailcall/src/trampoline.rs b/src/trampoline.rs → tailcall/src/trampoline.rs
diff --git a/tests/correctness.rs → tailcall/tests/correctness.rs b/tests/correctness.rs → tailcall/tests/correctness.rs
diff --git a/tests/correctness_option.rs → tailcall/tests/correctness_option.rs b/tests/correctness_option.rs → tailcall/tests/correctness_option.rs
diff --git a/tests/correctness_result.rs → tailcall/tests/correctness_result.rs b/tests/correctness_result.rs → tailcall/tests/correctness_result.rs
diff --git a/tests/stack_depth.rs → tailcall/tests/stack_depth.rs b/tests/stack_depth.rs → tailcall/tests/stack_depth.rs