Skip to content

Commit 5a4c6f3

Browse files
DataTrinyDataTriny
authored
fix: Bump pyo3; add rename_all attribute to enums (#330)
1 parent a3820c2 commit 5a4c6f3

File tree

3 files changed

+88
-33
lines changed

3 files changed

+88
-33
lines changed

‎Cargo.lock‎

Lines changed: 23 additions & 16 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎common/Cargo.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ features = ["schemars", "serde"]
1515

1616
[dependencies]
1717
enumn = { version = "0.1.6", optional = true }
18-
pyo3 = { version = "0.19", optional = true }
18+
pyo3 = { version = "0.20", optional = true }
1919
schemars = { version = "0.8.7", optional = true }
2020
serde = { version = "1.0", features = ["derive"], optional = true }
2121

‎common/src/lib.rs‎

Lines changed: 64 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,10 @@ pub use geometry::{Affine, Point, Rect, Size, Vec2};
4444
#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
4545
#[cfg_attr(feature = "schemars", derive(JsonSchema))]
4646
#[cfg_attr(feature = "serde", serde(rename_all = "camelCase"))]
47-
#[cfg_attr(feature = "pyo3", pyclass(module = "accesskit"))]
47+
#[cfg_attr(
48+
feature = "pyo3",
49+
pyclass(module = "accesskit", rename_all = "SCREAMING_SNAKE_CASE")
50+
)]
4851
#[repr(u8)]
4952
pub enum Role {
5053
Unknown,
@@ -279,7 +282,10 @@ impl Default for Role {
279282
#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
280283
#[cfg_attr(feature = "schemars", derive(JsonSchema))]
281284
#[cfg_attr(feature = "serde", serde(rename_all = "camelCase"))]
282-
#[cfg_attr(feature = "pyo3", pyclass(module = "accesskit"))]
285+
#[cfg_attr(
286+
feature = "pyo3",
287+
pyclass(module = "accesskit", rename_all = "SCREAMING_SNAKE_CASE")
288+
)]
283289
#[repr(u8)]
284290
pub enum Action {
285291
/// Do the default action for an object, typically this means "click".
@@ -442,7 +448,10 @@ impl JsonSchema for Actions {
442448
#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
443449
#[cfg_attr(feature = "schemars", derive(JsonSchema))]
444450
#[cfg_attr(feature = "serde", serde(rename_all = "camelCase"))]
445-
#[cfg_attr(feature = "pyo3", pyclass(module = "accesskit"))]
451+
#[cfg_attr(
452+
feature = "pyo3",
453+
pyclass(module = "accesskit", rename_all = "SCREAMING_SNAKE_CASE")
454+
)]
446455
#[repr(u8)]
447456
pub enum Orientation {
448457
/// E.g. most toolbars and separators.
@@ -456,7 +465,10 @@ pub enum Orientation {
456465
#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
457466
#[cfg_attr(feature = "schemars", derive(JsonSchema))]
458467
#[cfg_attr(feature = "serde", serde(rename_all = "camelCase"))]
459-
#[cfg_attr(feature = "pyo3", pyclass(module = "accesskit"))]
468+
#[cfg_attr(
469+
feature = "pyo3",
470+
pyclass(module = "accesskit", rename_all = "SCREAMING_SNAKE_CASE")
471+
)]
460472
#[repr(u8)]
461473
pub enum TextDirection {
462474
LeftToRight,
@@ -474,7 +486,10 @@ pub enum TextDirection {
474486
#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
475487
#[cfg_attr(feature = "schemars", derive(JsonSchema))]
476488
#[cfg_attr(feature = "serde", serde(rename_all = "camelCase"))]
477-
#[cfg_attr(feature = "pyo3", pyclass(module = "accesskit"))]
489+
#[cfg_attr(
490+
feature = "pyo3",
491+
pyclass(module = "accesskit", rename_all = "SCREAMING_SNAKE_CASE")
492+
)]
478493
#[repr(u8)]
479494
pub enum Invalid {
480495
True,
@@ -487,7 +502,10 @@ pub enum Invalid {
487502
#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
488503
#[cfg_attr(feature = "schemars", derive(JsonSchema))]
489504
#[cfg_attr(feature = "serde", serde(rename_all = "camelCase"))]
490-
#[cfg_attr(feature = "pyo3", pyclass(module = "accesskit"))]
505+
#[cfg_attr(
506+
feature = "pyo3",
507+
pyclass(module = "accesskit", rename_all = "SCREAMING_SNAKE_CASE")
508+
)]
491509
#[repr(u8)]
492510
pub enum Checked {
493511
False,
@@ -506,7 +524,10 @@ pub enum Checked {
506524
#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
507525
#[cfg_attr(feature = "schemars", derive(JsonSchema))]
508526
#[cfg_attr(feature = "serde", serde(rename_all = "camelCase"))]
509-
#[cfg_attr(feature = "pyo3", pyclass(module = "accesskit"))]
527+
#[cfg_attr(
528+
feature = "pyo3",
529+
pyclass(module = "accesskit", rename_all = "SCREAMING_SNAKE_CASE")
530+
)]
510531
#[repr(u8)]
511532
pub enum DefaultActionVerb {
512533
Click,
@@ -530,7 +551,10 @@ pub enum DefaultActionVerb {
530551
#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
531552
#[cfg_attr(feature = "schemars", derive(JsonSchema))]
532553
#[cfg_attr(feature = "serde", serde(rename_all = "camelCase"))]
533-
#[cfg_attr(feature = "pyo3", pyclass(module = "accesskit"))]
554+
#[cfg_attr(
555+
feature = "pyo3",
556+
pyclass(module = "accesskit", rename_all = "SCREAMING_SNAKE_CASE")
557+
)]
534558
#[repr(u8)]
535559
pub enum SortDirection {
536560
Unsorted,
@@ -544,7 +568,10 @@ pub enum SortDirection {
544568
#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
545569
#[cfg_attr(feature = "schemars", derive(JsonSchema))]
546570
#[cfg_attr(feature = "serde", serde(rename_all = "camelCase"))]
547-
#[cfg_attr(feature = "pyo3", pyclass(module = "accesskit"))]
571+
#[cfg_attr(
572+
feature = "pyo3",
573+
pyclass(module = "accesskit", rename_all = "SCREAMING_SNAKE_CASE")
574+
)]
548575
#[repr(u8)]
549576
pub enum AriaCurrent {
550577
False,
@@ -561,7 +588,10 @@ pub enum AriaCurrent {
561588
#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
562589
#[cfg_attr(feature = "schemars", derive(JsonSchema))]
563590
#[cfg_attr(feature = "serde", serde(rename_all = "camelCase"))]
564-
#[cfg_attr(feature = "pyo3", pyclass(module = "accesskit"))]
591+
#[cfg_attr(
592+
feature = "pyo3",
593+
pyclass(module = "accesskit", rename_all = "SCREAMING_SNAKE_CASE")
594+
)]
565595
#[repr(u8)]
566596
pub enum AutoComplete {
567597
Inline,
@@ -574,7 +604,10 @@ pub enum AutoComplete {
574604
#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
575605
#[cfg_attr(feature = "schemars", derive(JsonSchema))]
576606
#[cfg_attr(feature = "serde", serde(rename_all = "camelCase"))]
577-
#[cfg_attr(feature = "pyo3", pyclass(module = "accesskit"))]
607+
#[cfg_attr(
608+
feature = "pyo3",
609+
pyclass(module = "accesskit", rename_all = "SCREAMING_SNAKE_CASE")
610+
)]
578611
#[repr(u8)]
579612
pub enum Live {
580613
Off,
@@ -587,7 +620,10 @@ pub enum Live {
587620
#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
588621
#[cfg_attr(feature = "schemars", derive(JsonSchema))]
589622
#[cfg_attr(feature = "serde", serde(rename_all = "camelCase"))]
590-
#[cfg_attr(feature = "pyo3", pyclass(module = "accesskit"))]
623+
#[cfg_attr(
624+
feature = "pyo3",
625+
pyclass(module = "accesskit", rename_all = "SCREAMING_SNAKE_CASE")
626+
)]
591627
#[repr(u8)]
592628
pub enum HasPopup {
593629
True,
@@ -603,7 +639,10 @@ pub enum HasPopup {
603639
#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
604640
#[cfg_attr(feature = "schemars", derive(JsonSchema))]
605641
#[cfg_attr(feature = "serde", serde(rename_all = "camelCase"))]
606-
#[cfg_attr(feature = "pyo3", pyclass(module = "accesskit"))]
642+
#[cfg_attr(
643+
feature = "pyo3",
644+
pyclass(module = "accesskit", rename_all = "SCREAMING_SNAKE_CASE")
645+
)]
607646
#[repr(u8)]
608647
pub enum ListStyle {
609648
Circle,
@@ -620,7 +659,10 @@ pub enum ListStyle {
620659
#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
621660
#[cfg_attr(feature = "schemars", derive(JsonSchema))]
622661
#[cfg_attr(feature = "serde", serde(rename_all = "camelCase"))]
623-
#[cfg_attr(feature = "pyo3", pyclass(module = "accesskit"))]
662+
#[cfg_attr(
663+
feature = "pyo3",
664+
pyclass(module = "accesskit", rename_all = "SCREAMING_SNAKE_CASE")
665+
)]
624666
#[repr(u8)]
625667
pub enum TextAlign {
626668
Left,
@@ -634,7 +676,10 @@ pub enum TextAlign {
634676
#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
635677
#[cfg_attr(feature = "schemars", derive(JsonSchema))]
636678
#[cfg_attr(feature = "serde", serde(rename_all = "camelCase"))]
637-
#[cfg_attr(feature = "pyo3", pyclass(module = "accesskit"))]
679+
#[cfg_attr(
680+
feature = "pyo3",
681+
pyclass(module = "accesskit", rename_all = "SCREAMING_SNAKE_CASE")
682+
)]
638683
#[repr(u8)]
639684
pub enum VerticalOffset {
640685
Subscript,
@@ -646,7 +691,10 @@ pub enum VerticalOffset {
646691
#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
647692
#[cfg_attr(feature = "schemars", derive(JsonSchema))]
648693
#[cfg_attr(feature = "serde", serde(rename_all = "camelCase"))]
649-
#[cfg_attr(feature = "pyo3", pyclass(module = "accesskit"))]
694+
#[cfg_attr(
695+
feature = "pyo3",
696+
pyclass(module = "accesskit", rename_all = "SCREAMING_SNAKE_CASE")
697+
)]
650698
#[repr(u8)]
651699
pub enum TextDecoration {
652700
Solid,

0 commit comments

Comments
 (0)