Setup cargo workspace

.gitignore

@@ -1 +1,2 @@
 /target
+/**/target

Cargo.lock

@@ -389,8 +389,6 @@ dependencies = [
  "simple-signal",
  "smart-default",
  "structopt",
- "strum 0.20.0",
- "strum_macros 0.20.1",
  "sysinfo",
  "tokio",
  "tokio-stream",
@@ -1713,12 +1711,6 @@ version = "0.18.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "57bd81eb48f4c437cadc685403cad539345bf703d78e63707418431cecd4522b"
 
-[[package]]
-name = "strum"
-version = "0.20.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7318c509b5ba57f18533982607f24070a55d353e90d4cae30c467cdb2ad5ac5c"
-
 [[package]]
 name = "strum_macros"
 version = "0.18.0"
@@ -1731,18 +1723,6 @@ dependencies = [
  "syn 1.0.72",
 ]
 
-[[package]]
-name = "strum_macros"
-version = "0.20.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ee8bc6b87a5112aeeab1f4a9f7ab634fe6cbefc4850006df31267f4cfb9e3149"
-dependencies = [
- "heck",
- "proc-macro2",
- "quote 1.0.9",
- "syn 1.0.72",
-]
-
 [[package]]
 name = "syn"
 version = "0.11.11"
@@ -1798,8 +1778,8 @@ checksum = "0f3ecc17269a19353b3558b313bba738b25d82993e30d62a18406a24aba4649b"
 dependencies = [
  "heck",
  "pkg-config",
- "strum 0.18.0",
+ "strum",
- "strum_macros 0.18.0",
+ "strum_macros",
  "thiserror",
  "toml",
  "version-compare",

Cargo.toml

@@ -1,73 +1,4 @@
-[package]
+[workspace]
-name = "eww"
+members = [
-version = "0.1.0"
+    "crates/eww"
-authors = ["elkowar <5300871+elkowar@users.noreply.github.com>"]
+]
-edition = "2018"
-description= "Widget system for everyone!"
-license = "MIT"
-repository = "https://github.com/elkowar/eww"
-homepage = "https://github.com/elkowar/eww"
-
-
-[features]
-default = ["x11"]
-x11 = ["gdkx11", "x11rb"]
-wayland = ["gtk-layer-shell", "gtk-layer-shell-sys"]
-no-x11-wayland = []
-[dependencies.cairo-sys-rs]
-version = "0.10.0"
-
-[dependencies]
-gtk = { version = "0.9", features = [ "v3_22" ] }
-gdk = { version = "*", features = ["v3_22"] }
-gio = { version = "*", features = ["v2_44"] }
-glib = { version = "*", features = ["v2_44"] }
-
-gdk-pixbuf = "0.9"
-
-gtk-layer-shell = { version="0.2.0", optional=true }
-gtk-layer-shell-sys = { version="0.2.0", optional=true }
-gdkx11 = { version = "0.9", optional = true }
-x11rb = { version = "0.8", features = ["randr"], optional = true }
-
-regex = "1"
-bincode = "1.3"
-anyhow = "1.0"
-derive_more = "0.99"
-maplit = "1"
-structopt = "0.3"
-serde = {version = "1.0", features = ["derive"]}
-serde_json = "1.0"
-extend = "1"
-grass = "0.10"
-num = "0.4"
-roxmltree = "0.14"
-itertools = "0.10"
-debug_stub_derive = "0.3"
-log = "0.4"
-pretty_env_logger = "0.4"
-lazy_static = "1.4.0"
-libc = "0.2"
-nix = "0.20"
-smart-default = "0.6"
-simple-signal = "1.1"
-unescape = "0.1"
-
-tokio = { version = "1.0", features = ["full"] }
-tokio-stream = "0.1"
-async-stream = "0.3"
-futures-core = "0.3"
-futures-util = "0.3"
-tokio-util = "0.6"
-
-sysinfo = "0.16.1"
-
-nom = "6.1"
-dyn-clone = "1.0"
-base64 = "0.13"
-wait-timeout = "0.2"
-
-notify = "5.0.0-pre.7"
-
-[dev-dependencies]
-pretty_assertions = "0.7.1"

crates/eww/Cargo.toml

@@ -0,0 +1,73 @@
+[package]
+name = "eww"
+version = "0.1.0"
+authors = ["elkowar <5300871+elkowar@users.noreply.github.com>"]
+edition = "2018"
+description= "Widget system for everyone!"
+license = "MIT"
+repository = "https://github.com/elkowar/eww"
+homepage = "https://github.com/elkowar/eww"
+
+
+[features]
+default = ["x11"]
+x11 = ["gdkx11", "x11rb"]
+wayland = ["gtk-layer-shell", "gtk-layer-shell-sys"]
+no-x11-wayland = []
+[dependencies.cairo-sys-rs]
+version = "0.10.0"
+
+[dependencies]
+gtk = { version = "0.9", features = [ "v3_22" ] }
+gdk = { version = "*", features = ["v3_22"] }
+gio = { version = "*", features = ["v2_44"] }
+glib = { version = "*", features = ["v2_44"] }
+
+gdk-pixbuf = "0.9"
+
+gtk-layer-shell = { version="0.2.0", optional=true }
+gtk-layer-shell-sys = { version="0.2.0", optional=true }
+gdkx11 = { version = "0.9", optional = true }
+x11rb = { version = "0.8", features = ["randr"], optional = true }
+
+regex = "1"
+bincode = "1.3"
+anyhow = "1.0"
+derive_more = "0.99"
+maplit = "1"
+structopt = "0.3"
+serde = {version = "1.0", features = ["derive"]}
+serde_json = "1.0"
+extend = "1"
+grass = "0.10"
+num = "0.4"
+roxmltree = "0.14"
+itertools = "0.10"
+debug_stub_derive = "0.3"
+log = "0.4"
+pretty_env_logger = "0.4"
+lazy_static = "1.4.0"
+libc = "0.2"
+nix = "0.20"
+smart-default = "0.6"
+simple-signal = "1.1"
+unescape = "0.1"
+
+tokio = { version = "1.0", features = ["full"] }
+tokio-stream = "0.1"
+async-stream = "0.3"
+futures-core = "0.3"
+futures-util = "0.3"
+tokio-util = "0.6"
+
+sysinfo = "0.16.1"
+
+nom = "6.1"
+dyn-clone = "1.0"
+base64 = "0.13"
+wait-timeout = "0.2"
+
+notify = "5.0.0-pre.7"
+
+[dev-dependencies]
+pretty_assertions = "0.7.1"