Merge pull request #666 from imobachgs/better-agama-derive

Better Settings derive macro
agama-project · Aug 3, 2023 · 9c7a6ad · 9c7a6ad
2 parents 57d328b + 47e76df
commit 9c7a6ad
Show file tree

Hide file tree

Showing 20 changed files with 452 additions and 246 deletions.
diff --git a/rust/Cargo.lock b/rust/Cargo.lock
diff --git a/rust/Cargo.toml b/rust/Cargo.toml
@@ -4,5 +4,6 @@ members = [
   "agama-dbus-server",
   "agama-derive",
   "agama-lib",
-  "agama-locale-data"
-]
+  "agama-locale-data",
+  "agama-settings"
+]
diff --git a/rust/agama-cli/Cargo.toml b/rust/agama-cli/Cargo.toml
@@ -8,6 +8,7 @@ edition = "2021"
 [dependencies]
 clap = { version = "4.1.4", features = ["derive"] }
 agama-lib = { path="../agama-lib" }
+agama-settings = { path="../agama-settings" }
 serde = { version = "1.0.152" }
 serde_json = "1.0.91"
 serde_yaml = "0.9.17"

diff --git a/rust/agama-cli/src/config.rs b/rust/agama-cli/src/config.rs
@@ -2,8 +2,8 @@ use crate::error::CliError;
 use crate::printers::{print, Format};
 use agama_lib::connection;
 use agama_lib::install_settings::{InstallSettings, Scope};
-use agama_lib::settings::{SettingObject, SettingValue, Settings};
 use agama_lib::Store as SettingsStore;
+use agama_settings::{settings::Settings, SettingObject, SettingValue};
 use clap::Subcommand;
 use convert_case::{Case, Casing};
 use std::str::FromStr;

diff --git a/rust/agama-derive/Cargo.toml b/rust/agama-derive/Cargo.toml
@@ -9,5 +9,5 @@ proc-macro = true
 
 [dependencies]
 proc-macro2 = "1.0.51"
-quote = "1.0.23"
-syn = "1.0.107"
+quote = "1.0"
+syn = "2.0"