fix: Bump pyo3; add rename_all attribute to enums (#330)

AccessKit · Jan 1, 2024 · 5a4c6f3 · 5a4c6f3
1 parent a3820c2
commit 5a4c6f3
Show file tree

Hide file tree

Showing 3 changed files with 88 additions and 33 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git 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
@@ -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,