From 8367f549a3a9cb0cb37a70c6461822225f409817 Mon Sep 17 00:00:00 2001
From: Alex Kotov <kotovalexarian@gmail.com>
Date: Fri, 9 Sep 2022 17:13:04 +0400
Subject: [PATCH] Move Rust code to the subdirectory

---
 .gitignore                                    |  1 +
 Cargo.toml                                    | 26 +++----------------
 Makefile                                      |  7 ++++-
 Cargo.lock => rust-polytreewm/Cargo.lock      |  0
 rust-polytreewm/Cargo.toml                    | 22 ++++++++++++++++
 .../src}/api/constraints.rs                   |  0
 {src => rust-polytreewm/src}/api/geom.rs      |  0
 {src => rust-polytreewm/src}/api/mod.rs       |  0
 {src => rust-polytreewm/src}/api/settings.rs  |  0
 {src => rust-polytreewm/src}/constraints.rs   |  0
 {src => rust-polytreewm/src}/geom.rs          |  0
 {src => rust-polytreewm/src}/lib.rs           |  0
 {src => rust-polytreewm/src}/settings.rs      |  0
 {src => rust-polytreewm/src}/unit.rs          |  0
 14 files changed, 33 insertions(+), 23 deletions(-)
 rename Cargo.lock => rust-polytreewm/Cargo.lock (100%)
 create mode 100644 rust-polytreewm/Cargo.toml
 rename {src => rust-polytreewm/src}/api/constraints.rs (100%)
 rename {src => rust-polytreewm/src}/api/geom.rs (100%)
 rename {src => rust-polytreewm/src}/api/mod.rs (100%)
 rename {src => rust-polytreewm/src}/api/settings.rs (100%)
 rename {src => rust-polytreewm/src}/constraints.rs (100%)
 rename {src => rust-polytreewm/src}/geom.rs (100%)
 rename {src => rust-polytreewm/src}/lib.rs (100%)
 rename {src => rust-polytreewm/src}/settings.rs (100%)
 rename {src => rust-polytreewm/src}/unit.rs (100%)

diff --git a/.gitignore b/.gitignore
index f8e3f5d..374d8d6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
+/Cargo.lock
 /config/1-generated.mk
 /config/2-conditionals.mk
 /polytreewm
diff --git a/Cargo.toml b/Cargo.toml
index 101c0c2..72d75ab 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,22 +1,4 @@
-[package]
-name = "polytreewm"
-version = "0.0.0"
-authors = ["Alex Kotov <kotovalexarian@gmail.com>"]
-edition = "2021"
-description = "PolytreeWM is an extremely fast, small, and dynamic tiling window manager for X"
-readme = true
-homepage = "https://github.com/PolytreeDE/polytreewm"
-repository = "https://github.com/PolytreeDE/polytreewm.git"
-license = "MIT"
-keywords = []
-categories = []
-publish = false
-
-[lib]
-name = "polytreewm"
-crate-type = ["staticlib"]
-
-[dependencies]
-ctor = "0.1.23"
-env_logger = "0.9.0"
-log = "0.4.17"
+[workspace]
+members = [
+    "rust-polytreewm",
+]
diff --git a/Makefile b/Makefile
index 0960fa5..d71f8fd 100644
--- a/Makefile
+++ b/Makefile
@@ -14,7 +14,12 @@ CONFIGMKS = \
 	$(CONFIGMKS_TO_REMOVE) \
 	config/3-defvars.mk
 
-RUST_SRC = Cargo.toml Cargo.lock src/*.rs src/**/*.rs
+RUST_SRC = \
+	rust-polytreewm/Cargo.toml \
+	rust-polytreewm/Cargo.lock \
+	rust-polytreewm/src/*.rs \
+	rust-polytreewm/src/**/*.rs
+
 RUST_APIS = src/constraints.h src/geom.h src/helpers.h src/settings.h
 
 MODULES_SRC = \
diff --git a/Cargo.lock b/rust-polytreewm/Cargo.lock
similarity index 100%
rename from Cargo.lock
rename to rust-polytreewm/Cargo.lock
diff --git a/rust-polytreewm/Cargo.toml b/rust-polytreewm/Cargo.toml
new file mode 100644
index 0000000..101c0c2
--- /dev/null
+++ b/rust-polytreewm/Cargo.toml
@@ -0,0 +1,22 @@
+[package]
+name = "polytreewm"
+version = "0.0.0"
+authors = ["Alex Kotov <kotovalexarian@gmail.com>"]
+edition = "2021"
+description = "PolytreeWM is an extremely fast, small, and dynamic tiling window manager for X"
+readme = true
+homepage = "https://github.com/PolytreeDE/polytreewm"
+repository = "https://github.com/PolytreeDE/polytreewm.git"
+license = "MIT"
+keywords = []
+categories = []
+publish = false
+
+[lib]
+name = "polytreewm"
+crate-type = ["staticlib"]
+
+[dependencies]
+ctor = "0.1.23"
+env_logger = "0.9.0"
+log = "0.4.17"
diff --git a/src/api/constraints.rs b/rust-polytreewm/src/api/constraints.rs
similarity index 100%
rename from src/api/constraints.rs
rename to rust-polytreewm/src/api/constraints.rs
diff --git a/src/api/geom.rs b/rust-polytreewm/src/api/geom.rs
similarity index 100%
rename from src/api/geom.rs
rename to rust-polytreewm/src/api/geom.rs
diff --git a/src/api/mod.rs b/rust-polytreewm/src/api/mod.rs
similarity index 100%
rename from src/api/mod.rs
rename to rust-polytreewm/src/api/mod.rs
diff --git a/src/api/settings.rs b/rust-polytreewm/src/api/settings.rs
similarity index 100%
rename from src/api/settings.rs
rename to rust-polytreewm/src/api/settings.rs
diff --git a/src/constraints.rs b/rust-polytreewm/src/constraints.rs
similarity index 100%
rename from src/constraints.rs
rename to rust-polytreewm/src/constraints.rs
diff --git a/src/geom.rs b/rust-polytreewm/src/geom.rs
similarity index 100%
rename from src/geom.rs
rename to rust-polytreewm/src/geom.rs
diff --git a/src/lib.rs b/rust-polytreewm/src/lib.rs
similarity index 100%
rename from src/lib.rs
rename to rust-polytreewm/src/lib.rs
diff --git a/src/settings.rs b/rust-polytreewm/src/settings.rs
similarity index 100%
rename from src/settings.rs
rename to rust-polytreewm/src/settings.rs
diff --git a/src/unit.rs b/rust-polytreewm/src/unit.rs
similarity index 100%
rename from src/unit.rs
rename to rust-polytreewm/src/unit.rs