From f9ee7b64ea05027d53e08771e5b87dd18b6374ab Mon Sep 17 00:00:00 2001 From: Michael Williamson Date: Tue, 30 Jun 2026 21:03:46 +0100 Subject: Support lists in rust-types --- examples/03-list/hobgoblin.json5 | 4 ++++ examples/03-list/output/rust/.gitignore | 1 + examples/03-list/output/rust/Cargo.lock | 7 +++++++ examples/03-list/output/rust/Cargo.toml | 6 ++++++ examples/03-list/output/rust/rust-toolchain.toml | 2 ++ examples/03-list/output/rust/src/main.rs | 12 ++++++++++++ examples/03-list/output/rust/src/point.rs | 8 ++++++++ .../output/generators/rusttypes/RustTypesGenerator.java | 7 ++++++- 8 files changed, 46 insertions(+), 1 deletion(-) create mode 100644 examples/03-list/output/rust/.gitignore create mode 100644 examples/03-list/output/rust/Cargo.lock create mode 100644 examples/03-list/output/rust/Cargo.toml create mode 100644 examples/03-list/output/rust/rust-toolchain.toml create mode 100644 examples/03-list/output/rust/src/main.rs create mode 100644 examples/03-list/output/rust/src/point.rs diff --git a/examples/03-list/hobgoblin.json5 b/examples/03-list/hobgoblin.json5 index 1ec9568..2bf59c3 100644 --- a/examples/03-list/hobgoblin.json5 +++ b/examples/03-list/hobgoblin.json5 @@ -5,5 +5,9 @@ path: "output/java/src/gen/java", packageName: "org.zwobble.example.types" }, + { + generator: "rust-types", + path: "output/rust/src", + }, ], } diff --git a/examples/03-list/output/rust/.gitignore b/examples/03-list/output/rust/.gitignore new file mode 100644 index 0000000..ea8c4bf --- /dev/null +++ b/examples/03-list/output/rust/.gitignore @@ -0,0 +1 @@ +/target diff --git a/examples/03-list/output/rust/Cargo.lock b/examples/03-list/output/rust/Cargo.lock new file mode 100644 index 0000000..9dc6e3e --- /dev/null +++ b/examples/03-list/output/rust/Cargo.lock @@ -0,0 +1,7 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. +version = 4 + +[[package]] +name = "example" +version = "0.1.0" diff --git a/examples/03-list/output/rust/Cargo.toml b/examples/03-list/output/rust/Cargo.toml new file mode 100644 index 0000000..5d4c622 --- /dev/null +++ b/examples/03-list/output/rust/Cargo.toml @@ -0,0 +1,6 @@ +[package] +name = "example" +version = "0.1.0" +edition = "2024" + +[dependencies] diff --git a/examples/03-list/output/rust/rust-toolchain.toml b/examples/03-list/output/rust/rust-toolchain.toml new file mode 100644 index 0000000..4fedb95 --- /dev/null +++ b/examples/03-list/output/rust/rust-toolchain.toml @@ -0,0 +1,2 @@ +[toolchain] +channel = "1.96" diff --git a/examples/03-list/output/rust/src/main.rs b/examples/03-list/output/rust/src/main.rs new file mode 100644 index 0000000..3c636af --- /dev/null +++ b/examples/03-list/output/rust/src/main.rs @@ -0,0 +1,12 @@ +mod point; + +use point::{Path, Point}; + +fn main() { + let path: Path = Path { + points: vec![ + Point { x: 10, y: 25 }, + Point { x: 25, y: 10 } + ], + }; +} diff --git a/examples/03-list/output/rust/src/point.rs b/examples/03-list/output/rust/src/point.rs new file mode 100644 index 0000000..25effb2 --- /dev/null +++ b/examples/03-list/output/rust/src/point.rs @@ -0,0 +1,8 @@ +pub struct Path { + pub points: std::vec::Vec, +} + +pub struct Point { + pub x: i32, + pub y: i32, +} diff --git a/src/main/java/org/zwobble/hobgoblin/compiler/output/generators/rusttypes/RustTypesGenerator.java b/src/main/java/org/zwobble/hobgoblin/compiler/output/generators/rusttypes/RustTypesGenerator.java index e03ae14..776e401 100644 --- a/src/main/java/org/zwobble/hobgoblin/compiler/output/generators/rusttypes/RustTypesGenerator.java +++ b/src/main/java/org/zwobble/hobgoblin/compiler/output/generators/rusttypes/RustTypesGenerator.java @@ -107,7 +107,12 @@ public class RustTypesGenerator implements Generator { private RustType generateRustTypeExpression(Type type) { return switch (type) { case ConstructedNativeType constructedNativeType -> { - throw new UnsupportedOperationException("TODO"); + // TODO: avoid cast + var rustType = (RustTypePath) generateRustTypeExpression(constructedNativeType.constructor().genericType()); + var rustArgs = constructedNativeType.args().stream() + .map(arg -> generateRustTypeExpression(arg)) + .toList(); + yield rustType.withArgs(rustArgs); } case EnumType enumType -> { -- cgit v1.2.3