Merge pull request #1666 from fzyzcjy/feat/11752

Make LLVM dependency optional

Author: fzyzcjy

.github/workflows/ci.yaml

@@ -181,6 +181,7 @@ jobs:
         package:
           - frb_example--dart_minimal
           - frb_example--pure_dart
+          - frb_example--pure_dart_pde
           - frb_example--deliberate_bad
           - frb_example--flutter_via_create
           - frb_example--flutter_via_integrate
@@ -530,6 +531,7 @@ jobs:
           - tools--frb_internal
           - frb_example--dart_minimal
           - frb_example--pure_dart
+          - frb_example--pure_dart_pde
           - frb_example--deliberate_bad
         exclude:
           - {image: windows-2019, package: frb_utils}
@@ -576,6 +578,7 @@ jobs:
           - frb_dart
           - frb_example--dart_minimal
           - frb_example--pure_dart
+          - frb_example--pure_dart_pde
           # no need for `frb_example--deliberate_bad`
 
     steps:
@@ -625,6 +628,7 @@ jobs:
         package:
           - frb_example--dart_minimal
           - frb_example--pure_dart
+          - frb_example--pure_dart_pde
           # no `frb_example--deliberate_bad`
 
     steps:
@@ -664,6 +668,7 @@ jobs:
         package:
           - frb_example--dart_minimal
           - frb_example--pure_dart
+          - frb_example--pure_dart_pde
           - frb_example--deliberate_bad
 
     steps:

CHANGELOG.md

@@ -6,6 +6,7 @@
 * Fix module parsing when two modules have the same name #1664 (thanks @alanlzhang)
 * Fix integrate command's default template has rust_lib hardcoded instead of custom names #1669
 * Support `Vec<Vec<u8>>` for CST/DCO codec (SSE codec already supports it) #1663
+* Make LLVM dependency optional #1666
 * Add checks of versions #1667
 
 ## 2.0.0-dev.19

Cargo.toml

@@ -13,6 +13,7 @@ exclude = [
   "frb_example/flutter_via_integrate/rust",
   "frb_example/gallery/rust",
   "frb_example/pure_dart/rust",
+  "frb_example/pure_dart_pde/rust",
 ]
 resolver = "2"
 

frb_codegen/assets/integration_template/REPLACE_ME_RUST_CRATE_DIR/src/frb_generated.io.rs

@@ -8,75 +8,6 @@ use flutter_rust_bridge::for_generated::byteorder::{NativeEndian, ReadBytesExt,
 use flutter_rust_bridge::for_generated::transform_result_dco;
 use flutter_rust_bridge::{Handler, IntoIntoDart};
 
-// Section: dart2rust
+// Section: boilerplate
 
-impl CstDecode<String> for *mut wire_cst_list_prim_u_8_strict {
-    fn cst_decode(self) -> String {
-        let vec: Vec<u8> = self.cst_decode();
-        String::from_utf8(vec).unwrap()
-    }
-}
-impl CstDecode<Vec<u8>> for *mut wire_cst_list_prim_u_8_strict {
-    fn cst_decode(self) -> Vec<u8> {
-        unsafe {
-            let wrap = flutter_rust_bridge::for_generated::box_from_leak_ptr(self);
-            flutter_rust_bridge::for_generated::vec_from_leak_ptr(wrap.ptr, wrap.len)
-        }
-    }
-}
-pub trait NewWithNullPtr {
-    fn new_with_null_ptr() -> Self;
-}
-
-impl<T> NewWithNullPtr for *mut T {
-    fn new_with_null_ptr() -> Self {
-        std::ptr::null_mut()
-    }
-}
-
-#[no_mangle]
-pub extern "C" fn frbgen_REPLACE_ME_DART_PACKAGE_NAME_dart_fn_deliver_output(
-    call_id: i32,
-    ptr_: *mut u8,
-    rust_vec_len_: i32,
-    data_len_: i32,
-) {
-    let message = unsafe {
-        flutter_rust_bridge::for_generated::Dart2RustMessageSse::from_wire(
-            ptr_,
-            rust_vec_len_,
-            data_len_,
-        )
-    };
-    FLUTTER_RUST_BRIDGE_HANDLER.dart_fn_handle_output(call_id, message)
-}
-
-#[no_mangle]
-pub extern "C" fn frbgen_REPLACE_ME_DART_PACKAGE_NAME_wire_greet(
-    name: *mut wire_cst_list_prim_u_8_strict,
-) -> flutter_rust_bridge::for_generated::WireSyncRust2DartDco {
-    wire_greet_impl(name)
-}
-
-#[no_mangle]
-pub extern "C" fn frbgen_REPLACE_ME_DART_PACKAGE_NAME_wire_init_app(port_: i64) {
-    wire_init_app_impl(port_)
-}
-
-#[no_mangle]
-pub extern "C" fn frbgen_REPLACE_ME_DART_PACKAGE_NAME_cst_new_list_prim_u_8_strict(
-    len: i32,
-) -> *mut wire_cst_list_prim_u_8_strict {
-    let ans = wire_cst_list_prim_u_8_strict {
-        ptr: flutter_rust_bridge::for_generated::new_leak_vec_ptr(Default::default(), len),
-        len,
-    };
-    flutter_rust_bridge::for_generated::new_leak_box_ptr(ans)
-}
-
-#[repr(C)]
-#[derive(Clone, Copy)]
-pub struct wire_cst_list_prim_u_8_strict {
-    ptr: *mut u8,
-    len: i32,
-}
+flutter_rust_bridge::frb_generated_boilerplate_io!();

frb_codegen/assets/integration_template/REPLACE_ME_RUST_CRATE_DIR/src/frb_generated.rs

@@ -13,7 +13,8 @@
     clippy::unused_unit,
     clippy::double_parens,
     clippy::let_and_return,
-    clippy::too_many_arguments
+    clippy::too_many_arguments,
+    clippy::match_single_binding
 )]
 
 // Section: imports
