Skip to content

Commit 51de408

Browse files
jessfrazjessfraz
committed
updates
Signed-off-by: Jessie Frazelle <github@jessfraz.com>
1 parent 07950e7 commit 51de408

File tree

12 files changed

+168
-91
lines changed

12 files changed

+168
-91
lines changed

‎Cargo.lock‎

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

‎modeling-cmds/Cargo.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ measurements = "0.11.0"
4242
parse-display = "0.9.1"
4343
parse-display-derive = "0.9.0"
4444
pyo3 = { version = "0.25.1", optional = true }
45-
pyo3-stub-gen = { version = "0.12.2", optional = true }
45+
pyo3-stub-gen = { version = "0.13.1", optional = true }
4646
schemars = { version = "0.8.22", features = [
4747
"bigdecimal04",
4848
"chrono",

‎modeling-cmds/src/format/dxf.rs‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,11 @@ pub mod export {
1212
#[serde(rename = "DxfStorage", rename_all = "snake_case")]
1313
#[cfg_attr(feature = "ts-rs", derive(ts_rs::TS))]
1414
#[cfg_attr(feature = "ts-rs", ts(export_to = "ModelingCmd.ts"))]
15-
#[cfg_attr(feature = "python", pyo3::pyclass, pyo3_stub_gen::derive::gen_stub_pyclass_enum)]
15+
#[cfg_attr(
16+
feature = "python",
17+
pyo3_stub_gen::derive::gen_stub_pyclass_enum,
18+
pyo3::pyclass(name = "DxfStorage")
19+
)]
1620
pub enum Storage {
1721
/// Plaintext encoding.
1822
///
@@ -32,8 +36,8 @@ pub mod export {
3236
#[cfg_attr(feature = "ts-rs", ts(export_to = "ModelingCmd.ts"))]
3337
#[cfg_attr(
3438
feature = "python",
35-
pyo3::pyclass(name = "DxfExportOptions"),
36-
pyo3_stub_gen::derive::gen_stub_pyclass
39+
pyo3_stub_gen::derive::gen_stub_pyclass,
40+
pyo3::pyclass(name = "DxfExportOptions")
3741
)]
3842
pub struct Options {
3943
/// Export storage.

‎modeling-cmds/src/format/fbx.rs‎

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ pub mod import {
1313
#[cfg_attr(feature = "ts-rs", ts(export_to = "ModelingCmd.ts"))]
1414
#[cfg_attr(
1515
feature = "python",
16-
pyo3::pyclass(name = "FbxImportOptions"),
17-
pyo3_stub_gen::derive::gen_stub_pyclass
16+
pyo3_stub_gen::derive::gen_stub_pyclass,
17+
pyo3::pyclass(name = "FbxImportOptions")
1818
)]
1919
pub struct Options {}
2020

@@ -40,8 +40,8 @@ pub mod export {
4040
#[cfg_attr(feature = "ts-rs", derive(ts_rs::TS))]
4141
#[cfg_attr(
4242
feature = "python",
43-
pyo3::pyclass(name = "FbxExportOptions"),
44-
pyo3_stub_gen::derive::gen_stub_pyclass
43+
pyo3_stub_gen::derive::gen_stub_pyclass,
44+
pyo3::pyclass(name = "FbxExportOptions")
4545
)]
4646
#[cfg_attr(feature = "ts-rs", ts(export_to = "ModelingCmd.ts"))]
4747
pub struct Options {
@@ -87,7 +87,11 @@ pub mod export {
8787
#[serde(rename = "FbxStorage", rename_all = "snake_case")]
8888
#[cfg_attr(feature = "ts-rs", derive(ts_rs::TS))]
8989
#[cfg_attr(feature = "ts-rs", ts(export_to = "ModelingCmd.ts"))]
90-
#[cfg_attr(feature = "python", pyo3::pyclass, pyo3_stub_gen::derive::gen_stub_pyclass_enum)]
90+
#[cfg_attr(
91+
feature = "python",
92+
pyo3_stub_gen::derive::gen_stub_pyclass_enum,
93+
pyo3::pyclass(name = "FbxStorage")
94+
)]
9195
pub enum Storage {
9296
/// ASCII FBX encoding.
9397
Ascii,

‎modeling-cmds/src/format/gltf.rs‎

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@ pub mod import {
1414
#[cfg_attr(feature = "ts-rs", ts(export_to = "ModelingCmd.ts"))]
1515
#[cfg_attr(
1616
feature = "python",
17-
pyo3::pyclass(name = "GltfImportOptions"),
18-
pyo3_stub_gen::derive::gen_stub_pyclass
17+
pyo3_stub_gen::derive::gen_stub_pyclass,
18+
pyo3::pyclass(name = "GltfImportOptions")
1919
)]
2020
pub struct Options {}
2121

