starred/komorebi
1
0
Fork 0
mirror of https://github.com/LGUG2Z/komorebi.git synced 2026-07-09 22:52:51 +02:00
Code Issues 87 Packages Projects Releases 11 Wiki Activity

chore(deps): bump schemars to 1.1

Browse Source
This commit is contained in:
LGUG2Z
2025-12-20 22:04:38 -08:00
parent 90271f1f99
commit 1cb8ed7f10
13 changed files with 8810 additions and 65848 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Cargo.lock
Generated
+9 -21
View File
@@ -642,10 +642,10 @@ dependencies = [
[[package]] [[package]]
name = "base16-egui-themes" name = "base16-egui-themes"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/LGUG2Z/base16-egui-themes?rev=5472b1ab825c48af1a1726e324cfa13b7c385135#5472b1ab825c48af1a1726e324cfa13b7c385135" source = "git+https://github.com/LGUG2Z/base16-egui-themes?rev=adfed118ab1408f134fd7d8a549ccfe47b99d752#adfed118ab1408f134fd7d8a549ccfe47b99d752"
dependencies = [ dependencies = [
"egui", "egui",
"schemars 0.8.22", "schemars 1.1.0",
"serde", "serde",
"strum", "strum",
"strum_macros", "strum_macros",
@@ -3147,7 +3147,7 @@ dependencies = [
"powershell_script", "powershell_script",
"regex", "regex",
"reqwest", "reqwest",
"schemars 0.8.22", "schemars 1.1.0",
"serde", "serde",
"serde_json_lenient", "serde_json_lenient",
"serde_with", "serde_with",
@@ -3197,7 +3197,7 @@ dependencies = [
"parking_lot", "parking_lot",
"random_word", "random_word",
"reqwest", "reqwest",
"schemars 0.8.22", "schemars 1.1.0",
"serde", "serde",
"serde_json_lenient", "serde_json_lenient",
"starship-battery", "starship-battery",
@@ -3252,7 +3252,7 @@ dependencies = [
"eframe", "eframe",
"flavours", "flavours",
"hex_color", "hex_color",
"schemars 0.8.22", "schemars 1.1.0",
"serde", "serde",
"serde_variant", "serde_variant",
"strum", "strum",
@@ -3275,7 +3275,7 @@ dependencies = [
"paste", "paste",
"powershell_script", "powershell_script",
"reqwest", "reqwest",
"schemars 0.8.22", "schemars 1.1.0",
"serde", "serde",
"serde_json_lenient", "serde_json_lenient",
"shadow-rs", "shadow-rs",
@@ -5607,18 +5607,6 @@ dependencies = [
"windows-sys 0.61.2", "windows-sys 0.61.2",
] ]
[[package]]
name = "schemars"
version = "0.8.22"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3fbf2ae1b8bc8e02df939598064d22402220cd5bbcca1c76f7d6a310974d5615"
dependencies = [
"dyn-clone",
"schemars_derive",
"serde",
"serde_json",
]
[[package]] [[package]]
name = "schemars" name = "schemars"
version = "0.9.0" version = "0.9.0"
@@ -5639,15 +5627,16 @@ checksum = "9558e172d4e8533736ba97870c4b2cd63f84b382a3d6eb063da41b91cce17289"
dependencies = [ dependencies = [
"dyn-clone", "dyn-clone",
"ref-cast", "ref-cast",
"schemars_derive",
"serde", "serde",
"serde_json", "serde_json",
] ]
[[package]] [[package]]
name = "schemars_derive" name = "schemars_derive"
version = "0.8.22" version = "1.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "32e265784ad618884abaea0600a9adf15393368d840e0222d101a072f3f7534d" checksum = "301858a4023d78debd2353c7426dc486001bddc91ae31a76fb1f55132f7e2633"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
@@ -5825,7 +5814,6 @@ dependencies = [
"hex", "hex",
"indexmap 1.9.3", "indexmap 1.9.3",
"indexmap 2.12.1", "indexmap 2.12.1",
"schemars 0.8.22",
"schemars 0.9.0", "schemars 0.9.0",
"schemars 1.1.0", "schemars 1.1.0",
"serde_core", "serde_core",
Cargo.toml
+1 -1
View File
@@ -24,7 +24,7 @@ egui_extras = "0.33"
dirs = "6" dirs = "6"
dunce = "1" dunce = "1"
hotwatch = "0.5" hotwatch = "0.5"
schemars = "0.8" schemars = "1.1"
lazy_static = "1" lazy_static = "1"
serde = { version = "1", features = ["derive"] } serde = { version = "1", features = ["derive"] }
serde_json = { package = "serde_json_lenient", version = "0.2" } serde_json = { package = "serde_json_lenient", version = "0.2" }
dependencies.json
+20 -16
View File
@@ -46,7 +46,7 @@
"block-buffer 0.10.4 registry+https://github.com/rust-lang/crates.io-index", "block-buffer 0.10.4 registry+https://github.com/rust-lang/crates.io-index",
"bytemuck 1.24.0 registry+https://github.com/rust-lang/crates.io-index", "bytemuck 1.24.0 registry+https://github.com/rust-lang/crates.io-index",
"bytemuck_derive 1.10.2 registry+https://github.com/rust-lang/crates.io-index", "bytemuck_derive 1.10.2 registry+https://github.com/rust-lang/crates.io-index",
"cc 1.2.49 registry+https://github.com/rust-lang/crates.io-index", "cc 1.2.50 registry+https://github.com/rust-lang/crates.io-index",
"cfg-if 0.1.10 registry+https://github.com/rust-lang/crates.io-index", "cfg-if 0.1.10 registry+https://github.com/rust-lang/crates.io-index",
"cfg-if 1.0.4 registry+https://github.com/rust-lang/crates.io-index", "cfg-if 1.0.4 registry+https://github.com/rust-lang/crates.io-index",
"chrono 0.4.42 registry+https://github.com/rust-lang/crates.io-index", "chrono 0.4.42 registry+https://github.com/rust-lang/crates.io-index",
@@ -181,7 +181,7 @@
"native-tls 0.2.14 registry+https://github.com/rust-lang/crates.io-index", "native-tls 0.2.14 registry+https://github.com/rust-lang/crates.io-index",
"net2 0.2.39 registry+https://github.com/rust-lang/crates.io-index", "net2 0.2.39 registry+https://github.com/rust-lang/crates.io-index",
"nohash-hasher 0.2.0 registry+https://github.com/rust-lang/crates.io-index", "nohash-hasher 0.2.0 registry+https://github.com/rust-lang/crates.io-index",
"ntapi 0.4.1 registry+https://github.com/rust-lang/crates.io-index", "ntapi 0.4.2 registry+https://github.com/rust-lang/crates.io-index",
"num 0.4.3 registry+https://github.com/rust-lang/crates.io-index", "num 0.4.3 registry+https://github.com/rust-lang/crates.io-index",
"num-bigint 0.4.6 registry+https://github.com/rust-lang/crates.io-index", "num-bigint 0.4.6 registry+https://github.com/rust-lang/crates.io-index",
"num-complex 0.4.6 registry+https://github.com/rust-lang/crates.io-index", "num-complex 0.4.6 registry+https://github.com/rust-lang/crates.io-index",
@@ -231,6 +231,8 @@
"raw-window-handle 0.6.2 registry+https://github.com/rust-lang/crates.io-index", "raw-window-handle 0.6.2 registry+https://github.com/rust-lang/crates.io-index",
"rayon 1.11.0 registry+https://github.com/rust-lang/crates.io-index", "rayon 1.11.0 registry+https://github.com/rust-lang/crates.io-index",
"rayon-core 1.13.0 registry+https://github.com/rust-lang/crates.io-index", "rayon-core 1.13.0 registry+https://github.com/rust-lang/crates.io-index",
"ref-cast 1.0.25 registry+https://github.com/rust-lang/crates.io-index",
"ref-cast-impl 1.0.25 registry+https://github.com/rust-lang/crates.io-index",
"regex 1.12.2 registry+https://github.com/rust-lang/crates.io-index", "regex 1.12.2 registry+https://github.com/rust-lang/crates.io-index",
"regex-automata 0.4.13 registry+https://github.com/rust-lang/crates.io-index", "regex-automata 0.4.13 registry+https://github.com/rust-lang/crates.io-index",
"regex-syntax 0.8.8 registry+https://github.com/rust-lang/crates.io-index", "regex-syntax 0.8.8 registry+https://github.com/rust-lang/crates.io-index",
@@ -238,8 +240,8 @@
"roxmltree 0.20.0 registry+https://github.com/rust-lang/crates.io-index", "roxmltree 0.20.0 registry+https://github.com/rust-lang/crates.io-index",
"rustc-demangle 0.1.26 registry+https://github.com/rust-lang/crates.io-index", "rustc-demangle 0.1.26 registry+https://github.com/rust-lang/crates.io-index",
"rustc_version 0.4.1 registry+https://github.com/rust-lang/crates.io-index", "rustc_version 0.4.1 registry+https://github.com/rust-lang/crates.io-index",
"rustls-pki-types 1.13.1 registry+https://github.com/rust-lang/crates.io-index", "rustls-pki-types 1.13.2 registry+https://github.com/rust-lang/crates.io-index",
"ryu 1.0.20 registry+https://github.com/rust-lang/crates.io-index", "ryu 1.0.21 registry+https://github.com/rust-lang/crates.io-index",
"scopeguard 1.2.0 registry+https://github.com/rust-lang/crates.io-index", "scopeguard 1.2.0 registry+https://github.com/rust-lang/crates.io-index",
"semver 1.0.27 registry+https://github.com/rust-lang/crates.io-index", "semver 1.0.27 registry+https://github.com/rust-lang/crates.io-index",
"serde 1.0.228 registry+https://github.com/rust-lang/crates.io-index", "serde 1.0.228 registry+https://github.com/rust-lang/crates.io-index",
@@ -255,7 +257,7 @@
"serde_yaml 0.8.26 registry+https://github.com/rust-lang/crates.io-index", "serde_yaml 0.8.26 registry+https://github.com/rust-lang/crates.io-index",
"serde_yaml 0.9.34+deprecated registry+https://github.com/rust-lang/crates.io-index", "serde_yaml 0.9.34+deprecated registry+https://github.com/rust-lang/crates.io-index",
"sha2 0.10.9 registry+https://github.com/rust-lang/crates.io-index", "sha2 0.10.9 registry+https://github.com/rust-lang/crates.io-index",
"shadow-rs 1.4.0 registry+https://github.com/rust-lang/crates.io-index", "shadow-rs 1.5.0 registry+https://github.com/rust-lang/crates.io-index",
"shell-words 1.1.1 registry+https://github.com/rust-lang/crates.io-index", "shell-words 1.1.1 registry+https://github.com/rust-lang/crates.io-index",
"shellexpand 2.1.2 registry+https://github.com/rust-lang/crates.io-index", "shellexpand 2.1.2 registry+https://github.com/rust-lang/crates.io-index",
"shlex 1.3.0 registry+https://github.com/rust-lang/crates.io-index", "shlex 1.3.0 registry+https://github.com/rust-lang/crates.io-index",
@@ -269,7 +271,7 @@
"stacker 0.1.22 registry+https://github.com/rust-lang/crates.io-index", "stacker 0.1.22 registry+https://github.com/rust-lang/crates.io-index",
"static_assertions 1.1.0 registry+https://github.com/rust-lang/crates.io-index", "static_assertions 1.1.0 registry+https://github.com/rust-lang/crates.io-index",
"supports-color 3.0.2 registry+https://github.com/rust-lang/crates.io-index", "supports-color 3.0.2 registry+https://github.com/rust-lang/crates.io-index",
"supports-hyperlinks 3.1.0 registry+https://github.com/rust-lang/crates.io-index", "supports-hyperlinks 3.2.0 registry+https://github.com/rust-lang/crates.io-index",
"supports-unicode 3.0.0 registry+https://github.com/rust-lang/crates.io-index", "supports-unicode 3.0.0 registry+https://github.com/rust-lang/crates.io-index",
"syn 1.0.109 registry+https://github.com/rust-lang/crates.io-index", "syn 1.0.109 registry+https://github.com/rust-lang/crates.io-index",
"syn 2.0.111 registry+https://github.com/rust-lang/crates.io-index", "syn 2.0.111 registry+https://github.com/rust-lang/crates.io-index",
@@ -421,7 +423,7 @@
[ [
"clipboard-win 5.4.1 registry+https://github.com/rust-lang/crates.io-index", "clipboard-win 5.4.1 registry+https://github.com/rust-lang/crates.io-index",
"error-code 3.3.2 registry+https://github.com/rust-lang/crates.io-index", "error-code 3.3.2 registry+https://github.com/rust-lang/crates.io-index",
"ryu 1.0.20 registry+https://github.com/rust-lang/crates.io-index" "ryu 1.0.21 registry+https://github.com/rust-lang/crates.io-index"
] ]
], ],
[ [
@@ -489,7 +491,7 @@
"calm_io 0.1.1 registry+https://github.com/rust-lang/crates.io-index", "calm_io 0.1.1 registry+https://github.com/rust-lang/crates.io-index",
"calmio_filters 0.1.0 registry+https://github.com/rust-lang/crates.io-index", "calmio_filters 0.1.0 registry+https://github.com/rust-lang/crates.io-index",
"catppuccin-egui 5.6.0 git+https://github.com/LGUG2Z/catppuccin-egui?rev=b2f95cbf441d1dd99f3c955ef10dcb84ce23c20a", "catppuccin-egui 5.6.0 git+https://github.com/LGUG2Z/catppuccin-egui?rev=b2f95cbf441d1dd99f3c955ef10dcb84ce23c20a",
"cc 1.2.49 registry+https://github.com/rust-lang/crates.io-index", "cc 1.2.50 registry+https://github.com/rust-lang/crates.io-index",
"cfg-if 0.1.10 registry+https://github.com/rust-lang/crates.io-index", "cfg-if 0.1.10 registry+https://github.com/rust-lang/crates.io-index",
"cfg-if 1.0.4 registry+https://github.com/rust-lang/crates.io-index", "cfg-if 1.0.4 registry+https://github.com/rust-lang/crates.io-index",
"cfg_aliases 0.2.1 registry+https://github.com/rust-lang/crates.io-index", "cfg_aliases 0.2.1 registry+https://github.com/rust-lang/crates.io-index",
@@ -645,13 +647,13 @@
"nanoid 0.4.0 registry+https://github.com/rust-lang/crates.io-index", "nanoid 0.4.0 registry+https://github.com/rust-lang/crates.io-index",
"native-tls 0.2.14 registry+https://github.com/rust-lang/crates.io-index", "native-tls 0.2.14 registry+https://github.com/rust-lang/crates.io-index",
"net2 0.2.39 registry+https://github.com/rust-lang/crates.io-index", "net2 0.2.39 registry+https://github.com/rust-lang/crates.io-index",
"netdev 0.39.0 registry+https://github.com/rust-lang/crates.io-index", "netdev 0.40.0 registry+https://github.com/rust-lang/crates.io-index",
"new_debug_unreachable 1.0.6 registry+https://github.com/rust-lang/crates.io-index", "new_debug_unreachable 1.0.6 registry+https://github.com/rust-lang/crates.io-index",
"nohash-hasher 0.2.0 registry+https://github.com/rust-lang/crates.io-index", "nohash-hasher 0.2.0 registry+https://github.com/rust-lang/crates.io-index",
"nom 7.1.3 registry+https://github.com/rust-lang/crates.io-index", "nom 7.1.3 registry+https://github.com/rust-lang/crates.io-index",
"nom 8.0.0 registry+https://github.com/rust-lang/crates.io-index", "nom 8.0.0 registry+https://github.com/rust-lang/crates.io-index",
"noop_proc_macro 0.3.0 registry+https://github.com/rust-lang/crates.io-index", "noop_proc_macro 0.3.0 registry+https://github.com/rust-lang/crates.io-index",
"ntapi 0.4.1 registry+https://github.com/rust-lang/crates.io-index", "ntapi 0.4.2 registry+https://github.com/rust-lang/crates.io-index",
"nu-ansi-term 0.50.3 registry+https://github.com/rust-lang/crates.io-index", "nu-ansi-term 0.50.3 registry+https://github.com/rust-lang/crates.io-index",
"num 0.4.3 registry+https://github.com/rust-lang/crates.io-index", "num 0.4.3 registry+https://github.com/rust-lang/crates.io-index",
"num-bigint 0.4.6 registry+https://github.com/rust-lang/crates.io-index", "num-bigint 0.4.6 registry+https://github.com/rust-lang/crates.io-index",
@@ -713,6 +715,8 @@
"raw-window-handle 0.6.2 registry+https://github.com/rust-lang/crates.io-index", "raw-window-handle 0.6.2 registry+https://github.com/rust-lang/crates.io-index",
"rayon 1.11.0 registry+https://github.com/rust-lang/crates.io-index", "rayon 1.11.0 registry+https://github.com/rust-lang/crates.io-index",
"rayon-core 1.13.0 registry+https://github.com/rust-lang/crates.io-index", "rayon-core 1.13.0 registry+https://github.com/rust-lang/crates.io-index",
"ref-cast 1.0.25 registry+https://github.com/rust-lang/crates.io-index",
"ref-cast-impl 1.0.25 registry+https://github.com/rust-lang/crates.io-index",
"regex 1.12.2 registry+https://github.com/rust-lang/crates.io-index", "regex 1.12.2 registry+https://github.com/rust-lang/crates.io-index",
"regex-automata 0.4.13 registry+https://github.com/rust-lang/crates.io-index", "regex-automata 0.4.13 registry+https://github.com/rust-lang/crates.io-index",
"regex-syntax 0.8.8 registry+https://github.com/rust-lang/crates.io-index", "regex-syntax 0.8.8 registry+https://github.com/rust-lang/crates.io-index",
@@ -721,11 +725,11 @@
"roxmltree 0.20.0 registry+https://github.com/rust-lang/crates.io-index", "roxmltree 0.20.0 registry+https://github.com/rust-lang/crates.io-index",
"rustc-demangle 0.1.26 registry+https://github.com/rust-lang/crates.io-index", "rustc-demangle 0.1.26 registry+https://github.com/rust-lang/crates.io-index",
"rustc_version 0.4.1 registry+https://github.com/rust-lang/crates.io-index", "rustc_version 0.4.1 registry+https://github.com/rust-lang/crates.io-index",
"rustls-pki-types 1.13.1 registry+https://github.com/rust-lang/crates.io-index", "rustls-pki-types 1.13.2 registry+https://github.com/rust-lang/crates.io-index",
"same-file 1.0.6 registry+https://github.com/rust-lang/crates.io-index", "same-file 1.0.6 registry+https://github.com/rust-lang/crates.io-index",
"schannel 0.1.28 registry+https://github.com/rust-lang/crates.io-index", "schannel 0.1.28 registry+https://github.com/rust-lang/crates.io-index",
"schemars 0.8.22 registry+https://github.com/rust-lang/crates.io-index", "schemars 1.1.0 registry+https://github.com/rust-lang/crates.io-index",
"schemars_derive 0.8.22 registry+https://github.com/rust-lang/crates.io-index", "schemars_derive 1.1.0 registry+https://github.com/rust-lang/crates.io-index",
"scoped_threadpool 0.1.9 registry+https://github.com/rust-lang/crates.io-index", "scoped_threadpool 0.1.9 registry+https://github.com/rust-lang/crates.io-index",
"scopeguard 1.2.0 registry+https://github.com/rust-lang/crates.io-index", "scopeguard 1.2.0 registry+https://github.com/rust-lang/crates.io-index",
"semver 1.0.27 registry+https://github.com/rust-lang/crates.io-index", "semver 1.0.27 registry+https://github.com/rust-lang/crates.io-index",
@@ -742,7 +746,7 @@
"serde_yaml 0.8.26 registry+https://github.com/rust-lang/crates.io-index", "serde_yaml 0.8.26 registry+https://github.com/rust-lang/crates.io-index",
"serde_yaml 0.9.34+deprecated registry+https://github.com/rust-lang/crates.io-index", "serde_yaml 0.9.34+deprecated registry+https://github.com/rust-lang/crates.io-index",
"sha2 0.10.9 registry+https://github.com/rust-lang/crates.io-index", "sha2 0.10.9 registry+https://github.com/rust-lang/crates.io-index",
"shadow-rs 1.4.0 registry+https://github.com/rust-lang/crates.io-index", "shadow-rs 1.5.0 registry+https://github.com/rust-lang/crates.io-index",
"sharded-slab 0.1.7 registry+https://github.com/rust-lang/crates.io-index", "sharded-slab 0.1.7 registry+https://github.com/rust-lang/crates.io-index",
"shell-words 1.1.1 registry+https://github.com/rust-lang/crates.io-index", "shell-words 1.1.1 registry+https://github.com/rust-lang/crates.io-index",
"shellexpand 2.1.2 registry+https://github.com/rust-lang/crates.io-index", "shellexpand 2.1.2 registry+https://github.com/rust-lang/crates.io-index",
@@ -785,10 +789,10 @@
"tower-http 0.6.8 registry+https://github.com/rust-lang/crates.io-index", "tower-http 0.6.8 registry+https://github.com/rust-lang/crates.io-index",
"tower-layer 0.3.3 registry+https://github.com/rust-lang/crates.io-index", "tower-layer 0.3.3 registry+https://github.com/rust-lang/crates.io-index",
"tower-service 0.3.3 registry+https://github.com/rust-lang/crates.io-index", "tower-service 0.3.3 registry+https://github.com/rust-lang/crates.io-index",
"tracing 0.1.43 registry+https://github.com/rust-lang/crates.io-index", "tracing 0.1.44 registry+https://github.com/rust-lang/crates.io-index",
"tracing-appender 0.2.4 registry+https://github.com/rust-lang/crates.io-index", "tracing-appender 0.2.4 registry+https://github.com/rust-lang/crates.io-index",
"tracing-attributes 0.1.31 registry+https://github.com/rust-lang/crates.io-index", "tracing-attributes 0.1.31 registry+https://github.com/rust-lang/crates.io-index",
"tracing-core 0.1.35 registry+https://github.com/rust-lang/crates.io-index", "tracing-core 0.1.36 registry+https://github.com/rust-lang/crates.io-index",
"tracing-error 0.2.1 registry+https://github.com/rust-lang/crates.io-index", "tracing-error 0.2.1 registry+https://github.com/rust-lang/crates.io-index",
"tracing-log 0.2.0 registry+https://github.com/rust-lang/crates.io-index", "tracing-log 0.2.0 registry+https://github.com/rust-lang/crates.io-index",
"tracing-subscriber 0.3.22 registry+https://github.com/rust-lang/crates.io-index", "tracing-subscriber 0.3.22 registry+https://github.com/rust-lang/crates.io-index",
komorebi-bar/src/main.rs
+2 -9
View File
@@ -114,15 +114,8 @@ fn main() -> color_eyre::Result<()> {
#[cfg(feature = "schemars")] #[cfg(feature = "schemars")]
if opts.schema { if opts.schema {
let settings = schemars::r#gen::SchemaSettings::default().with(|s| { let bar_config = schemars::schema_for!(KomobarConfig);
s.option_nullable = false; let schema = serde_json::to_string_pretty(&bar_config)?;
s.option_add_null_type = false;
s.inline_subschemas = true;
});
let generator = settings.into_generator();
let socket_message = generator.into_root_schema_for::<KomobarConfig>();
let schema = serde_json::to_string_pretty(&socket_message)?;
println!("{schema}"); println!("{schema}");
std::process::exit(0); std::process::exit(0);
komorebi-themes/Cargo.toml
+1 -1
View File
@@ -4,7 +4,7 @@ version = "0.1.40"
edition = "2024" edition = "2024"
[dependencies] [dependencies]
base16-egui-themes = { git = "https://github.com/LGUG2Z/base16-egui-themes", rev = "5472b1ab825c48af1a1726e324cfa13b7c385135" } base16-egui-themes = { git = "https://github.com/LGUG2Z/base16-egui-themes", rev = "adfed118ab1408f134fd7d8a549ccfe47b99d752" }
#catppuccin-egui = { version = "5", default-features = false, features = ["egui32"] } #catppuccin-egui = { version = "5", default-features = false, features = ["egui32"] }
catppuccin-egui = { git = "https://github.com/LGUG2Z/catppuccin-egui", rev = "b2f95cbf441d1dd99f3c955ef10dcb84ce23c20a", default-features = false, features = ["egui33"] } catppuccin-egui = { git = "https://github.com/LGUG2Z/catppuccin-egui", rev = "b2f95cbf441d1dd99f3c955ef10dcb84ce23c20a", default-features = false, features = ["egui33"] }
eframe = { workspace = true } eframe = { workspace = true }
komorebi-themes/src/colour.rs
+8 -14
View File
@@ -1,12 +1,8 @@
use hex_color::HexColor; use hex_color::HexColor;
#[cfg(feature = "schemars")] #[cfg(feature = "schemars")]
use schemars::Schema;
#[cfg(feature = "schemars")]
use schemars::SchemaGenerator; use schemars::SchemaGenerator;
#[cfg(feature = "schemars")]
use schemars::schema::InstanceType;
#[cfg(feature = "schemars")]
use schemars::schema::Schema;
#[cfg(feature = "schemars")]
use schemars::schema::SchemaObject;
use crate::Color32; use crate::Color32;
use serde::Deserialize; use serde::Deserialize;
@@ -61,17 +57,15 @@ pub struct Hex(pub HexColor);
#[cfg(feature = "schemars")] #[cfg(feature = "schemars")]
impl schemars::JsonSchema for Hex { impl schemars::JsonSchema for Hex {
fn schema_name() -> String { fn schema_name() -> std::borrow::Cow<'static, str> {
String::from("Hex") std::borrow::Cow::Borrowed("Hex")
} }
fn json_schema(_: &mut SchemaGenerator) -> Schema { fn json_schema(_: &mut SchemaGenerator) -> Schema {
SchemaObject { schemars::json_schema!({
instance_type: Some(InstanceType::String.into()), "type": "string",
format: Some("color-hex".to_string()), "format": "color-hex"
..Default::default() })
}
.into()
} }
} }
komorebi/Cargo.toml
+1 -1
View File
@@ -51,7 +51,7 @@ windows-implement = { workspace = true }
windows-interface = { workspace = true } windows-interface = { workspace = true }
winput = "0.2" winput = "0.2"
winreg = "0.55" winreg = "0.55"
serde_with = { version = "3.12", features = ["schemars_0_8"] } serde_with = { version = "3.12", features = ["schemars_1"] }
[build-dependencies] [build-dependencies]
shadow-rs = { workspace = true } shadow-rs = { workspace = true }
komorebi/src/core/pathext.rs
+4 -4
View File
@@ -121,12 +121,12 @@ impl<'de> serde_with::DeserializeAs<'de, PathBuf> for ResolvedPathBuf {
} }
#[cfg(feature = "schemars")] #[cfg(feature = "schemars")]
impl serde_with::schemars_0_8::JsonSchemaAs<PathBuf> for ResolvedPathBuf { impl serde_with::schemars_1::JsonSchemaAs<PathBuf> for ResolvedPathBuf {
fn schema_name() -> String { fn schema_name() -> std::borrow::Cow<'static, str> {
"PathBuf".to_owned() std::borrow::Cow::Borrowed("PathBuf")
} }
fn json_schema(generator: &mut schemars::SchemaGenerator) -> schemars::schema::Schema { fn json_schema(generator: &mut schemars::SchemaGenerator) -> schemars::Schema {
<PathBuf as schemars::JsonSchema>::json_schema(generator) <PathBuf as schemars::JsonSchema>::json_schema(generator)
} }
} }
komorebi/src/process_command.rs
+1 -8
View File
@@ -2224,14 +2224,7 @@ if (!(Get-Process komorebi-bar -ErrorAction SilentlyContinue))
SocketMessage::StaticConfigSchema => { SocketMessage::StaticConfigSchema => {
#[cfg(feature = "schemars")] #[cfg(feature = "schemars")]
{ {
let settings = schemars::r#gen::SchemaSettings::default().with(|s| { let socket_message = schemars::schema_for!(SocketMessage);
s.option_nullable = false;
s.option_add_null_type = false;
s.inline_subschemas = true;
});
let generator = settings.into_generator();
let socket_message = generator.into_root_schema_for::<StaticConfig>();
let schema = serde_json::to_string_pretty(&socket_message)?; let schema = serde_json::to_string_pretty(&socket_message)?;
reply.write_all(schema.as_bytes())?; reply.write_all(schema.as_bytes())?;
komorebic/src/main.rs
+2 -9
View File
@@ -3343,15 +3343,8 @@ if (Get-Command Get-CimInstance -ErrorAction SilentlyContinue) {
SubCommand::StaticConfigSchema => { SubCommand::StaticConfigSchema => {
#[cfg(feature = "schemars")] #[cfg(feature = "schemars")]
{ {
let settings = schemars::r#gen::SchemaSettings::default().with(|s| { let static_config = schemars::schema_for!(StaticConfig);
s.option_nullable = false; let schema = serde_json::to_string_pretty(&static_config)?;
s.option_add_null_type = false;
s.inline_subschemas = true;
});
let generator = settings.into_generator();
let socket_message = generator.into_root_schema_for::<StaticConfig>();
let schema = serde_json::to_string_pretty(&socket_message)?;
println!("{schema}"); println!("{schema}");
} }
} }
schema.asc.json
+21 -21
View File
@@ -1,11 +1,11 @@
{ {
"$schema": "http://json-schema.org/draft-07/schema#", "$schema": "https://json-schema.org/draft/2020-12/schema",
"title": "ApplicationSpecificConfiguration", "title": "ApplicationSpecificConfiguration",
"type": "object", "type": "object",
"additionalProperties": { "additionalProperties": {
"$ref": "#/definitions/AscApplicationRulesOrSchema" "$ref": "#/$defs/AscApplicationRulesOrSchema"
}, },
"definitions": { "$defs": {
"ApplicationIdentifier": { "ApplicationIdentifier": {
"type": "string", "type": "string",
"enum": [ "enum": [
@@ -26,7 +26,7 @@
"null" "null"
], ],
"items": { "items": {
"$ref": "#/definitions/MatchingRule" "$ref": "#/$defs/MatchingRule"
} }
}, },
"ignore": { "ignore": {
@@ -36,7 +36,7 @@
"null" "null"
], ],
"items": { "items": {
"$ref": "#/definitions/MatchingRule" "$ref": "#/$defs/MatchingRule"
} }
}, },
"layered": { "layered": {
@@ -46,7 +46,7 @@
"null" "null"
], ],
"items": { "items": {
"$ref": "#/definitions/MatchingRule" "$ref": "#/$defs/MatchingRule"
} }
}, },
"manage": { "manage": {
@@ -56,7 +56,7 @@
"null" "null"
], ],
"items": { "items": {
"$ref": "#/definitions/MatchingRule" "$ref": "#/$defs/MatchingRule"
} }
}, },
"object_name_change": { "object_name_change": {
@@ -66,7 +66,7 @@
"null" "null"
], ],
"items": { "items": {
"$ref": "#/definitions/MatchingRule" "$ref": "#/$defs/MatchingRule"
} }
}, },
"slow_application": { "slow_application": {
@@ -76,7 +76,7 @@
"null" "null"
], ],
"items": { "items": {
"$ref": "#/definitions/MatchingRule" "$ref": "#/$defs/MatchingRule"
} }
}, },
"transparency_ignore": { "transparency_ignore": {
@@ -86,7 +86,7 @@
"null" "null"
], ],
"items": { "items": {
"$ref": "#/definitions/MatchingRule" "$ref": "#/$defs/MatchingRule"
} }
}, },
"tray_and_multi_window": { "tray_and_multi_window": {
@@ -96,7 +96,7 @@
"null" "null"
], ],
"items": { "items": {
"$ref": "#/definitions/MatchingRule" "$ref": "#/$defs/MatchingRule"
} }
} }
} }
@@ -104,7 +104,7 @@
"AscApplicationRulesOrSchema": { "AscApplicationRulesOrSchema": {
"anyOf": [ "anyOf": [
{ {
"$ref": "#/definitions/AscApplicationRules" "$ref": "#/$defs/AscApplicationRules"
}, },
{ {
"type": "string" "type": "string"
@@ -113,38 +113,38 @@
}, },
"IdWithIdentifier": { "IdWithIdentifier": {
"type": "object", "type": "object",
"required": [
"id",
"kind"
],
"properties": { "properties": {
"id": { "id": {
"type": "string" "type": "string"
}, },
"kind": { "kind": {
"$ref": "#/definitions/ApplicationIdentifier" "$ref": "#/$defs/ApplicationIdentifier"
}, },
"matching_strategy": { "matching_strategy": {
"anyOf": [ "anyOf": [
{ {
"$ref": "#/definitions/MatchingStrategy" "$ref": "#/$defs/MatchingStrategy"
}, },
{ {
"type": "null" "type": "null"
} }
] ]
} }
} },
"required": [
"kind",
"id"
]
}, },
"MatchingRule": { "MatchingRule": {
"anyOf": [ "anyOf": [
{ {
"$ref": "#/definitions/IdWithIdentifier" "$ref": "#/$defs/IdWithIdentifier"
}, },
{ {
"type": "array", "type": "array",
"items": { "items": {
"$ref": "#/definitions/IdWithIdentifier" "$ref": "#/$defs/IdWithIdentifier"
} }
} }
] ]
schema.bar.json
+6466 -61304
View File
File diff suppressed because it is too large Load Diff
schema.json
+2274 -4439
View File
File diff suppressed because it is too large Load Diff