Merge branch 'master' into feat/12137

fzyzcjy · Jun 3, 2024 · 5e9241b · 5e9241b
2 parents 2748944 + e606b91
commit 5e9241b
Show file tree

Hide file tree

Showing 13 changed files with 41 additions and 21 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -28,7 +28,7 @@ keywords = ["flutter", "dart", "ffi", "code-generation", "bindings"]
 categories = ["development-tools::ffi"]
 
 [workspace.dependencies]
-allo-isolate = { version = "0.1.24", features = ["anyhow"] }
+allo-isolate = { version = "0.1.25", features = ["anyhow"] }
 #allo-isolate = { git = "https://github.com/shekohex/allo-isolate", features = ["anyhow"] }
 anyhow = "1.0.64"
 chrono = "0.4.23"

diff --git a/frb_codegen/assets/integration_template/REPLACE_ME_RUST_CRATE_DIR/Cargo.lock.template b/frb_codegen/assets/integration_template/REPLACE_ME_RUST_CRATE_DIR/Cargo.lock.template
diff --git a/frb_codegen/src/library/codegen/generator/acc.rs b/frb_codegen/src/library/codegen/generator/acc.rs
@@ -70,6 +70,17 @@ impl<T> Acc<T> {
         }
     }
 
+    pub fn new_io_web(value: T) -> Acc<T>
+    where
+        T: Default + Clone,
+    {
+        Acc {
+            io: value.clone(),
+            web: value,
+            ..Default::default()
+        }
+    }
+
     pub fn new_common(common: T) -> Acc<T>
     where
         T: Default,

diff --git a/...library/codegen/generator/wire/dart/spec_generator/codec/cst/encoder/ty/primitive_list.rs b/...library/codegen/generator/wire/dart/spec_generator/codec/cst/encoder/ty/primitive_list.rs
@@ -9,6 +9,15 @@ use crate::library::codegen::generator::api_dart::spec_generator::info::ApiDartG
 
 impl<'a> WireDartCodecCstGeneratorEncoderTrait for PrimitiveListWireDartCodecCstGenerator<'a> {
     fn generate_encode_func_body(&self) -> Acc<Option<String>> {
+        if matches!(
+            self.mir.primitive,
+            MirTypePrimitive::Isize | MirTypePrimitive::Usize
+        ) {
+            return Acc::new_io_web(Some(
+                "throw UnimplementedError('Not implemented in this codec');".to_owned(),
+            ));
+        }
+
         Acc {
             // NOTE Dart code *only* allocates memory. It never *release* memory by itself.
             // Instead, Rust receives that pointer and now it is in control of Rust.

diff --git a/frb_example/dart_build_rs/rust/Cargo.lock b/frb_example/dart_build_rs/rust/Cargo.lock
diff --git a/frb_example/dart_minimal/rust/Cargo.lock b/frb_example/dart_minimal/rust/Cargo.lock
diff --git a/frb_example/deliberate_bad/rust/Cargo.lock b/frb_example/deliberate_bad/rust/Cargo.lock
diff --git a/frb_example/flutter_via_create/rust/Cargo.lock b/frb_example/flutter_via_create/rust/Cargo.lock
diff --git a/frb_example/flutter_via_integrate/rust/Cargo.lock b/frb_example/flutter_via_integrate/rust/Cargo.lock
diff --git a/frb_example/gallery/rust/Cargo.lock b/frb_example/gallery/rust/Cargo.lock
diff --git a/frb_example/pure_dart/rust/Cargo.lock b/frb_example/pure_dart/rust/Cargo.lock
diff --git a/frb_example/pure_dart_pde/rust/Cargo.lock b/frb_example/pure_dart_pde/rust/Cargo.lock