@@ -24,7 +25,10 @@ use flutter_rust_bridge::{Handler, IntoIntoDart};
 
 // Section: boilerplate
 
-flutter_rust_bridge::frb_generated_boilerplate!();
+flutter_rust_bridge::frb_generated_boilerplate!(
+    default_stream_sink_codec = SseCodec,
+    default_rust_opaque = RustOpaqueMoi
+);
 const FLUTTER_RUST_BRIDGE_CODEGEN_VERSION: &str = "REPLACE_ME_FRB_VERSION";
 
 // Section: executor
@@ -34,32 +38,59 @@ flutter_rust_bridge::frb_generated_default_handler!();
 // Section: wire_funcs
 
 fn wire_greet_impl(
-    name: impl CstDecode<String>,
-) -> flutter_rust_bridge::for_generated::WireSyncRust2DartDco {
-    FLUTTER_RUST_BRIDGE_HANDLER.wrap_sync::<flutter_rust_bridge::for_generated::DcoCodec, _>(
+    ptr_: flutter_rust_bridge::for_generated::PlatformGeneralizedUint8ListPtr,
+    rust_vec_len_: i32,
+    data_len_: i32,
+) -> flutter_rust_bridge::for_generated::WireSyncRust2DartSse {
+    FLUTTER_RUST_BRIDGE_HANDLER.wrap_sync::<flutter_rust_bridge::for_generated::SseCodec, _>(
         flutter_rust_bridge::for_generated::TaskInfo {
             debug_name: "greet",
             port: None,
             mode: flutter_rust_bridge::for_generated::FfiCallMode::Sync,
         },
         move || {
-            let api_name = name.cst_decode();
-            transform_result_dco((move || {
+            let message = unsafe {
+                flutter_rust_bridge::for_generated::Dart2RustMessageSse::from_wire(
+                    ptr_,
+                    rust_vec_len_,
+                    data_len_,
+                )
+            };
+            let mut deserializer =
+                flutter_rust_bridge::for_generated::SseDeserializer::new(message);
+            let api_name = <String>::sse_decode(&mut deserializer);
+            deserializer.end();
+            transform_result_sse((move || {
                 Result::<_, ()>::Ok(crate::api::simple::greet(api_name))
             })())
         },
     )
 }
-fn wire_init_app_impl(port_: flutter_rust_bridge::for_generated::MessagePort) {
-    FLUTTER_RUST_BRIDGE_HANDLER.wrap_normal::<flutter_rust_bridge::for_generated::DcoCodec, _, _>(
+fn wire_init_app_impl(
+    port_: flutter_rust_bridge::for_generated::MessagePort,
+    ptr_: flutter_rust_bridge::for_generated::PlatformGeneralizedUint8ListPtr,
+    rust_vec_len_: i32,
+    data_len_: i32,
+) {
+    FLUTTER_RUST_BRIDGE_HANDLER.wrap_normal::<flutter_rust_bridge::for_generated::SseCodec, _, _>(
         flutter_rust_bridge::for_generated::TaskInfo {
             debug_name: "init_app",
             port: Some(port_),
             mode: flutter_rust_bridge::for_generated::FfiCallMode::Normal,
         },
         move || {
+            let message = unsafe {
+                flutter_rust_bridge::for_generated::Dart2RustMessageSse::from_wire(
+                    ptr_,
+                    rust_vec_len_,
+                    data_len_,
+                )
+            };
+            let mut deserializer =
+                flutter_rust_bridge::for_generated::SseDeserializer::new(message);
+            deserializer.end();
             move |context| {
-                transform_result_dco(
+                transform_result_sse(
                     (move || Result::<_, ()>::Ok(crate::api::simple::init_app()))(),
                 )
             }
@@ -69,19 +100,16 @@ fn wire_init_app_impl(port_: flutter_rust_bridge::for_generated::MessagePort) {
 
 // Section: dart2rust
 
-impl CstDecode<u8> for u8 {
-    fn cst_decode(self) -> u8 {
-        self
-    }
-}
 impl SseDecode for String {
+    // Codec=Sse (Serialization based), see doc to use other codecs
     fn sse_decode(deserializer: &mut flutter_rust_bridge::for_generated::SseDeserializer) -> Self {
         let mut inner = <Vec<u8>>::sse_decode(deserializer);
         return String::from_utf8(inner).unwrap();
     }
 }
 
 impl SseDecode for Vec<u8> {
+    // Codec=Sse (Serialization based), see doc to use other codecs
     fn sse_decode(deserializer: &mut flutter_rust_bridge::for_generated::SseDeserializer) -> Self {
         let mut len_ = <i32>::sse_decode(deserializer);
         let mut ans_ = vec![];
@@ -93,36 +121,67 @@ impl SseDecode for Vec<u8> {
 }
 
 impl SseDecode for u8 {
+    // Codec=Sse (Serialization based), see doc to use other codecs
     fn sse_decode(deserializer: &mut flutter_rust_bridge::for_generated::SseDeserializer) -> Self {
         deserializer.cursor.read_u8().unwrap()
     }
 }
 
 impl SseDecode for () {
+    // Codec=Sse (Serialization based), see doc to use other codecs
     fn sse_decode(deserializer: &mut flutter_rust_bridge::for_generated::SseDeserializer) -> Self {}
 }
 
 impl SseDecode for i32 {
+    // Codec=Sse (Serialization based), see doc to use other codecs
     fn sse_decode(deserializer: &mut flutter_rust_bridge::for_generated::SseDeserializer) -> Self {
         deserializer.cursor.read_i32::<NativeEndian>().unwrap()
     }
 }
 
 impl SseDecode for bool {
+    // Codec=Sse (Serialization based), see doc to use other codecs
     fn sse_decode(deserializer: &mut flutter_rust_bridge::for_generated::SseDeserializer) -> Self {
         deserializer.cursor.read_u8().unwrap() != 0
     }
 }
 
+fn pde_ffi_dispatcher_primary_impl(
+    func_id: i32,
+    port: flutter_rust_bridge::for_generated::MessagePort,
+    ptr: flutter_rust_bridge::for_generated::PlatformGeneralizedUint8ListPtr,
+    rust_vec_len: i32,
+    data_len: i32,
+) {
+    match func_id {
+        2 => wire_init_app_impl(port, ptr, rust_vec_len, data_len),
+        _ => unreachable!(),
+    }
+}
+
+fn pde_ffi_dispatcher_sync_impl(
+    func_id: i32,
+    ptr: flutter_rust_bridge::for_generated::PlatformGeneralizedUint8ListPtr,
+    rust_vec_len: i32,
+    data_len: i32,
+) -> flutter_rust_bridge::for_generated::WireSyncRust2DartSse {
+    match func_id {
+        1 => wire_greet_impl(ptr, rust_vec_len, data_len),
+        _ => unreachable!(),
+    }
+}
+
 // Section: rust2dart
 
 impl SseEncode for String {
+    // Codec=Sse (Serialization based), see doc to use other codecs
     fn sse_encode(self, serializer: &mut flutter_rust_bridge::for_generated::SseSerializer) {
         <Vec<u8>>::sse_encode(self.into_bytes(), serializer);
     }
 }
 
 impl SseEncode for Vec<u8> {
+    // Codec=Sse (Serialization based), see doc to use other codecs
     fn sse_encode(self, serializer: &mut flutter_rust_bridge::for_generated::SseSerializer) {
         <i32>::sse_encode(self.len() as _, serializer);
         for item in self {
@@ -132,22 +191,26 @@ impl SseEncode for Vec<u8> {
 }
 
 impl SseEncode for u8 {
+    // Codec=Sse (Serialization based), see doc to use other codecs
     fn sse_encode(self, serializer: &mut flutter_rust_bridge::for_generated::SseSerializer) {
         serializer.cursor.write_u8(self).unwrap();
     }
 }
 
 impl SseEncode for () {
+    // Codec=Sse (Serialization based), see doc to use other codecs
     fn sse_encode(self, serializer: &mut flutter_rust_bridge::for_generated::SseSerializer) {}
 }
 
 impl SseEncode for i32 {
+    // Codec=Sse (Serialization based), see doc to use other codecs
     fn sse_encode(self, serializer: &mut flutter_rust_bridge::for_generated::SseSerializer) {
         serializer.cursor.write_i32::<NativeEndian>(self).unwrap();
     }
 }
 
 impl SseEncode for bool {
+    // Codec=Sse (Serialization based), see doc to use other codecs
     fn sse_encode(self, serializer: &mut flutter_rust_bridge::for_generated::SseSerializer) {
         serializer.cursor.write_u8(self as _).unwrap();
     }