diff --git a/Cargo.lock b/Cargo.lock index bec8b440..b462dcab 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -929,6 +929,12 @@ version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" +[[package]] +name = "heck" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" + [[package]] name = "hermit-abi" version = "0.3.1" @@ -964,9 +970,9 @@ dependencies = [ [[package]] name = "indoc" -version = "1.0.9" +version = "2.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfa799dd5ed20a7e349f3b4639aa80d74549c81716d9ec4f994c9b5815598306" +checksum = "1e186cfbae8084e513daff4240b4797e342f988cecda4fb6c939150f96315fd8" [[package]] name = "instant" @@ -1432,9 +1438,9 @@ dependencies = [ [[package]] name = "pyo3" -version = "0.19.2" +version = "0.20.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e681a6cfdc4adcc93b4d3cf993749a4552018ee0a9b65fc0ccfad74352c72a38" +checksum = "e82ad98ce1991c9c70c3464ba4187337b9c45fcbbb060d46dca15f0c075e14e2" dependencies = [ "cfg-if", "indoc", @@ -1449,9 +1455,9 @@ dependencies = [ [[package]] name = "pyo3-build-config" -version = "0.19.2" +version = "0.20.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "076c73d0bc438f7a4ef6fdd0c3bb4732149136abd952b110ac93e4edb13a6ba5" +checksum = "5503d0b3aee2c7a8dbb389cd87cd9649f675d4c7f60ca33699a3e3859d81a891" dependencies = [ "once_cell", "target-lexicon", @@ -1459,9 +1465,9 @@ dependencies = [ [[package]] name = "pyo3-ffi" -version = "0.19.2" +version = "0.20.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e53cee42e77ebe256066ba8aa77eff722b3bb91f3419177cf4cd0f304d3284d9" +checksum = "18a79e8d80486a00d11c0dcb27cd2aa17c022cc95c677b461f01797226ba8f41" dependencies = [ "libc", "pyo3-build-config", @@ -1469,25 +1475,26 @@ dependencies = [ [[package]] name = "pyo3-macros" -version = "0.19.2" +version = "0.20.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dfeb4c99597e136528c6dd7d5e3de5434d1ceaf487436a3f03b2d56b6fc9efd1" +checksum = "1f4b0dc7eaa578604fab11c8c7ff8934c71249c61d4def8e272c76ed879f03d4" dependencies = [ "proc-macro2", "pyo3-macros-backend", "quote", - "syn 1.0.109", + "syn 2.0.32", ] [[package]] name = "pyo3-macros-backend" -version = "0.19.2" +version = "0.20.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "947dc12175c254889edc0c02e399476c2f652b4b9ebd123aa655c224de259536" +checksum = "816a4f709e29ddab2e3cdfe94600d554c5556cad0ddfeea95c47b580c3247fa4" dependencies = [ + "heck", "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.32", ] [[package]] @@ -2048,9 +2055,9 @@ checksum = "1dd624098567895118886609431a7c3b8f516e41d30e0643f03d94592a147e36" [[package]] name = "unindent" -version = "0.1.11" +version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1766d682d402817b5ac4490b3c3002d91dfa0d22812f341609f97b08757359c" +checksum = "c7de7d73e1754487cb58364ee906a499937a0dfabd86bcb980fa99ec8c8fa2ce" [[package]] name = "version_check" diff --git a/common/Cargo.toml b/common/Cargo.toml index d5ada2f7..7ccb6301 100644 --- a/common/Cargo.toml +++ b/common/Cargo.toml @@ -15,7 +15,7 @@ features = ["schemars", "serde"] [dependencies] enumn = { version = "0.1.6", optional = true } -pyo3 = { version = "0.19", optional = true } +pyo3 = { version = "0.20", optional = true } schemars = { version = "0.8.7", optional = true } serde = { version = "1.0", features = ["derive"], optional = true } diff --git a/common/src/lib.rs b/common/src/lib.rs index 2cd49a47..8ef53436 100644 --- a/common/src/lib.rs +++ b/common/src/lib.rs @@ -44,7 +44,10 @@ pub use geometry::{Affine, Point, Rect, Size, Vec2}; #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))] #[cfg_attr(feature = "schemars", derive(JsonSchema))] #[cfg_attr(feature = "serde", serde(rename_all = "camelCase"))] -#[cfg_attr(feature = "pyo3", pyclass(module = "accesskit"))] +#[cfg_attr( + feature = "pyo3", + pyclass(module = "accesskit", rename_all = "SCREAMING_SNAKE_CASE") +)] #[repr(u8)] pub enum Role { Unknown, @@ -279,7 +282,10 @@ impl Default for Role { #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))] #[cfg_attr(feature = "schemars", derive(JsonSchema))] #[cfg_attr(feature = "serde", serde(rename_all = "camelCase"))] -#[cfg_attr(feature = "pyo3", pyclass(module = "accesskit"))] +#[cfg_attr( + feature = "pyo3", + pyclass(module = "accesskit", rename_all = "SCREAMING_SNAKE_CASE") +)] #[repr(u8)] pub enum Action { /// Do the default action for an object, typically this means "click". @@ -442,7 +448,10 @@ impl JsonSchema for Actions { #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))] #[cfg_attr(feature = "schemars", derive(JsonSchema))] #[cfg_attr(feature = "serde", serde(rename_all = "camelCase"))] -#[cfg_attr(feature = "pyo3", pyclass(module = "accesskit"))] +#[cfg_attr( + feature = "pyo3", + pyclass(module = "accesskit", rename_all = "SCREAMING_SNAKE_CASE") +)] #[repr(u8)] pub enum Orientation { /// E.g. most toolbars and separators. @@ -456,7 +465,10 @@ pub enum Orientation { #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))] #[cfg_attr(feature = "schemars", derive(JsonSchema))] #[cfg_attr(feature = "serde", serde(rename_all = "camelCase"))] -#[cfg_attr(feature = "pyo3", pyclass(module = "accesskit"))] +#[cfg_attr( + feature = "pyo3", + pyclass(module = "accesskit", rename_all = "SCREAMING_SNAKE_CASE") +)] #[repr(u8)] pub enum TextDirection { LeftToRight, @@ -474,7 +486,10 @@ pub enum TextDirection { #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))] #[cfg_attr(feature = "schemars", derive(JsonSchema))] #[cfg_attr(feature = "serde", serde(rename_all = "camelCase"))] -#[cfg_attr(feature = "pyo3", pyclass(module = "accesskit"))] +#[cfg_attr( + feature = "pyo3", + pyclass(module = "accesskit", rename_all = "SCREAMING_SNAKE_CASE") +)] #[repr(u8)] pub enum Invalid { True, @@ -487,7 +502,10 @@ pub enum Invalid { #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))] #[cfg_attr(feature = "schemars", derive(JsonSchema))] #[cfg_attr(feature = "serde", serde(rename_all = "camelCase"))] -#[cfg_attr(feature = "pyo3", pyclass(module = "accesskit"))] +#[cfg_attr( + feature = "pyo3", + pyclass(module = "accesskit", rename_all = "SCREAMING_SNAKE_CASE") +)] #[repr(u8)] pub enum Checked { False, @@ -506,7 +524,10 @@ pub enum Checked { #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))] #[cfg_attr(feature = "schemars", derive(JsonSchema))] #[cfg_attr(feature = "serde", serde(rename_all = "camelCase"))] -#[cfg_attr(feature = "pyo3", pyclass(module = "accesskit"))] +#[cfg_attr( + feature = "pyo3", + pyclass(module = "accesskit", rename_all = "SCREAMING_SNAKE_CASE") +)] #[repr(u8)] pub enum DefaultActionVerb { Click, @@ -530,7 +551,10 @@ pub enum DefaultActionVerb { #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))] #[cfg_attr(feature = "schemars", derive(JsonSchema))] #[cfg_attr(feature = "serde", serde(rename_all = "camelCase"))] -#[cfg_attr(feature = "pyo3", pyclass(module = "accesskit"))] +#[cfg_attr( + feature = "pyo3", + pyclass(module = "accesskit", rename_all = "SCREAMING_SNAKE_CASE") +)] #[repr(u8)] pub enum SortDirection { Unsorted, @@ -544,7 +568,10 @@ pub enum SortDirection { #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))] #[cfg_attr(feature = "schemars", derive(JsonSchema))] #[cfg_attr(feature = "serde", serde(rename_all = "camelCase"))] -#[cfg_attr(feature = "pyo3", pyclass(module = "accesskit"))] +#[cfg_attr( + feature = "pyo3", + pyclass(module = "accesskit", rename_all = "SCREAMING_SNAKE_CASE") +)] #[repr(u8)] pub enum AriaCurrent { False, @@ -561,7 +588,10 @@ pub enum AriaCurrent { #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))] #[cfg_attr(feature = "schemars", derive(JsonSchema))] #[cfg_attr(feature = "serde", serde(rename_all = "camelCase"))] -#[cfg_attr(feature = "pyo3", pyclass(module = "accesskit"))] +#[cfg_attr( + feature = "pyo3", + pyclass(module = "accesskit", rename_all = "SCREAMING_SNAKE_CASE") +)] #[repr(u8)] pub enum AutoComplete { Inline, @@ -574,7 +604,10 @@ pub enum AutoComplete { #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))] #[cfg_attr(feature = "schemars", derive(JsonSchema))] #[cfg_attr(feature = "serde", serde(rename_all = "camelCase"))] -#[cfg_attr(feature = "pyo3", pyclass(module = "accesskit"))] +#[cfg_attr( + feature = "pyo3", + pyclass(module = "accesskit", rename_all = "SCREAMING_SNAKE_CASE") +)] #[repr(u8)] pub enum Live { Off, @@ -587,7 +620,10 @@ pub enum Live { #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))] #[cfg_attr(feature = "schemars", derive(JsonSchema))] #[cfg_attr(feature = "serde", serde(rename_all = "camelCase"))] -#[cfg_attr(feature = "pyo3", pyclass(module = "accesskit"))] +#[cfg_attr( + feature = "pyo3", + pyclass(module = "accesskit", rename_all = "SCREAMING_SNAKE_CASE") +)] #[repr(u8)] pub enum HasPopup { True, @@ -603,7 +639,10 @@ pub enum HasPopup { #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))] #[cfg_attr(feature = "schemars", derive(JsonSchema))] #[cfg_attr(feature = "serde", serde(rename_all = "camelCase"))] -#[cfg_attr(feature = "pyo3", pyclass(module = "accesskit"))] +#[cfg_attr( + feature = "pyo3", + pyclass(module = "accesskit", rename_all = "SCREAMING_SNAKE_CASE") +)] #[repr(u8)] pub enum ListStyle { Circle, @@ -620,7 +659,10 @@ pub enum ListStyle { #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))] #[cfg_attr(feature = "schemars", derive(JsonSchema))] #[cfg_attr(feature = "serde", serde(rename_all = "camelCase"))] -#[cfg_attr(feature = "pyo3", pyclass(module = "accesskit"))] +#[cfg_attr( + feature = "pyo3", + pyclass(module = "accesskit", rename_all = "SCREAMING_SNAKE_CASE") +)] #[repr(u8)] pub enum TextAlign { Left, @@ -634,7 +676,10 @@ pub enum TextAlign { #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))] #[cfg_attr(feature = "schemars", derive(JsonSchema))] #[cfg_attr(feature = "serde", serde(rename_all = "camelCase"))] -#[cfg_attr(feature = "pyo3", pyclass(module = "accesskit"))] +#[cfg_attr( + feature = "pyo3", + pyclass(module = "accesskit", rename_all = "SCREAMING_SNAKE_CASE") +)] #[repr(u8)] pub enum VerticalOffset { Subscript, @@ -646,7 +691,10 @@ pub enum VerticalOffset { #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))] #[cfg_attr(feature = "schemars", derive(JsonSchema))] #[cfg_attr(feature = "serde", serde(rename_all = "camelCase"))] -#[cfg_attr(feature = "pyo3", pyclass(module = "accesskit"))] +#[cfg_attr( + feature = "pyo3", + pyclass(module = "accesskit", rename_all = "SCREAMING_SNAKE_CASE") +)] #[repr(u8)] pub enum TextDecoration { Solid,