js, cpp2, c2

rust-diplomat · Nov 22, 2023 · 1e1c357 · 1e1c357
1 parent deac309
commit 1e1c357
Show file tree

Hide file tree

Showing 22 changed files with 120 additions and 102 deletions.
diff --git a/example/js/lib/api/ICU4XLocale.js b/example/js/lib/api/ICU4XLocale.js
diff --git a/example/js/lib/api/diplomat-runtime.js b/example/js/lib/api/diplomat-runtime.js
diff --git a/example/js/lib/api/diplomat-wasm.mjs b/example/js/lib/api/diplomat-wasm.mjs
diff --git a/feature_tests/c2/include/BorrowedFields.d.h b/feature_tests/c2/include/BorrowedFields.d.h
diff --git a/feature_tests/cpp2/include/BorrowedFields.d.h b/feature_tests/cpp2/include/BorrowedFields.d.h
diff --git a/feature_tests/cpp2/include/BorrowedFields.d.hpp b/feature_tests/cpp2/include/BorrowedFields.d.hpp
diff --git a/feature_tests/cpp2/include/BorrowedFields.hpp b/feature_tests/cpp2/include/BorrowedFields.hpp
diff --git a/feature_tests/js/api/BorrowedFields.js b/feature_tests/js/api/BorrowedFields.js
diff --git a/feature_tests/js/api/BorrowedFieldsReturning.js b/feature_tests/js/api/BorrowedFieldsReturning.js
diff --git a/feature_tests/js/api/Foo.js b/feature_tests/js/api/Foo.js
diff --git a/feature_tests/js/api/MyString.js b/feature_tests/js/api/MyString.js
diff --git a/feature_tests/js/api/diplomat-runtime.js b/feature_tests/js/api/diplomat-runtime.js
diff --git a/feature_tests/js/api/diplomat-wasm.mjs b/feature_tests/js/api/diplomat-wasm.mjs
diff --git a/tool/src/c2/ty.rs b/tool/src/c2/ty.rs
@@ -243,15 +243,11 @@ impl<'ccx, 'tcx: 'ccx, 'header> TyGenContext<'ccx, 'tcx, 'header> {
                     ("size_t".into(), format!("{param_name}_len").into()),
                 ]
             }
-            // TODO(#240): Implement UTF-16
             Type::Slice(hir::Slice::Str(_, hir::StringEncoding::UnvalidatedUtf16))
                 if !is_struct =>
             {
                 vec![
-                    (
-                        "const uint16_t*".into(),
-                        format!("{param_name}_data").into(),
-                    ),
+                    ("const wchar_t*".into(), format!("{param_name}_data").into()),
                     ("size_t".into(), format!("{param_name}_len").into()),
                 ]
             }
@@ -327,8 +323,7 @@ impl<'ccx, 'tcx: 'ccx, 'header> TyGenContext<'ccx, 'tcx, 'header> {
             Type::Slice(ref s) => {
                 let ptr_ty = match s {
                     hir::Slice::Str(_, hir::StringEncoding::UnvalidatedUtf8) => "char".into(),
-                    // TODO(#240): Implement UTF-16
-                    hir::Slice::Str(_, hir::StringEncoding::UnvalidatedUtf16) => "uint16_t".into(),
+                    hir::Slice::Str(_, hir::StringEncoding::UnvalidatedUtf16) => "wchar_t".into(),
                     hir::Slice::Primitive(_, prim) => self.cx.formatter.fmt_primitive_as_c(*prim),
                     &_ => unreachable!("unknown AST/HIR variant"),
                 };

diff --git a/tool/src/cpp2/formatter.rs b/tool/src/cpp2/formatter.rs
@@ -123,6 +123,7 @@ impl<'tcx> Cpp2Formatter<'tcx> {
         ident: &'a str,
         mutability: hir::Mutability,
     ) -> Cow<'a, str> {
+        // TODO: This needs to change if an abstraction other than std::span is used
         // TODO: Where is the right place to put `const` here?
         if mutability.is_mutable() {
             format!("diplomat::span<{ident}>").into()
@@ -131,10 +132,16 @@ impl<'tcx> Cpp2Formatter<'tcx> {
         }
     }
 
-    pub fn fmt_borrowed_str(&self) -> Cow<'static, str> {
+    pub fn fmt_borrowed_utf8_str(&self) -> Cow<'static, str> {
+        // TODO: This needs to change if an abstraction other than std::u8string_view is used
         "std::string_view".into()
     }
 
+    pub fn fmt_borrowed_utf16_str(&self) -> Cow<'static, str> {
+        // TODO: This needs to change if an abstraction other than std::u16string_view is used
+        "std::wstring_view".into()
+    }
+
     pub fn fmt_owned_str(&self) -> Cow<'static, str> {
         "std::string".into()
     }