Merge pure-rust and mixed templates

PyO3 · Nov 24, 2021 · bee5780 · bee5780
1 parent 8ce6a0c
commit bee5780
Show file tree

Hide file tree

Showing 12 changed files with 8 additions and 131 deletions.
diff --git a/templates/mixed/.gitignore → templates/.gitignore b/templates/mixed/.gitignore → templates/.gitignore
diff --git a/templates/mixed/Cargo.toml → templates/Cargo.toml b/templates/mixed/Cargo.toml → templates/Cargo.toml
diff --git a/templates/pure-rust/cargo-generate.toml → templates/cargo-generate.toml b/templates/pure-rust/cargo-generate.toml → templates/cargo-generate.toml
@@ -1,9 +1,17 @@
+[placeholders.mixed_layout]
+type = "bool"
+prompt = "Use mixed Rust/Python project layout?"
+default = false
+
 [placeholders.binding]
 type = "string"
 prompt = "What binding to use?"
 choices = ["pyo3", "rust-cpython", "cffi", "bin"]
 default = "pyo3"
 
+[conditional.'mixed_layout != true']
+ignore = [ "{{crate_name}}/" ]
+
 [conditional.'binding != "bin"']
 ignore = [ "src/main.rs" ]
 

diff --git a/templates/mixed/cargo-generate.toml b/templates/mixed/cargo-generate.toml
diff --git a/templates/pure-rust/.gitignore b/templates/pure-rust/.gitignore
diff --git a/templates/pure-rust/Cargo.toml b/templates/pure-rust/Cargo.toml
diff --git a/templates/pure-rust/pyproject.toml b/templates/pure-rust/pyproject.toml
diff --git a/templates/pure-rust/src/lib.rs b/templates/pure-rust/src/lib.rs
diff --git a/templates/mixed/pyproject.toml → templates/pyproject.toml b/templates/mixed/pyproject.toml → templates/pyproject.toml
diff --git a/templates/mixed/src/lib.rs → templates/src/lib.rs b/templates/mixed/src/lib.rs → templates/src/lib.rs
diff --git a/templates/pure-rust/src/main.rs → templates/src/main.rs b/templates/pure-rust/src/main.rs → templates/src/main.rs
diff --git a/templates/mixed/{{crate_name}}/__init__.py → templates/{{crate_name}}/__init__.py b/templates/mixed/{{crate_name}}/__init__.py → templates/{{crate_name}}/__init__.py