diff --git a/Cargo.lock b/Cargo.lock index 4c08761f..43b341c8 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -888,12 +888,6 @@ dependencies = [ "hashbrown", ] -[[package]] -name = "indoc" -version = "2.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e186cfbae8084e513daff4240b4797e342f988cecda4fb6c939150f96315fd8" - [[package]] name = "itoa" version = "1.0.6" @@ -1605,35 +1599,32 @@ dependencies = [ [[package]] name = "pyo3" -version = "0.26.0" +version = "0.29.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ba0117f4212101ee6544044dae45abe1083d30ce7b29c4b5cbdfa2354e07383" +checksum = "cd274650b21d4bfc26a0a47587962c1edb425f69287324355cd040c3ea66071c" dependencies = [ - "indoc", "libc", - "memoffset", "once_cell", "portable-atomic", "pyo3-build-config", "pyo3-ffi", "pyo3-macros", - "unindent", ] [[package]] name = "pyo3-build-config" -version = "0.26.0" +version = "0.29.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fc6ddaf24947d12a9aa31ac65431fb1b851b8f4365426e182901eabfb87df5f" +checksum = "c5e2a7d2f0d013342f295c048ad19237add5154a55b1c5a254c0ec93d4109078" dependencies = [ "target-lexicon", ] [[package]] name = "pyo3-ffi" -version = "0.26.0" +version = "0.29.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "025474d3928738efb38ac36d4744a74a400c901c7596199e20e45d98eb194105" +checksum = "ca85c467da1bbc8d866eea5deff9cf29ea5f7785054a17da36e65bda9c05845b" dependencies = [ "libc", "pyo3-build-config", @@ -1641,9 +1632,9 @@ dependencies = [ [[package]] name = "pyo3-macros" -version = "0.26.0" +version = "0.29.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e64eb489f22fe1c95911b77c44cc41e7c19f3082fc81cce90f657cdc42ffded" +checksum = "9ac53762fd065daa3194dd09337a38bd793a188100fd1a9304c4ab312d901771" dependencies = [ "proc-macro2", "pyo3-macros-backend", @@ -1653,13 +1644,12 @@ dependencies = [ [[package]] name = "pyo3-macros-backend" -version = "0.26.0" +version = "0.29.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "100246c0ecf400b475341b8455a9213344569af29a3c841d29270e53102e0fcf" +checksum = "4ca3a1557399783172dc5bf39cfca835157732532cba56b71d2292161e53b362" dependencies = [ "heck", "proc-macro2", - "pyo3-build-config", "quote", "syn", ] @@ -2047,9 +2037,9 @@ dependencies = [ [[package]] name = "target-lexicon" -version = "0.13.2" +version = "0.13.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e502f78cdbb8ba4718f566c418c52bc729126ffd16baee5baa718cf25dd5a69a" +checksum = "adb6935a6f5c20170eeceb1a3835a49e12e19d792f6dd344ccc76a985ca5a6ca" [[package]] name = "tempfile" @@ -2236,12 +2226,6 @@ version = "1.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1dd624098567895118886609431a7c3b8f516e41d30e0643f03d94592a147e36" -[[package]] -name = "unindent" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c7de7d73e1754487cb58364ee906a499937a0dfabd86bcb980fa99ec8c8fa2ce" - [[package]] name = "uuid" version = "1.18.1" diff --git a/common/Cargo.toml b/common/Cargo.toml index 88be6df0..501010da 100644 --- a/common/Cargo.toml +++ b/common/Cargo.toml @@ -16,7 +16,7 @@ features = ["schemars", "serde"] [dependencies] enumn = { version = "0.1.6", optional = true } -pyo3 = { version = "0.26", optional = true } +pyo3 = { version = "0.29", optional = true } schemars = { version = "1", optional = true } serde = { version = "1.0", default-features = false, features = ["alloc", "derive"], optional = true } serde_json = { version = "1.0", default-features = false, optional = true } diff --git a/common/src/lib.rs b/common/src/lib.rs index 949bfee7..78fb45aa 100644 --- a/common/src/lib.rs +++ b/common/src/lib.rs @@ -51,7 +51,12 @@ pub use geometry::{Affine, Point, Rect, Size, Vec2}; #[cfg_attr(feature = "serde", serde(rename_all = "camelCase"))] #[cfg_attr( feature = "pyo3", - pyclass(module = "accesskit", rename_all = "SCREAMING_SNAKE_CASE", eq) + pyclass( + module = "accesskit", + rename_all = "SCREAMING_SNAKE_CASE", + eq, + from_py_object + ) )] #[repr(u8)] pub enum Role { @@ -273,7 +278,12 @@ pub enum Role { #[cfg_attr(feature = "serde", serde(rename_all = "camelCase"))] #[cfg_attr( feature = "pyo3", - pyclass(module = "accesskit", rename_all = "SCREAMING_SNAKE_CASE", eq) + pyclass( + module = "accesskit", + rename_all = "SCREAMING_SNAKE_CASE", + eq, + from_py_object + ) )] #[repr(u8)] pub enum Action { @@ -396,7 +406,12 @@ fn action_mask_to_action_vec(mask: u32) -> Vec { #[cfg_attr(feature = "serde", serde(rename_all = "camelCase"))] #[cfg_attr( feature = "pyo3", - pyclass(module = "accesskit", rename_all = "SCREAMING_SNAKE_CASE", eq) + pyclass( + module = "accesskit", + rename_all = "SCREAMING_SNAKE_CASE", + eq, + from_py_object + ) )] #[repr(u8)] pub enum Orientation { @@ -413,7 +428,12 @@ pub enum Orientation { #[cfg_attr(feature = "serde", serde(rename_all = "camelCase"))] #[cfg_attr( feature = "pyo3", - pyclass(module = "accesskit", rename_all = "SCREAMING_SNAKE_CASE", eq) + pyclass( + module = "accesskit", + rename_all = "SCREAMING_SNAKE_CASE", + eq, + from_py_object + ) )] #[repr(u8)] pub enum TextDirection { @@ -434,7 +454,12 @@ pub enum TextDirection { #[cfg_attr(feature = "serde", serde(rename_all = "camelCase"))] #[cfg_attr( feature = "pyo3", - pyclass(module = "accesskit", rename_all = "SCREAMING_SNAKE_CASE", eq) + pyclass( + module = "accesskit", + rename_all = "SCREAMING_SNAKE_CASE", + eq, + from_py_object + ) )] #[repr(u8)] pub enum Invalid { @@ -450,7 +475,12 @@ pub enum Invalid { #[cfg_attr(feature = "serde", serde(rename_all = "camelCase"))] #[cfg_attr( feature = "pyo3", - pyclass(module = "accesskit", rename_all = "SCREAMING_SNAKE_CASE", eq) + pyclass( + module = "accesskit", + rename_all = "SCREAMING_SNAKE_CASE", + eq, + from_py_object + ) )] #[repr(u8)] pub enum Toggled { @@ -476,7 +506,12 @@ impl From for Toggled { #[cfg_attr(feature = "serde", serde(rename_all = "camelCase"))] #[cfg_attr( feature = "pyo3", - pyclass(module = "accesskit", rename_all = "SCREAMING_SNAKE_CASE", eq) + pyclass( + module = "accesskit", + rename_all = "SCREAMING_SNAKE_CASE", + eq, + from_py_object + ) )] #[repr(u8)] pub enum SortDirection { @@ -492,7 +527,12 @@ pub enum SortDirection { #[cfg_attr(feature = "serde", serde(rename_all = "camelCase"))] #[cfg_attr( feature = "pyo3", - pyclass(module = "accesskit", rename_all = "SCREAMING_SNAKE_CASE", eq) + pyclass( + module = "accesskit", + rename_all = "SCREAMING_SNAKE_CASE", + eq, + from_py_object + ) )] #[repr(u8)] pub enum AriaCurrent { @@ -512,7 +552,12 @@ pub enum AriaCurrent { #[cfg_attr(feature = "serde", serde(rename_all = "camelCase"))] #[cfg_attr( feature = "pyo3", - pyclass(module = "accesskit", rename_all = "SCREAMING_SNAKE_CASE", eq) + pyclass( + module = "accesskit", + rename_all = "SCREAMING_SNAKE_CASE", + eq, + from_py_object + ) )] #[repr(u8)] pub enum AutoComplete { @@ -528,7 +573,12 @@ pub enum AutoComplete { #[cfg_attr(feature = "serde", serde(rename_all = "camelCase"))] #[cfg_attr( feature = "pyo3", - pyclass(module = "accesskit", rename_all = "SCREAMING_SNAKE_CASE", eq) + pyclass( + module = "accesskit", + rename_all = "SCREAMING_SNAKE_CASE", + eq, + from_py_object + ) )] #[repr(u8)] pub enum Live { @@ -544,7 +594,12 @@ pub enum Live { #[cfg_attr(feature = "serde", serde(rename_all = "camelCase"))] #[cfg_attr( feature = "pyo3", - pyclass(module = "accesskit", rename_all = "SCREAMING_SNAKE_CASE", eq) + pyclass( + module = "accesskit", + rename_all = "SCREAMING_SNAKE_CASE", + eq, + from_py_object + ) )] #[repr(u8)] pub enum HasPopup { @@ -562,7 +617,12 @@ pub enum HasPopup { #[cfg_attr(feature = "serde", serde(rename_all = "camelCase"))] #[cfg_attr( feature = "pyo3", - pyclass(module = "accesskit", rename_all = "SCREAMING_SNAKE_CASE", eq) + pyclass( + module = "accesskit", + rename_all = "SCREAMING_SNAKE_CASE", + eq, + from_py_object + ) )] #[repr(u8)] pub enum ListStyle { @@ -582,7 +642,12 @@ pub enum ListStyle { #[cfg_attr(feature = "serde", serde(rename_all = "camelCase"))] #[cfg_attr( feature = "pyo3", - pyclass(module = "accesskit", rename_all = "SCREAMING_SNAKE_CASE", eq) + pyclass( + module = "accesskit", + rename_all = "SCREAMING_SNAKE_CASE", + eq, + from_py_object + ) )] #[repr(u8)] pub enum TextAlign { @@ -599,7 +664,12 @@ pub enum TextAlign { #[cfg_attr(feature = "serde", serde(rename_all = "camelCase"))] #[cfg_attr( feature = "pyo3", - pyclass(module = "accesskit", rename_all = "SCREAMING_SNAKE_CASE", eq) + pyclass( + module = "accesskit", + rename_all = "SCREAMING_SNAKE_CASE", + eq, + from_py_object + ) )] #[repr(u8)] pub enum VerticalOffset { @@ -614,7 +684,12 @@ pub enum VerticalOffset { #[cfg_attr(feature = "serde", serde(rename_all = "camelCase"))] #[cfg_attr( feature = "pyo3", - pyclass(module = "accesskit", rename_all = "SCREAMING_SNAKE_CASE", eq) + pyclass( + module = "accesskit", + rename_all = "SCREAMING_SNAKE_CASE", + eq, + from_py_object + ) )] #[repr(u8)] pub enum TextDecorationStyle {