Add support for return static slices in JS (#796)

rust-diplomat · Feb 21, 2025 · f3e980c · f3e980c
1 parent d9abfbf
commit f3e980c
Show file tree

Hide file tree

Showing 10 changed files with 52 additions and 13 deletions.
diff --git a/feature_tests/c/include/MyString.h b/feature_tests/c/include/MyString.h
diff --git a/feature_tests/cpp/include/MyString.d.hpp b/feature_tests/cpp/include/MyString.d.hpp
diff --git a/feature_tests/cpp/include/MyString.hpp b/feature_tests/cpp/include/MyString.hpp
diff --git a/feature_tests/dart/lib/src/MyString.g.dart b/feature_tests/dart/lib/src/MyString.g.dart
diff --git a/feature_tests/js/api/MyString.d.ts b/feature_tests/js/api/MyString.d.ts
diff --git a/feature_tests/js/api/MyString.mjs b/feature_tests/js/api/MyString.mjs
diff --git a/feature_tests/kotlin/somelib/src/main/kotlin/dev/diplomattest/somelib/MyString.kt b/feature_tests/kotlin/somelib/src/main/kotlin/dev/diplomattest/somelib/MyString.kt
diff --git a/feature_tests/src/slices.rs b/feature_tests/src/slices.rs
@@ -35,6 +35,10 @@ mod ffi {
             let _infallible = write!(write, "{}", self.0);
         }
 
+        pub fn get_static_str() -> &'static str {
+            "hello"
+        }
+
         pub fn string_transform(foo: &str, write: &mut DiplomatWrite) {
             let _ = foo;
             let _ = write;

diff --git a/tool/src/dart/mod.rs b/tool/src/dart/mod.rs
@@ -274,10 +274,7 @@ impl<'cx> TyGenContext<'_, 'cx> {
                 /// Get the name/initializer of the allocator needed for a particular type
                 fn alloc_name<P: TyPosition>(ty: &hir::StructDef<P>, field_ty: &Type<P>) -> Option<String> {
                     if let &hir::Type::Slice(slice) = field_ty {
-                        if let Some(lt) = slice.lifetime() {
-                            let MaybeStatic::NonStatic(lt) = lt else {
-                                panic!("'static not supported in Dart");
-                            };
+                        if let Some(MaybeStatic::NonStatic(lt)) = slice.lifetime() {
                             Some(format!(
                                 "{lt_name}AppendArray.isNotEmpty ? _FinalizedArena.withLifetime({lt_name}AppendArray).arena : temp",
                                 lt_name = ty.lifetimes.fmt_lifetime(lt),
@@ -1015,10 +1012,7 @@ impl<'cx> TyGenContext<'_, 'cx> {
                 format!("{type_name}.values.firstWhere((v) => v._ffi == {var_name})").into()
             }
             Type::Slice(slice) => {
-                if let Some(lt) = slice.lifetime() {
-                    let MaybeStatic::NonStatic(lifetime) = lt else {
-                        panic!("'static not supported in Dart");
-                    };
+                if let Some(MaybeStatic::NonStatic(lifetime)) = slice.lifetime() {
                     format!(
                         "{var_name}._toDart({}Edges)",
                         lifetime_env.fmt_lifetime(lifetime)

diff --git a/tool/src/js/converter.rs b/tool/src/js/converter.rs
@@ -227,11 +227,8 @@ impl<'tcx> TyGenContext<'_, 'tcx> {
             }
             Type::Slice(slice) => {
                 let edges = match slice.lifetime() {
-                    Some(lt) => {
-                        let hir::MaybeStatic::NonStatic(lifetime) = lt else {
-                            panic!("'static not supported for JS backend");
-                        };
-                        format!("{}Edges", lifetime_environment.fmt_lifetime(lifetime))
+                    Some(hir::MaybeStatic::NonStatic(lt)) => {
+                        format!("{}Edges", lifetime_environment.fmt_lifetime(lt))
                     }
                     _ => "[]".into(),
                 };