diff --git a/lib/common/rust/api/asar_api.dart b/lib/common/rust/api/asar_api.dart index aefc7bb..f982158 100644 --- a/lib/common/rust/api/asar_api.dart +++ b/lib/common/rust/api/asar_api.dart @@ -1,5 +1,5 @@ // This file is automatically generated, so please do not edit it. -// Generated by `flutter_rust_bridge`@ 2.0.0-dev.35. +// Generated by `flutter_rust_bridge`@ 2.0.0-dev.36. // ignore_for_file: invalid_use_of_internal_member, unused_import, unnecessary_import diff --git a/lib/common/rust/api/http_api.dart b/lib/common/rust/api/http_api.dart index 5efb1be..43c8ef4 100644 --- a/lib/common/rust/api/http_api.dart +++ b/lib/common/rust/api/http_api.dart @@ -1,5 +1,5 @@ // This file is automatically generated, so please do not edit it. -// Generated by `flutter_rust_bridge`@ 2.0.0-dev.35. +// Generated by `flutter_rust_bridge`@ 2.0.0-dev.36. // ignore_for_file: invalid_use_of_internal_member, unused_import, unnecessary_import diff --git a/lib/common/rust/api/rs_process.dart b/lib/common/rust/api/rs_process.dart index 73c88ba..7b3d51e 100644 --- a/lib/common/rust/api/rs_process.dart +++ b/lib/common/rust/api/rs_process.dart @@ -1,5 +1,5 @@ // This file is automatically generated, so please do not edit it. -// Generated by `flutter_rust_bridge`@ 2.0.0-dev.35. +// Generated by `flutter_rust_bridge`@ 2.0.0-dev.36. // ignore_for_file: invalid_use_of_internal_member, unused_import, unnecessary_import diff --git a/lib/common/rust/api/win32_api.dart b/lib/common/rust/api/win32_api.dart index 3678ac4..d1f4d9d 100644 --- a/lib/common/rust/api/win32_api.dart +++ b/lib/common/rust/api/win32_api.dart @@ -1,5 +1,5 @@ // This file is automatically generated, so please do not edit it. -// Generated by `flutter_rust_bridge`@ 2.0.0-dev.35. +// Generated by `flutter_rust_bridge`@ 2.0.0-dev.36. // ignore_for_file: invalid_use_of_internal_member, unused_import, unnecessary_import diff --git a/lib/common/rust/frb_generated.dart b/lib/common/rust/frb_generated.dart index 4d9b1b4..273db39 100644 --- a/lib/common/rust/frb_generated.dart +++ b/lib/common/rust/frb_generated.dart @@ -1,5 +1,5 @@ // This file is automatically generated, so please do not edit it. -// Generated by `flutter_rust_bridge`@ 2.0.0-dev.35. +// Generated by `flutter_rust_bridge`@ 2.0.0-dev.36. // ignore_for_file: unused_import, unused_element, unnecessary_import, duplicate_ignore, invalid_use_of_internal_member, annotate_overrides, non_constant_identifier_names, curly_braces_in_flow_control_structures, prefer_const_literals_to_create_immutables, unused_field @@ -55,7 +55,7 @@ class RustLib extends BaseEntrypoint { kDefaultExternalLibraryLoaderConfig; @override - String get codegenVersion => '2.0.0-dev.35'; + String get codegenVersion => '2.0.0-dev.36'; @override int get rustContentHash => 1832496273; @@ -443,7 +443,7 @@ class RustLibApiImpl extends RustLibApiImplPlatform implements RustLibApi { } @protected - int dco_decode_box_autoadd_u_64(dynamic raw) { + BigInt dco_decode_box_autoadd_u_64(dynamic raw) { // Codec=Dco (DartCObject based), see doc to use other codecs return dco_decode_u_64(raw); } @@ -503,7 +503,7 @@ class RustLibApiImpl extends RustLibApiImplPlatform implements RustLibApi { } @protected - int? dco_decode_opt_box_autoadd_u_64(dynamic raw) { + BigInt? dco_decode_opt_box_autoadd_u_64(dynamic raw) { // Codec=Dco (DartCObject based), see doc to use other codecs return raw == null ? null : dco_decode_box_autoadd_u_64(raw); } @@ -589,9 +589,9 @@ class RustLibApiImpl extends RustLibApiImplPlatform implements RustLibApi { } @protected - int dco_decode_u_64(dynamic raw) { + BigInt dco_decode_u_64(dynamic raw) { // Codec=Dco (DartCObject based), see doc to use other codecs - return dcoDecodeI64OrU64(raw); + return dcoDecodeU64(raw); } @protected @@ -650,7 +650,7 @@ class RustLibApiImpl extends RustLibApiImplPlatform implements RustLibApi { } @protected - int sse_decode_box_autoadd_u_64(SseDeserializer deserializer) { + BigInt sse_decode_box_autoadd_u_64(SseDeserializer deserializer) { // Codec=Sse (Serialization based), see doc to use other codecs return (sse_decode_u_64(deserializer)); } @@ -738,7 +738,7 @@ class RustLibApiImpl extends RustLibApiImplPlatform implements RustLibApi { } @protected - int? sse_decode_opt_box_autoadd_u_64(SseDeserializer deserializer) { + BigInt? sse_decode_opt_box_autoadd_u_64(SseDeserializer deserializer) { // Codec=Sse (Serialization based), see doc to use other codecs if (sse_decode_bool(deserializer)) { @@ -833,9 +833,9 @@ class RustLibApiImpl extends RustLibApiImplPlatform implements RustLibApi { } @protected - int sse_decode_u_64(SseDeserializer deserializer) { + BigInt sse_decode_u_64(SseDeserializer deserializer) { // Codec=Sse (Serialization based), see doc to use other codecs - return deserializer.buffer.getUint64(); + return deserializer.buffer.getBigUint64(); } @protected @@ -950,7 +950,7 @@ class RustLibApiImpl extends RustLibApiImplPlatform implements RustLibApi { } @protected - void sse_encode_box_autoadd_u_64(int self, SseSerializer serializer) { + void sse_encode_box_autoadd_u_64(BigInt self, SseSerializer serializer) { // Codec=Sse (Serialization based), see doc to use other codecs sse_encode_u_64(self, serializer); } @@ -1032,7 +1032,7 @@ class RustLibApiImpl extends RustLibApiImplPlatform implements RustLibApi { } @protected - void sse_encode_opt_box_autoadd_u_64(int? self, SseSerializer serializer) { + void sse_encode_opt_box_autoadd_u_64(BigInt? self, SseSerializer serializer) { // Codec=Sse (Serialization based), see doc to use other codecs sse_encode_bool(self != null, serializer); @@ -1111,9 +1111,9 @@ class RustLibApiImpl extends RustLibApiImplPlatform implements RustLibApi { } @protected - void sse_encode_u_64(int self, SseSerializer serializer) { + void sse_encode_u_64(BigInt self, SseSerializer serializer) { // Codec=Sse (Serialization based), see doc to use other codecs - serializer.buffer.putUint64(self); + serializer.buffer.putBigUint64(self); } @protected diff --git a/lib/common/rust/frb_generated.io.dart b/lib/common/rust/frb_generated.io.dart index 86926ad..51f09af 100644 --- a/lib/common/rust/frb_generated.io.dart +++ b/lib/common/rust/frb_generated.io.dart @@ -1,5 +1,5 @@ // This file is automatically generated, so please do not edit it. -// Generated by `flutter_rust_bridge`@ 2.0.0-dev.35. +// Generated by `flutter_rust_bridge`@ 2.0.0-dev.36. // ignore_for_file: unused_import, unused_element, unnecessary_import, duplicate_ignore, invalid_use_of_internal_member, annotate_overrides, non_constant_identifier_names, curly_braces_in_flow_control_structures, prefer_const_literals_to_create_immutables, unused_field @@ -43,7 +43,7 @@ abstract class RustLibApiImplPlatform extends BaseApiImpl { dynamic raw); @protected - int dco_decode_box_autoadd_u_64(dynamic raw); + BigInt dco_decode_box_autoadd_u_64(dynamic raw); @protected int dco_decode_i_32(dynamic raw); @@ -73,7 +73,7 @@ abstract class RustLibApiImplPlatform extends BaseApiImpl { String? dco_decode_opt_String(dynamic raw); @protected - int? dco_decode_opt_box_autoadd_u_64(dynamic raw); + BigInt? dco_decode_opt_box_autoadd_u_64(dynamic raw); @protected Uint8List? dco_decode_opt_list_prim_u_8_strict(dynamic raw); @@ -100,7 +100,7 @@ abstract class RustLibApiImplPlatform extends BaseApiImpl { int dco_decode_u_32(dynamic raw); @protected - int dco_decode_u_64(dynamic raw); + BigInt dco_decode_u_64(dynamic raw); @protected int dco_decode_u_8(dynamic raw); @@ -131,7 +131,7 @@ abstract class RustLibApiImplPlatform extends BaseApiImpl { SseDeserializer deserializer); @protected - int sse_decode_box_autoadd_u_64(SseDeserializer deserializer); + BigInt sse_decode_box_autoadd_u_64(SseDeserializer deserializer); @protected int sse_decode_i_32(SseDeserializer deserializer); @@ -163,7 +163,7 @@ abstract class RustLibApiImplPlatform extends BaseApiImpl { String? sse_decode_opt_String(SseDeserializer deserializer); @protected - int? sse_decode_opt_box_autoadd_u_64(SseDeserializer deserializer); + BigInt? sse_decode_opt_box_autoadd_u_64(SseDeserializer deserializer); @protected Uint8List? sse_decode_opt_list_prim_u_8_strict(SseDeserializer deserializer); @@ -194,7 +194,7 @@ abstract class RustLibApiImplPlatform extends BaseApiImpl { int sse_decode_u_32(SseDeserializer deserializer); @protected - int sse_decode_u_64(SseDeserializer deserializer); + BigInt sse_decode_u_64(SseDeserializer deserializer); @protected int sse_decode_u_8(SseDeserializer deserializer); @@ -244,7 +244,7 @@ abstract class RustLibApiImplPlatform extends BaseApiImpl { } @protected - ffi.Pointer cst_encode_box_autoadd_u_64(int raw) { + ffi.Pointer cst_encode_box_autoadd_u_64(BigInt raw) { // Codec=Cst (C-struct based), see doc to use other codecs return wire.cst_new_box_autoadd_u_64(cst_encode_u_64(raw)); } @@ -303,7 +303,7 @@ abstract class RustLibApiImplPlatform extends BaseApiImpl { } @protected - ffi.Pointer cst_encode_opt_box_autoadd_u_64(int? raw) { + ffi.Pointer cst_encode_opt_box_autoadd_u_64(BigInt? raw) { // Codec=Cst (C-struct based), see doc to use other codecs return raw == null ? ffi.nullptr : cst_encode_box_autoadd_u_64(raw); } @@ -316,9 +316,9 @@ abstract class RustLibApiImplPlatform extends BaseApiImpl { } @protected - int cst_encode_u_64(int raw) { + int cst_encode_u_64(BigInt raw) { // Codec=Cst (C-struct based), see doc to use other codecs - return raw.toInt(); + return raw.toSigned(64).toInt(); } @protected @@ -415,7 +415,7 @@ abstract class RustLibApiImplPlatform extends BaseApiImpl { RsiLauncherAsarData self, SseSerializer serializer); @protected - void sse_encode_box_autoadd_u_64(int self, SseSerializer serializer); + void sse_encode_box_autoadd_u_64(BigInt self, SseSerializer serializer); @protected void sse_encode_i_32(int self, SseSerializer serializer); @@ -448,7 +448,7 @@ abstract class RustLibApiImplPlatform extends BaseApiImpl { void sse_encode_opt_String(String? self, SseSerializer serializer); @protected - void sse_encode_opt_box_autoadd_u_64(int? self, SseSerializer serializer); + void sse_encode_opt_box_autoadd_u_64(BigInt? self, SseSerializer serializer); @protected void sse_encode_opt_list_prim_u_8_strict( @@ -481,7 +481,7 @@ abstract class RustLibApiImplPlatform extends BaseApiImpl { void sse_encode_u_32(int self, SseSerializer serializer); @protected - void sse_encode_u_64(int self, SseSerializer serializer); + void sse_encode_u_64(BigInt self, SseSerializer serializer); @protected void sse_encode_u_8(int self, SseSerializer serializer); diff --git a/lib/common/rust/http_package.dart b/lib/common/rust/http_package.dart index c737fdb..a8fa5e9 100644 --- a/lib/common/rust/http_package.dart +++ b/lib/common/rust/http_package.dart @@ -1,5 +1,5 @@ // This file is automatically generated, so please do not edit it. -// Generated by `flutter_rust_bridge`@ 2.0.0-dev.35. +// Generated by `flutter_rust_bridge`@ 2.0.0-dev.36. // ignore_for_file: invalid_use_of_internal_member, unused_import, unnecessary_import @@ -20,7 +20,7 @@ class RustHttpResponse { final int statusCode; final Map headers; final String url; - final int? contentLength; + final BigInt? contentLength; final MyHttpVersion version; final String remoteAddr; final Uint8List? data; diff --git a/pubspec.yaml b/pubspec.yaml index b21d6d1..3e5659a 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -42,7 +42,7 @@ dependencies: flutter_tilt: ^3.0.0 card_swiper: ^3.0.1 ffi: ^2.1.0 - flutter_rust_bridge: ^2.0.0-dev.35 + flutter_rust_bridge: ^2.0.0-dev.36 freezed_annotation: ^2.4.1 meta: ^1.9.1 hexcolor: ^3.0.1 diff --git a/rust/src/api/rs_process.rs b/rust/src/api/rs_process.rs index 5b2f006..221add2 100644 --- a/rust/src/api/rs_process.rs +++ b/rust/src/api/rs_process.rs @@ -1,5 +1,6 @@ use std::collections::HashMap; use std::sync::Arc; +use flutter_rust_bridge::frb; use futures::executor::block_on; use once_cell::sync::Lazy; use scopeguard::defer; @@ -24,6 +25,7 @@ pub struct RsProcessStreamData { pub rs_pid: u32, } +#[frb(non_opaque)] pub struct RsProcess { pub child_stdin: ChildStdin, pub rs_pid: u32, diff --git a/rust/src/frb_generated.io.rs b/rust/src/frb_generated.io.rs index f731a1f..49c67fc 100644 --- a/rust/src/frb_generated.io.rs +++ b/rust/src/frb_generated.io.rs @@ -1,5 +1,5 @@ // This file is automatically generated, so please do not edit it. -// Generated by `flutter_rust_bridge`@ 2.0.0-dev.35. +// Generated by `flutter_rust_bridge`@ 2.0.0-dev.36. // Section: imports diff --git a/rust/src/frb_generated.rs b/rust/src/frb_generated.rs index 8ece42b..5232ee6 100644 --- a/rust/src/frb_generated.rs +++ b/rust/src/frb_generated.rs @@ -1,5 +1,5 @@ // This file is automatically generated, so please do not edit it. -// Generated by `flutter_rust_bridge`@ 2.0.0-dev.35. +// Generated by `flutter_rust_bridge`@ 2.0.0-dev.36. #![allow( non_camel_case_types, @@ -15,6 +15,7 @@ clippy::let_and_return, clippy::too_many_arguments, clippy::match_single_binding, + clippy::clone_on_copy, clippy::let_unit_value )] @@ -31,7 +32,7 @@ flutter_rust_bridge::frb_generated_boilerplate!( default_rust_opaque = RustOpaqueNom, default_rust_auto_opaque = RustAutoOpaqueNom, ); -pub(crate) const FLUTTER_RUST_BRIDGE_CODEGEN_VERSION: &str = "2.0.0-dev.35"; +pub(crate) const FLUTTER_RUST_BRIDGE_CODEGEN_VERSION: &str = "2.0.0-dev.36"; pub(crate) const FLUTTER_RUST_BRIDGE_CODEGEN_CONTENT_HASH: i32 = 1832496273; // Section: executor @@ -397,7 +398,7 @@ impl SseDecode for flutter_rust_bridge::for_generated::anyhow::Error { // 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 = ::sse_decode(deserializer); - return anyhow::anyhow!("{}", inner); + return flutter_rust_bridge::for_generated::anyhow::anyhow!("{}", inner); } }