diff --git a/Cargo.toml b/Cargo.toml index 94ffddd6..9184ed1b 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,29 +1,18 @@ [workspace] resolver = "2" -members = [ - "atspi", - "atspi-proxies", - "atspi-common", - "atspi-connection", -] +members = ["atspi", "atspi-proxies", "atspi-common", "atspi-connection"] [workspace.package] description = "AT-SPI2 protocol implementation in Rust" -authors = [ - "Michael Connor Buchan ", - "Tait Hoyem ", - "Alberto Tirla ", - "DataTriny ", - "Luuk van der Duim " -] +authors = ["Michael Connor Buchan ", "Tait Hoyem ", "Alberto Tirla ", "DataTriny ", "Luuk van der Duim "] rust-version = "1.75.0" [workspace.dependencies] -zbus = { version = "4.0", default-features = false } +zbus = { version = "4.2", default-features = false } tracing = "0.1.37" enumflags2 = "0.7.7" [profile.bench] lto = true -codegen-units = 1 \ No newline at end of file +codegen-units = 1 diff --git a/atspi-common/Cargo.toml b/atspi-common/Cargo.toml index de47cd0e..9dc0241e 100644 --- a/atspi-common/Cargo.toml +++ b/atspi-common/Cargo.toml @@ -25,12 +25,12 @@ static_assertions = "1.1.0" zbus-lockstep = "0.4.4" zbus-lockstep-macros = "0.4.4" zbus_names = "3.0" -zvariant = { version = "4.0", default-features = false } +zvariant = { version = "4.1", default-features = false } zbus = { workspace = true, optional = true, default-features = false } [dev-dependencies] atspi-connection = { path = "../atspi-connection" } -atspi-proxies = { path = "../atspi-proxies" } +atspi-proxies = { path = "../atspi-proxies" } rename-item = "0.1.0" serde_plain = "1.0.1" static_assertions = "1.1.0" diff --git a/atspi-common/src/object_ref.rs b/atspi-common/src/object_ref.rs index 95f51244..045e1a2f 100644 --- a/atspi-common/src/object_ref.rs +++ b/atspi-common/src/object_ref.rs @@ -96,7 +96,7 @@ impl TryFrom for ObjectRef { } impl From for zvariant::Structure<'_> { - fn from(accessible: ObjectRef) -> Self { - (accessible.name, accessible.path).into() + fn from(obj: ObjectRef) -> Self { + (obj.name, obj.path).into() } } diff --git a/atspi-proxies/Cargo.toml b/atspi-proxies/Cargo.toml index 6485da98..a50b9228 100644 --- a/atspi-proxies/Cargo.toml +++ b/atspi-proxies/Cargo.toml @@ -25,8 +25,8 @@ tokio = ["zbus/tokio", "atspi-common/tokio"] [dependencies] atspi-common = { path = "../atspi-common", version = "0.5.0", default-features = false } serde = { version = "^1.0", default-features = false, features = ["derive"] } -zbus = { workspace = true } -zvariant = { version = "4.0", default-features = false } +zbus = { workspace = true } +zvariant = { version = "4.1", default-features = false } [dev-dependencies] async-std = { version = "1", features = ["attributes"] } @@ -36,7 +36,7 @@ futures-lite = { version = "2", default-features = false } rename-item = "0.1.0" serde_json = "1.0.96" serde_plain = "1.0.1" -tokio = { version = "1", default_features = false, features = ["macros", "rt-multi-thread"] } +tokio = { version = "1", default-features = false, features = ["macros", "rt-multi-thread"] } tokio-stream = "0.1" tokio-test = "0.4.2" tracing = "0.1.37" diff --git a/atspi-proxies/src/accessible.rs b/atspi-proxies/src/accessible.rs index 7d58e16e..551469f2 100644 --- a/atspi-proxies/src/accessible.rs +++ b/atspi-proxies/src/accessible.rs @@ -155,7 +155,7 @@ trait Accessible { /// Application-specific identifier for the current object. /// /// A special id given to an object. - /// ObjectRef application developers can use this to give a special id to an object + /// Accessible application developers can use this to give a special id to an object /// to use in tests, for example, "my_widget". /// /// Note that there is no way to directly find an object by its id; diff --git a/atspi/Cargo.toml b/atspi/Cargo.toml index 061f78d4..c894fb44 100644 --- a/atspi/Cargo.toml +++ b/atspi/Cargo.toml @@ -4,7 +4,7 @@ version = "0.21.0" authors.workspace = true edition = "2021" description = "Pure-Rust, zbus-based AT-SPI2 protocol implementation." -license = "Apache-2.0 OR MIT" +license = "Apache-2.0 OR MIT" readme = "../README.md" repository = "https://github.com/odilia-app/atspi" homepage = "https://github.com/odilia-app/atspi" @@ -32,6 +32,8 @@ tracing = ["atspi-connection/tracing"] atspi-common = { path = "../atspi-common", version = "0.5.0", default-features = false } atspi-connection = { path = "../atspi-connection", version = "0.5.0", default-features = false, optional = true } atspi-proxies = { path = "../atspi-proxies", version = "0.5.0", default-features = false, optional = true } +zbus = { workspace = true, optional = true } + [[bench]] name = "event_parsing"