diff --git a/src/rust/Cargo.lock b/src/rust/Cargo.lock index 29e4b2022631299909fd20a7ba8e394026e5fb90..21f9f1c3c0da4bd347bf568a65f3bfc53df3b030 100644 --- a/src/rust/Cargo.lock +++ b/src/rust/Cargo.lock @@ -7,6 +7,7 @@ name = "amadeus" version = "0.1.0" dependencies = [ "amalib", + "clap", "commons", "serde", "tokio", @@ -445,7 +446,6 @@ dependencies = [ name = "lektor_config" version = "0.1.0" dependencies = [ - "lektor_c_compat", "serde", "thiserror", ] diff --git a/src/rust/Cargo.toml b/src/rust/Cargo.toml index 43721bfc4d33e6a881429cfe28f662de29224dbe..0b4b217d6d6e822811b900c682c12ce0a1fec4d1 100644 --- a/src/rust/Cargo.toml +++ b/src/rust/Cargo.toml @@ -29,9 +29,6 @@ libc = "0.2" lazy_static = "^1" thiserror = "^1" -diesel_migrations = "2" -diesel = { version = "2", default-features = false, features = ["sqlite"] } - toml = { version = "^0.5", features = ["preserve_order"] } serde = { version = "^1", default-features = false, features = [ "std", @@ -54,6 +51,16 @@ reqwest = { version = "0.11", default-features = false, features = [ "json", ] } +clap = { version = "^4", default-features = false, features = [ + "usage", + "help", + "std", + "wrap_help", + "suggestions", + "error-context", + "derive", +] } + [profile.release] strip = true debug = false diff --git a/src/rust/amadeus/Cargo.toml b/src/rust/amadeus/Cargo.toml index 0383a5d9c2ff66021ee6ed35e2511662a90de78c..5ee8aaac0e8d7b9013ada14e8deebf9058654aa3 100644 --- a/src/rust/amadeus/Cargo.toml +++ b/src/rust/amadeus/Cargo.toml @@ -8,6 +8,7 @@ license.workspace = true [dependencies] serde.workspace = true tokio.workspace = true +clap.workspace = true commons = { path = "../commons" } amalib = { path = "../amalib" } diff --git a/src/rust/commons/Cargo.toml b/src/rust/commons/Cargo.toml index f66252d165c27b06a867c1ffcc5329086f45ad26..df7df4f37c6985f8dd445cdbab6cad0926e17054 100644 --- a/src/rust/commons/Cargo.toml +++ b/src/rust/commons/Cargo.toml @@ -6,8 +6,8 @@ authors.workspace = true license.workspace = true [dependencies] +thiserror.workspace = true lazy_static.workspace = true -log = "0.4" -thiserror = { version = "^1", default-features = false } +log = "^0.4" error-stack = { version = "^0.2", default-features = false, features = ["std"] } diff --git a/src/rust/dependencies.linux.png b/src/rust/dependencies.linux.png index 813b263a5049bd9d463c45891739f8d4201df932..9648fb40c4aa30ca447f7e7a6dc1d2193971545d 100644 Binary files a/src/rust/dependencies.linux.png and b/src/rust/dependencies.linux.png differ diff --git a/src/rust/dependencies.macos-arm.png b/src/rust/dependencies.macos-arm.png index 285a14d35eeb433c366ff8b111c8d21664c51dc7..019ae6935a9d170596f8180d17400dd33a50a88e 100644 Binary files a/src/rust/dependencies.macos-arm.png and b/src/rust/dependencies.macos-arm.png differ diff --git a/src/rust/dependencies.macos.png b/src/rust/dependencies.macos.png index 35702710a57196fad269bafdd65e384b940bbff3..9772d3ba9c861a9ec08445589f35160bd41a989d 100644 Binary files a/src/rust/dependencies.macos.png and b/src/rust/dependencies.macos.png differ diff --git a/src/rust/dependencies.png b/src/rust/dependencies.png index 24cc6fb422c696c94cb3e4fb8b91f5a3acb6aad0..cbba9501e2847021966aad3b260d291085b923c6 100644 Binary files a/src/rust/dependencies.png and b/src/rust/dependencies.png differ diff --git a/src/rust/dependencies.win32.png b/src/rust/dependencies.win32.png index 88a793df11f253b22a2f835366870027d2fe24d4..dca27a90344c725ae3f223b35115dc7c302fe5ac 100644 Binary files a/src/rust/dependencies.win32.png and b/src/rust/dependencies.win32.png differ diff --git a/src/rust/lektor_config/Cargo.toml b/src/rust/lektor_config/Cargo.toml index 852930b4209c5b889d69166e5b25d2881e0647f1..a27534a35bc2b46a31220d6e07a6bd8f99ade1d9 100644 --- a/src/rust/lektor_config/Cargo.toml +++ b/src/rust/lektor_config/Cargo.toml @@ -8,5 +8,3 @@ license.workspace = true [dependencies] serde.workspace = true thiserror.workspace = true - -lektor_c_compat = { path = "../lektor_c_compat" } diff --git a/src/rust/lkt/Cargo.toml b/src/rust/lkt/Cargo.toml index 2f6211ab90b2ec9ed807ba9c0c82c660f4015e7f..9844e538aa5b7fa1d8d9070e4f8a4f967ee47e41 100644 --- a/src/rust/lkt/Cargo.toml +++ b/src/rust/lkt/Cargo.toml @@ -9,16 +9,7 @@ license.workspace = true tokio.workspace = true serde.workspace = true toml.workspace = true +clap.workspace = true commons = { path = "../commons" } amalib = { path = "../amalib" } - -clap = { version = "^4", default-features = false, features = [ - "usage", - "help", - "std", - "wrap_help", - "suggestions", - "error-context", - "derive", -] }