Skip to content

Commit 4e613f4

Browse files
committed
Merge branch 'main' into mike/mbd-api-updates
2 parents 976ea96 + caecee0 commit 4e613f4

File tree

4 files changed

+6
-8
lines changed

4 files changed

+6
-8
lines changed

Cargo.lock

Lines changed: 1 addition & 1 deletion
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
@@ -1,6 +1,6 @@
11
[package]
22
name = "kittycad-modeling-cmds"
3-
version = "0.2.138"
3+
version = "0.2.139"
44
edition = "2021"
55
authors = ["KittyCAD, Inc."]
66
description = "Commands in the KittyCAD Modeling API"

modeling-cmds/src/def_enum.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -101,8 +101,8 @@ define_modeling_cmd_enum! {
101101
/// This segment will implicitly begin at the current "pen" location.
102102
pub segment: PathSegment,
103103
/// Optional label to associate with the new path segment.
104-
#[serde(default, skip_serializing_if = "String::is_empty")]
105-
pub label: String,
104+
#[serde(default, skip_serializing_if = "Option::is_none")]
105+
pub label: Option<String>,
106106
}
107107

108108
/// Command for extruding a solid 2d.

modeling-cmds/tests/python_stub_dupes.rs

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,6 @@ fn print_duplicate_stub_names() {
3737
.map(|(n, c)| (n.to_string(), c))
3838
.collect();
3939

40-
eprintln!("duplicate classes: {:?}", dup_classes);
41-
eprintln!("duplicate enums: {:?}", dup_enums);
42-
43-
// This is informational; do not fail test. If we decide to enforce, we can assert emptiness.
40+
assert!(dup_classes.is_empty(), "Duplicate class names: {dup_classes:?}");
41+
assert!(dup_enums.is_empty(), "Duplicate enum names: {dup_enums:?}");
4442
}

0 commit comments

Comments
 (0)