@@ -41,8 +41,8 @@ pub mod export {
4141
#[cfg_attr(feature = "ts-rs", derive(ts_rs::TS))]
4242
#[cfg_attr(
4343
feature = "python",
44-
pyo3::pyclass(name = "GltfExportOptions"),
45-
pyo3_stub_gen::derive::gen_stub_pyclass
44+
pyo3_stub_gen::derive::gen_stub_pyclass,
45+
pyo3::pyclass(name = "GltfExportOptions")
4646
)]
4747
#[cfg_attr(feature = "ts-rs", ts(export_to = "ModelingCmd.ts"))]
4848
pub struct Options {
@@ -71,7 +71,11 @@ pub mod export {
7171
#[serde(rename = "GltfStorage", rename_all = "snake_case")]
7272
#[cfg_attr(feature = "ts-rs", derive(ts_rs::TS))]
7373
#[cfg_attr(feature = "ts-rs", ts(export_to = "ModelingCmd.ts"))]
74-
#[cfg_attr(feature = "python", pyo3::pyclass, pyo3_stub_gen::derive::gen_stub_pyclass_enum)]
74+
#[cfg_attr(
75+
feature = "python",
76+
pyo3_stub_gen::derive::gen_stub_pyclass_enum,
77+
pyo3::pyclass(name = "GltfStorage")
78+
)]
7579
pub enum Storage {
7680
/// Binary glTF 2.0.
7781
///

‎modeling-cmds/src/format/obj.rs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ pub mod import {
1616
#[cfg_attr(feature = "ts-rs", ts(export_to = "ModelingCmd.ts"))]
1717
#[cfg_attr(
1818
feature = "python",
19-
pyo3::pyclass(name = "ObjImportOptions"),
20-
pyo3_stub_gen::derive::gen_stub_pyclass
19+
pyo3_stub_gen::derive::gen_stub_pyclass,
20+
pyo3::pyclass(name = "ObjImportOptions")
2121
)]
2222
pub struct Options {
2323
/// Co-ordinate system of input data.
@@ -68,8 +68,8 @@ pub mod export {
6868
#[cfg_attr(feature = "ts-rs", derive(ts_rs::TS))]
6969
#[cfg_attr(
7070
feature = "python",
71-
pyo3::pyclass(name = "ObjExportOptions"),
72-
pyo3_stub_gen::derive::gen_stub_pyclass
71+
pyo3_stub_gen::derive::gen_stub_pyclass,
72+
pyo3::pyclass(name = "ObjExportOptions")
7373
)]
7474
#[cfg_attr(feature = "ts-rs", ts(export_to = "ModelingCmd.ts"))]
7575
pub struct Options {

‎modeling-cmds/src/format/ply.rs‎

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ pub mod import {
1616
#[cfg_attr(feature = "ts-rs", ts(export_to = "ModelingCmd.ts"))]
1717
#[cfg_attr(
1818
feature = "python",
19-
pyo3::pyclass(name = "PlyImportOptions"),
20-
pyo3_stub_gen::derive::gen_stub_pyclass
19+
pyo3_stub_gen::derive::gen_stub_pyclass,
20+
pyo3::pyclass(name = "PlyImportOptions")
2121
)]
2222
pub struct Options {
2323
/// Co-ordinate system of input data.
@@ -69,8 +69,8 @@ pub mod export {
6969
#[cfg_attr(feature = "ts-rs", derive(ts_rs::TS))]
7070
#[cfg_attr(
7171
feature = "python",
72-
pyo3::pyclass(name = "PlyExportOptions"),
73-
pyo3_stub_gen::derive::gen_stub_pyclass
72+
pyo3_stub_gen::derive::gen_stub_pyclass,
73+
pyo3::pyclass(name = "PlyExportOptions")
7474
)]
7575
#[cfg_attr(feature = "ts-rs", ts(export_to = "ModelingCmd.ts"))]
7676
pub struct Options {
@@ -121,6 +121,11 @@ pub mod export {
121121
#[serde(rename = "PlyStorage", rename_all = "snake_case")]
122122
#[cfg_attr(feature = "ts-rs", derive(ts_rs::TS))]
123123
#[cfg_attr(feature = "ts-rs", ts(export_to = "ModelingCmd.ts"))]
124+
#[cfg_attr(
125+
feature = "python",
126+
pyo3_stub_gen::derive::gen_stub_pyclass_enum,
127+
pyo3::pyclass(name = "PlyStorage")
128+
)]
124129
pub enum Storage {
125130
/// Write numbers in their ascii representation (e.g. -13, 6.28, etc.). Properties are separated by spaces and elements are separated by line breaks.
126131
#[default]

‎modeling-cmds/src/format/sldprt.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ pub mod import {
1313
#[cfg_attr(feature = "ts-rs", ts(export_to = "ModelingCmd.ts"))]
1414
#[cfg_attr(
1515
feature = "python",
16-
pyo3::pyclass(name = "SldprtImportOptions"),
17-
pyo3_stub_gen::derive::gen_stub_pyclass
16+
pyo3_stub_gen::derive::gen_stub_pyclass,
17+
pyo3::pyclass(name = "SldprtImportOptions")
1818
)]
1919
pub struct Options {
2020
/// Splits all closed faces into two open faces.

‎modeling-cmds/src/format/step.rs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ pub mod import {
1616
#[cfg_attr(feature = "ts-rs", ts(export_to = "ModelingCmd.ts"))]
1717
#[cfg_attr(
1818
feature = "python",
19-
pyo3::pyclass(name = "StepImportOptions"),
20-
pyo3_stub_gen::derive::gen_stub_pyclass
19+
pyo3_stub_gen::derive::gen_stub_pyclass,
20+
pyo3::pyclass(name = "StepImportOptions")
2121
)]
2222
pub struct Options {
2323
/// Splits all closed faces into two open faces.
@@ -48,8 +48,8 @@ pub mod export {
4848
#[cfg_attr(feature = "ts-rs", derive(ts_rs::TS))]
4949
#[cfg_attr(
5050
feature = "python",
51-
pyo3::pyclass(name = "StepExportOptions"),
52-
pyo3_stub_gen::derive::gen_stub_pyclass
51+
pyo3_stub_gen::derive::gen_stub_pyclass,
52+
pyo3::pyclass(name = "StepExportOptions")
5353
)]
5454
#[cfg_attr(feature = "ts-rs", ts(export_to = "ModelingCmd.ts"))]
5555
pub struct Options {

‎modeling-cmds/src/format/stl.rs‎

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ pub mod import {
1616
#[cfg_attr(feature = "ts-rs", ts(export_to = "ModelingCmd.ts"))]
1717
#[cfg_attr(
1818
feature = "python",
19-
pyo3::pyclass(name = "StlImportOptions"),
20-
pyo3_stub_gen::derive::gen_stub_pyclass
19+
pyo3_stub_gen::derive::gen_stub_pyclass,
20+
pyo3::pyclass(name = "StlImportOptions")
2121
)]
2222
pub struct Options {
2323
/// Co-ordinate system of input data.
@@ -57,8 +57,8 @@ pub mod export {
5757
#[cfg_attr(feature = "ts-rs", derive(ts_rs::TS))]
5858
#[cfg_attr(
5959
feature = "python",
60-
pyo3::pyclass(name = "StlExportOptions"),
61-
pyo3_stub_gen::derive::gen_stub_pyclass
60+
pyo3_stub_gen::derive::gen_stub_pyclass,
61+
pyo3::pyclass(name = "StlExportOptions")
6262
)]
6363
#[cfg_attr(feature = "ts-rs", ts(export_to = "ModelingCmd.ts"))]
6464
pub struct Options {
@@ -111,7 +111,11 @@ pub mod export {
111111
#[serde(rename = "StlStorage", rename_all = "snake_case")]
112112
#[cfg_attr(feature = "ts-rs", derive(ts_rs::TS))]
113113
#[cfg_attr(feature = "ts-rs", ts(export_to = "ModelingCmd.ts"))]
114-
#[cfg_attr(feature = "python", pyo3::pyclass, pyo3_stub_gen::derive::gen_stub_pyclass_enum)]
114+
#[cfg_attr(
115+
feature = "python",
116+
pyo3_stub_gen::derive::gen_stub_pyclass_enum,
117+
pyo3::pyclass(name = "StlStorage")
118+
)]
115119
pub enum Storage {
116120
/// Plaintext encoding.
117121
Ascii,

0 commit comments

Comments
 (0)