diff --git a/bindings/dart/lib/src/rust/api/connection.dart b/bindings/dart/lib/src/rust/api/connection.dart index 8f80aaa80..527d76cdd 100644 --- a/bindings/dart/lib/src/rust/api/connection.dart +++ b/bindings/dart/lib/src/rust/api/connection.dart @@ -19,10 +19,8 @@ abstract class RustConnection implements RustOpaqueInterface { // HINT: Make it `#[frb(sync)]` to let it become the default constructor of Dart class. static Future newInstance({ required WrapperArcConnection connection, - required WrapperArcDatabase database, }) => RustLib.instance.api.crateApiConnectionRustConnectionNew( connection: connection, - database: database, ); Future prepare({required String sql}); diff --git a/bindings/dart/lib/src/rust/frb_generated.dart b/bindings/dart/lib/src/rust/frb_generated.dart index fb3c76400..b14b38819 100644 --- a/bindings/dart/lib/src/rust/frb_generated.dart +++ b/bindings/dart/lib/src/rust/frb_generated.dart @@ -90,7 +90,6 @@ abstract class RustLibApi extends BaseApi { Future crateApiConnectionRustConnectionNew({ required WrapperArcConnection connection, - required WrapperArcDatabase database, }); Future crateApiConnectionRustConnectionPrepare({ @@ -154,15 +153,6 @@ abstract class RustLibApi extends BaseApi { CrossPlatformFinalizerArg get rust_arc_decrement_strong_count_WrapperArcConnectionPtr; - RustArcIncrementStrongCountFnType - get rust_arc_increment_strong_count_WrapperArcDatabase; - - RustArcDecrementStrongCountFnType - get rust_arc_decrement_strong_count_WrapperArcDatabase; - - CrossPlatformFinalizerArg - get rust_arc_decrement_strong_count_WrapperArcDatabasePtr; - RustArcIncrementStrongCountFnType get rust_arc_increment_strong_count_WrapperStatement; @@ -224,7 +214,6 @@ class RustLibApiImpl extends RustLibApiImplPlatform implements RustLibApi { @override Future crateApiConnectionRustConnectionNew({ required WrapperArcConnection connection, - required WrapperArcDatabase database, }) { return handler.executeNormal( NormalTask( @@ -234,10 +223,6 @@ class RustLibApiImpl extends RustLibApiImplPlatform implements RustLibApi { connection, serializer, ); - sse_encode_Auto_Owned_RustOpaque_flutter_rust_bridgefor_generatedRustAutoOpaqueInnerWrapperArcDatabase( - database, - serializer, - ); pdeCallFfi( generalizedFrbRustBinding, serializer, @@ -251,7 +236,7 @@ class RustLibApiImpl extends RustLibApiImplPlatform implements RustLibApi { decodeErrorData: null, ), constMeta: kCrateApiConnectionRustConnectionNewConstMeta, - argValues: [connection, database], + argValues: [connection], apiImpl: this, ), ); @@ -260,7 +245,7 @@ class RustLibApiImpl extends RustLibApiImplPlatform implements RustLibApi { TaskConstMeta get kCrateApiConnectionRustConnectionNewConstMeta => const TaskConstMeta( debugName: "RustConnection_new", - argNames: ["connection", "database"], + argNames: ["connection"], ); @override @@ -573,14 +558,6 @@ class RustLibApiImpl extends RustLibApiImplPlatform implements RustLibApi { get rust_arc_decrement_strong_count_WrapperArcConnection => wire .rust_arc_decrement_strong_count_RustOpaque_flutter_rust_bridgefor_generatedRustAutoOpaqueInnerWrapperArcConnection; - RustArcIncrementStrongCountFnType - get rust_arc_increment_strong_count_WrapperArcDatabase => wire - .rust_arc_increment_strong_count_RustOpaque_flutter_rust_bridgefor_generatedRustAutoOpaqueInnerWrapperArcDatabase; - - RustArcDecrementStrongCountFnType - get rust_arc_decrement_strong_count_WrapperArcDatabase => wire - .rust_arc_decrement_strong_count_RustOpaque_flutter_rust_bridgefor_generatedRustAutoOpaqueInnerWrapperArcDatabase; - RustArcIncrementStrongCountFnType get rust_arc_increment_strong_count_WrapperStatement => wire .rust_arc_increment_strong_count_RustOpaque_flutter_rust_bridgefor_generatedRustAutoOpaqueInnerWrapperStatement; @@ -616,15 +593,6 @@ class RustLibApiImpl extends RustLibApiImplPlatform implements RustLibApi { return WrapperArcConnectionImpl.frbInternalDcoDecode(raw as List); } - @protected - WrapperArcDatabase - dco_decode_Auto_Owned_RustOpaque_flutter_rust_bridgefor_generatedRustAutoOpaqueInnerWrapperArcDatabase( - dynamic raw, - ) { - // Codec=Dco (DartCObject based), see doc to use other codecs - return WrapperArcDatabaseImpl.frbInternalDcoDecode(raw as List); - } - @protected WrapperStatement dco_decode_Auto_Owned_RustOpaque_flutter_rust_bridgefor_generatedRustAutoOpaqueInnerWrapperStatement( @@ -691,15 +659,6 @@ class RustLibApiImpl extends RustLibApiImplPlatform implements RustLibApi { return WrapperArcConnectionImpl.frbInternalDcoDecode(raw as List); } - @protected - WrapperArcDatabase - dco_decode_RustOpaque_flutter_rust_bridgefor_generatedRustAutoOpaqueInnerWrapperArcDatabase( - dynamic raw, - ) { - // Codec=Dco (DartCObject based), see doc to use other codecs - return WrapperArcDatabaseImpl.frbInternalDcoDecode(raw as List); - } - @protected WrapperStatement dco_decode_RustOpaque_flutter_rust_bridgefor_generatedRustAutoOpaqueInnerWrapperStatement( @@ -1017,18 +976,6 @@ class RustLibApiImpl extends RustLibApiImplPlatform implements RustLibApi { ); } - @protected - WrapperArcDatabase - sse_decode_Auto_Owned_RustOpaque_flutter_rust_bridgefor_generatedRustAutoOpaqueInnerWrapperArcDatabase( - SseDeserializer deserializer, - ) { - // Codec=Sse (Serialization based), see doc to use other codecs - return WrapperArcDatabaseImpl.frbInternalSseDecode( - sse_decode_usize(deserializer), - sse_decode_i_32(deserializer), - ); - } - @protected WrapperStatement sse_decode_Auto_Owned_RustOpaque_flutter_rust_bridgefor_generatedRustAutoOpaqueInnerWrapperStatement( @@ -1110,18 +1057,6 @@ class RustLibApiImpl extends RustLibApiImplPlatform implements RustLibApi { ); } - @protected - WrapperArcDatabase - sse_decode_RustOpaque_flutter_rust_bridgefor_generatedRustAutoOpaqueInnerWrapperArcDatabase( - SseDeserializer deserializer, - ) { - // Codec=Sse (Serialization based), see doc to use other codecs - return WrapperArcDatabaseImpl.frbInternalSseDecode( - sse_decode_usize(deserializer), - sse_decode_i_32(deserializer), - ); - } - @protected WrapperStatement sse_decode_RustOpaque_flutter_rust_bridgefor_generatedRustAutoOpaqueInnerWrapperStatement( @@ -1517,19 +1452,6 @@ class RustLibApiImpl extends RustLibApiImplPlatform implements RustLibApi { ); } - @protected - void - sse_encode_Auto_Owned_RustOpaque_flutter_rust_bridgefor_generatedRustAutoOpaqueInnerWrapperArcDatabase( - WrapperArcDatabase self, - SseSerializer serializer, - ) { - // Codec=Sse (Serialization based), see doc to use other codecs - sse_encode_usize( - (self as WrapperArcDatabaseImpl).frbInternalSseEncode(move: true), - serializer, - ); - } - @protected void sse_encode_Auto_Owned_RustOpaque_flutter_rust_bridgefor_generatedRustAutoOpaqueInnerWrapperStatement( @@ -1620,19 +1542,6 @@ class RustLibApiImpl extends RustLibApiImplPlatform implements RustLibApi { ); } - @protected - void - sse_encode_RustOpaque_flutter_rust_bridgefor_generatedRustAutoOpaqueInnerWrapperArcDatabase( - WrapperArcDatabase self, - SseSerializer serializer, - ) { - // Codec=Sse (Serialization based), see doc to use other codecs - sse_encode_usize( - (self as WrapperArcDatabaseImpl).frbInternalSseEncode(move: null), - serializer, - ); - } - @protected void sse_encode_RustOpaque_flutter_rust_bridgefor_generatedRustAutoOpaqueInnerWrapperStatement( @@ -2053,30 +1962,6 @@ class WrapperArcConnectionImpl extends RustOpaque ); } -@sealed -class WrapperArcDatabaseImpl extends RustOpaque implements WrapperArcDatabase { - // Not to be used by end users - WrapperArcDatabaseImpl.frbInternalDcoDecode(List wire) - : super.frbInternalDcoDecode(wire, _kStaticData); - - // Not to be used by end users - WrapperArcDatabaseImpl.frbInternalSseDecode( - BigInt ptr, - int externalSizeOnNative, - ) : super.frbInternalSseDecode(ptr, externalSizeOnNative, _kStaticData); - - static final _kStaticData = RustArcStaticData( - rustArcIncrementStrongCount: - RustLib.instance.api.rust_arc_increment_strong_count_WrapperArcDatabase, - rustArcDecrementStrongCount: - RustLib.instance.api.rust_arc_decrement_strong_count_WrapperArcDatabase, - rustArcDecrementStrongCountPtr: RustLib - .instance - .api - .rust_arc_decrement_strong_count_WrapperArcDatabasePtr, - ); -} - @sealed class WrapperStatementImpl extends RustOpaque implements WrapperStatement { // Not to be used by end users diff --git a/bindings/dart/lib/src/rust/frb_generated.io.dart b/bindings/dart/lib/src/rust/frb_generated.io.dart index df1b1298a..96aef6b1b 100644 --- a/bindings/dart/lib/src/rust/frb_generated.io.dart +++ b/bindings/dart/lib/src/rust/frb_generated.io.dart @@ -37,10 +37,6 @@ abstract class RustLibApiImplPlatform extends BaseApiImpl { get rust_arc_decrement_strong_count_WrapperArcConnectionPtr => wire ._rust_arc_decrement_strong_count_RustOpaque_flutter_rust_bridgefor_generatedRustAutoOpaqueInnerWrapperArcConnectionPtr; - CrossPlatformFinalizerArg - get rust_arc_decrement_strong_count_WrapperArcDatabasePtr => wire - ._rust_arc_decrement_strong_count_RustOpaque_flutter_rust_bridgefor_generatedRustAutoOpaqueInnerWrapperArcDatabasePtr; - CrossPlatformFinalizerArg get rust_arc_decrement_strong_count_WrapperStatementPtr => wire ._rust_arc_decrement_strong_count_RustOpaque_flutter_rust_bridgefor_generatedRustAutoOpaqueInnerWrapperStatementPtr; @@ -63,12 +59,6 @@ abstract class RustLibApiImplPlatform extends BaseApiImpl { dynamic raw, ); - @protected - WrapperArcDatabase - dco_decode_Auto_Owned_RustOpaque_flutter_rust_bridgefor_generatedRustAutoOpaqueInnerWrapperArcDatabase( - dynamic raw, - ); - @protected WrapperStatement dco_decode_Auto_Owned_RustOpaque_flutter_rust_bridgefor_generatedRustAutoOpaqueInnerWrapperStatement( @@ -108,12 +98,6 @@ abstract class RustLibApiImplPlatform extends BaseApiImpl { dynamic raw, ); - @protected - WrapperArcDatabase - dco_decode_RustOpaque_flutter_rust_bridgefor_generatedRustAutoOpaqueInnerWrapperArcDatabase( - dynamic raw, - ); - @protected WrapperStatement dco_decode_RustOpaque_flutter_rust_bridgefor_generatedRustAutoOpaqueInnerWrapperStatement( @@ -241,12 +225,6 @@ abstract class RustLibApiImplPlatform extends BaseApiImpl { SseDeserializer deserializer, ); - @protected - WrapperArcDatabase - sse_decode_Auto_Owned_RustOpaque_flutter_rust_bridgefor_generatedRustAutoOpaqueInnerWrapperArcDatabase( - SseDeserializer deserializer, - ); - @protected WrapperStatement sse_decode_Auto_Owned_RustOpaque_flutter_rust_bridgefor_generatedRustAutoOpaqueInnerWrapperStatement( @@ -288,12 +266,6 @@ abstract class RustLibApiImplPlatform extends BaseApiImpl { SseDeserializer deserializer, ); - @protected - WrapperArcDatabase - sse_decode_RustOpaque_flutter_rust_bridgefor_generatedRustAutoOpaqueInnerWrapperArcDatabase( - SseDeserializer deserializer, - ); - @protected WrapperStatement sse_decode_RustOpaque_flutter_rust_bridgefor_generatedRustAutoOpaqueInnerWrapperStatement( @@ -430,13 +402,6 @@ abstract class RustLibApiImplPlatform extends BaseApiImpl { SseSerializer serializer, ); - @protected - void - sse_encode_Auto_Owned_RustOpaque_flutter_rust_bridgefor_generatedRustAutoOpaqueInnerWrapperArcDatabase( - WrapperArcDatabase self, - SseSerializer serializer, - ); - @protected void sse_encode_Auto_Owned_RustOpaque_flutter_rust_bridgefor_generatedRustAutoOpaqueInnerWrapperStatement( @@ -485,13 +450,6 @@ abstract class RustLibApiImplPlatform extends BaseApiImpl { SseSerializer serializer, ); - @protected - void - sse_encode_RustOpaque_flutter_rust_bridgefor_generatedRustAutoOpaqueInnerWrapperArcDatabase( - WrapperArcDatabase self, - SseSerializer serializer, - ); - @protected void sse_encode_RustOpaque_flutter_rust_bridgefor_generatedRustAutoOpaqueInnerWrapperStatement( @@ -742,40 +700,6 @@ class RustLibWire implements BaseWire { _rust_arc_decrement_strong_count_RustOpaque_flutter_rust_bridgefor_generatedRustAutoOpaqueInnerWrapperArcConnectionPtr .asFunction)>(); - void - rust_arc_increment_strong_count_RustOpaque_flutter_rust_bridgefor_generatedRustAutoOpaqueInnerWrapperArcDatabase( - ffi.Pointer ptr, - ) { - return _rust_arc_increment_strong_count_RustOpaque_flutter_rust_bridgefor_generatedRustAutoOpaqueInnerWrapperArcDatabase( - ptr, - ); - } - - late final _rust_arc_increment_strong_count_RustOpaque_flutter_rust_bridgefor_generatedRustAutoOpaqueInnerWrapperArcDatabasePtr = - _lookup)>>( - 'frbgen_turso_dart_rust_arc_increment_strong_count_RustOpaque_flutter_rust_bridgefor_generatedRustAutoOpaqueInnerWrapperArcDatabase', - ); - late final _rust_arc_increment_strong_count_RustOpaque_flutter_rust_bridgefor_generatedRustAutoOpaqueInnerWrapperArcDatabase = - _rust_arc_increment_strong_count_RustOpaque_flutter_rust_bridgefor_generatedRustAutoOpaqueInnerWrapperArcDatabasePtr - .asFunction)>(); - - void - rust_arc_decrement_strong_count_RustOpaque_flutter_rust_bridgefor_generatedRustAutoOpaqueInnerWrapperArcDatabase( - ffi.Pointer ptr, - ) { - return _rust_arc_decrement_strong_count_RustOpaque_flutter_rust_bridgefor_generatedRustAutoOpaqueInnerWrapperArcDatabase( - ptr, - ); - } - - late final _rust_arc_decrement_strong_count_RustOpaque_flutter_rust_bridgefor_generatedRustAutoOpaqueInnerWrapperArcDatabasePtr = - _lookup)>>( - 'frbgen_turso_dart_rust_arc_decrement_strong_count_RustOpaque_flutter_rust_bridgefor_generatedRustAutoOpaqueInnerWrapperArcDatabase', - ); - late final _rust_arc_decrement_strong_count_RustOpaque_flutter_rust_bridgefor_generatedRustAutoOpaqueInnerWrapperArcDatabase = - _rust_arc_decrement_strong_count_RustOpaque_flutter_rust_bridgefor_generatedRustAutoOpaqueInnerWrapperArcDatabasePtr - .asFunction)>(); - void rust_arc_increment_strong_count_RustOpaque_flutter_rust_bridgefor_generatedRustAutoOpaqueInnerWrapperStatement( ffi.Pointer ptr, diff --git a/bindings/dart/lib/src/rust/frb_generated.web.dart b/bindings/dart/lib/src/rust/frb_generated.web.dart index 3a0134900..ae4ac6793 100644 --- a/bindings/dart/lib/src/rust/frb_generated.web.dart +++ b/bindings/dart/lib/src/rust/frb_generated.web.dart @@ -39,10 +39,6 @@ abstract class RustLibApiImplPlatform extends BaseApiImpl { get rust_arc_decrement_strong_count_WrapperArcConnectionPtr => wire .rust_arc_decrement_strong_count_RustOpaque_flutter_rust_bridgefor_generatedRustAutoOpaqueInnerWrapperArcConnection; - CrossPlatformFinalizerArg - get rust_arc_decrement_strong_count_WrapperArcDatabasePtr => wire - .rust_arc_decrement_strong_count_RustOpaque_flutter_rust_bridgefor_generatedRustAutoOpaqueInnerWrapperArcDatabase; - CrossPlatformFinalizerArg get rust_arc_decrement_strong_count_WrapperStatementPtr => wire .rust_arc_decrement_strong_count_RustOpaque_flutter_rust_bridgefor_generatedRustAutoOpaqueInnerWrapperStatement; @@ -65,12 +61,6 @@ abstract class RustLibApiImplPlatform extends BaseApiImpl { dynamic raw, ); - @protected - WrapperArcDatabase - dco_decode_Auto_Owned_RustOpaque_flutter_rust_bridgefor_generatedRustAutoOpaqueInnerWrapperArcDatabase( - dynamic raw, - ); - @protected WrapperStatement dco_decode_Auto_Owned_RustOpaque_flutter_rust_bridgefor_generatedRustAutoOpaqueInnerWrapperStatement( @@ -110,12 +100,6 @@ abstract class RustLibApiImplPlatform extends BaseApiImpl { dynamic raw, ); - @protected - WrapperArcDatabase - dco_decode_RustOpaque_flutter_rust_bridgefor_generatedRustAutoOpaqueInnerWrapperArcDatabase( - dynamic raw, - ); - @protected WrapperStatement dco_decode_RustOpaque_flutter_rust_bridgefor_generatedRustAutoOpaqueInnerWrapperStatement( @@ -243,12 +227,6 @@ abstract class RustLibApiImplPlatform extends BaseApiImpl { SseDeserializer deserializer, ); - @protected - WrapperArcDatabase - sse_decode_Auto_Owned_RustOpaque_flutter_rust_bridgefor_generatedRustAutoOpaqueInnerWrapperArcDatabase( - SseDeserializer deserializer, - ); - @protected WrapperStatement sse_decode_Auto_Owned_RustOpaque_flutter_rust_bridgefor_generatedRustAutoOpaqueInnerWrapperStatement( @@ -290,12 +268,6 @@ abstract class RustLibApiImplPlatform extends BaseApiImpl { SseDeserializer deserializer, ); - @protected - WrapperArcDatabase - sse_decode_RustOpaque_flutter_rust_bridgefor_generatedRustAutoOpaqueInnerWrapperArcDatabase( - SseDeserializer deserializer, - ); - @protected WrapperStatement sse_decode_RustOpaque_flutter_rust_bridgefor_generatedRustAutoOpaqueInnerWrapperStatement( @@ -432,13 +404,6 @@ abstract class RustLibApiImplPlatform extends BaseApiImpl { SseSerializer serializer, ); - @protected - void - sse_encode_Auto_Owned_RustOpaque_flutter_rust_bridgefor_generatedRustAutoOpaqueInnerWrapperArcDatabase( - WrapperArcDatabase self, - SseSerializer serializer, - ); - @protected void sse_encode_Auto_Owned_RustOpaque_flutter_rust_bridgefor_generatedRustAutoOpaqueInnerWrapperStatement( @@ -487,13 +452,6 @@ abstract class RustLibApiImplPlatform extends BaseApiImpl { SseSerializer serializer, ); - @protected - void - sse_encode_RustOpaque_flutter_rust_bridgefor_generatedRustAutoOpaqueInnerWrapperArcDatabase( - WrapperArcDatabase self, - SseSerializer serializer, - ); - @protected void sse_encode_RustOpaque_flutter_rust_bridgefor_generatedRustAutoOpaqueInnerWrapperStatement( @@ -681,22 +639,6 @@ class RustLibWire implements BaseWire { ptr, ); - void - rust_arc_increment_strong_count_RustOpaque_flutter_rust_bridgefor_generatedRustAutoOpaqueInnerWrapperArcDatabase( - int ptr, - ) => wasmModule - .rust_arc_increment_strong_count_RustOpaque_flutter_rust_bridgefor_generatedRustAutoOpaqueInnerWrapperArcDatabase( - ptr, - ); - - void - rust_arc_decrement_strong_count_RustOpaque_flutter_rust_bridgefor_generatedRustAutoOpaqueInnerWrapperArcDatabase( - int ptr, - ) => wasmModule - .rust_arc_decrement_strong_count_RustOpaque_flutter_rust_bridgefor_generatedRustAutoOpaqueInnerWrapperArcDatabase( - ptr, - ); - void rust_arc_increment_strong_count_RustOpaque_flutter_rust_bridgefor_generatedRustAutoOpaqueInnerWrapperStatement( int ptr, @@ -750,16 +692,6 @@ extension type RustLibWasmModule._(JSObject _) implements JSObject { int ptr, ); - external void - rust_arc_increment_strong_count_RustOpaque_flutter_rust_bridgefor_generatedRustAutoOpaqueInnerWrapperArcDatabase( - int ptr, - ); - - external void - rust_arc_decrement_strong_count_RustOpaque_flutter_rust_bridgefor_generatedRustAutoOpaqueInnerWrapperArcDatabase( - int ptr, - ); - external void rust_arc_increment_strong_count_RustOpaque_flutter_rust_bridgefor_generatedRustAutoOpaqueInnerWrapperStatement( int ptr, diff --git a/bindings/dart/lib/src/rust/helpers/wrapper.dart b/bindings/dart/lib/src/rust/helpers/wrapper.dart index 5243d1328..216192f99 100644 --- a/bindings/dart/lib/src/rust/helpers/wrapper.dart +++ b/bindings/dart/lib/src/rust/helpers/wrapper.dart @@ -9,8 +9,5 @@ import 'package:flutter_rust_bridge/flutter_rust_bridge_for_generated.dart'; // Rust type: RustOpaqueMoi >>> abstract class WrapperArcConnection implements RustOpaqueInterface {} -// Rust type: RustOpaqueMoi >>> -abstract class WrapperArcDatabase implements RustOpaqueInterface {} - // Rust type: RustOpaqueMoi>> abstract class WrapperStatement implements RustOpaqueInterface {} diff --git a/bindings/dart/rust/src/api/connect.rs b/bindings/dart/rust/src/api/connect.rs index 7939f3d3e..ceb3fa87f 100644 --- a/bindings/dart/rust/src/api/connect.rs +++ b/bindings/dart/rust/src/api/connect.rs @@ -30,5 +30,5 @@ pub async fn connect(args: ConnectArgs) -> RustConnection { } .unwrap(); let connection = database.connect().unwrap(); - RustConnection::new(Wrapper { inner: connection }, Wrapper { inner: database }) + RustConnection::new(Wrapper { inner: connection }) } diff --git a/bindings/dart/rust/src/api/connection.rs b/bindings/dart/rust/src/api/connection.rs index 8e913afd0..018a025eb 100644 --- a/bindings/dart/rust/src/api/connection.rs +++ b/bindings/dart/rust/src/api/connection.rs @@ -15,18 +15,11 @@ use crate::{ #[frb(opaque)] pub struct RustConnection { inner: Wrapper>, - database: Wrapper>, } impl RustConnection { - pub fn new( - connection: Wrapper>, - database: Wrapper>, - ) -> RustConnection { - RustConnection { - inner: connection, - database: database, - } + pub fn new(connection: Wrapper>) -> RustConnection { + RustConnection { inner: connection } } pub async fn query(&self, sql: String, params: Params) -> QueryResult { diff --git a/bindings/dart/rust/src/api/statement.rs b/bindings/dart/rust/src/api/statement.rs index 20e43aa7d..5f772001f 100644 --- a/bindings/dart/rust/src/api/statement.rs +++ b/bindings/dart/rust/src/api/statement.rs @@ -25,7 +25,7 @@ impl RustStatement { ) -> RustStatement { RustStatement { inner: statement, - connection: connection, + connection, } } diff --git a/bindings/dart/rust/src/frb_generated.rs b/bindings/dart/rust/src/frb_generated.rs index 4454e6efa..4d931f7d3 100644 --- a/bindings/dart/rust/src/frb_generated.rs +++ b/bindings/dart/rust/src/frb_generated.rs @@ -135,12 +135,11 @@ fn wire__crate__api__connection__RustConnection_new_impl( let mut deserializer = flutter_rust_bridge::for_generated::SseDeserializer::new(message); let api_connection = >>::sse_decode(&mut deserializer); - let api_database = >>::sse_decode(&mut deserializer); deserializer.end(); move |context| { transform_result_sse::<_, ()>((move || { let output_ok = Result::<_, ()>::Ok( - crate::api::connection::RustConnection::new(api_connection, api_database), + crate::api::connection::RustConnection::new(api_connection), )?; Ok(output_ok) })()) @@ -574,9 +573,6 @@ flutter_rust_bridge::frb_generated_moi_arc_impl_value!( flutter_rust_bridge::frb_generated_moi_arc_impl_value!( flutter_rust_bridge::for_generated::RustAutoOpaqueInner>> ); -flutter_rust_bridge::frb_generated_moi_arc_impl_value!( - flutter_rust_bridge::for_generated::RustAutoOpaqueInner>> -); flutter_rust_bridge::frb_generated_moi_arc_impl_value!( flutter_rust_bridge::for_generated::RustAutoOpaqueInner> ); @@ -613,16 +609,6 @@ impl SseDecode for Wrapper> { } } -impl SseDecode for Wrapper> { - // 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 flutter_rust_bridge::for_generated::rust_auto_opaque_decode_owned(inner); - } -} - impl SseDecode for Wrapper { // Codec=Sse (Serialization based), see doc to use other codecs fn sse_decode(deserializer: &mut flutter_rust_bridge::for_generated::SseDeserializer) -> Self { @@ -674,18 +660,6 @@ impl SseDecode } } -impl SseDecode - for RustOpaqueMoi< - flutter_rust_bridge::for_generated::RustAutoOpaqueInner>>, - > -{ - // 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 decode_rust_opaque_moi(inner); - } -} - impl SseDecode for RustOpaqueMoi>> { @@ -1165,26 +1139,6 @@ impl flutter_rust_bridge::IntoIntoDart>>> } } -// Codec=Dco (DartCObject based), see doc to use other codecs -impl flutter_rust_bridge::IntoDart for FrbWrapper>> { - fn into_dart(self) -> flutter_rust_bridge::for_generated::DartAbi { - flutter_rust_bridge::for_generated::rust_auto_opaque_encode::<_, MoiArc<_>>(self.0) - .into_dart() - } -} -impl flutter_rust_bridge::for_generated::IntoDartExceptPrimitive - for FrbWrapper>> -{ -} - -impl flutter_rust_bridge::IntoIntoDart>>> - for Wrapper> -{ - fn into_into_dart(self) -> FrbWrapper>> { - self.into() - } -} - // Codec=Dco (DartCObject based), see doc to use other codecs impl flutter_rust_bridge::IntoDart for FrbWrapper> { fn into_dart(self) -> flutter_rust_bridge::for_generated::DartAbi { @@ -1412,18 +1366,6 @@ impl SseEncode for Wrapper> { } } -impl SseEncode for Wrapper> { - // Codec=Sse (Serialization based), see doc to use other codecs - fn sse_encode(self, serializer: &mut flutter_rust_bridge::for_generated::SseSerializer) { - >>, - >>::sse_encode( - flutter_rust_bridge::for_generated::rust_auto_opaque_encode::<_, MoiArc<_>>(self), - serializer, - ); - } -} - impl SseEncode for Wrapper { // Codec=Sse (Serialization based), see doc to use other codecs fn sse_encode(self, serializer: &mut flutter_rust_bridge::for_generated::SseSerializer) { @@ -1476,19 +1418,6 @@ impl SseEncode } } -impl SseEncode - for RustOpaqueMoi< - flutter_rust_bridge::for_generated::RustAutoOpaqueInner>>, - > -{ - // Codec=Sse (Serialization based), see doc to use other codecs - fn sse_encode(self, serializer: &mut flutter_rust_bridge::for_generated::SseSerializer) { - let (ptr, size) = self.sse_encode_raw(); - ::sse_encode(ptr, serializer); - ::sse_encode(size, serializer); - } -} - impl SseEncode for RustOpaqueMoi>> { @@ -1875,20 +1804,6 @@ mod io { MoiArc:: >>>::decrement_strong_count(ptr as _); } - #[unsafe(no_mangle)] - pub extern "C" fn frbgen_turso_dart_rust_arc_increment_strong_count_RustOpaque_flutter_rust_bridgefor_generatedRustAutoOpaqueInnerWrapperArcDatabase( - ptr: *const std::ffi::c_void, - ) { - MoiArc:: >>>::increment_strong_count(ptr as _); - } - - #[unsafe(no_mangle)] - pub extern "C" fn frbgen_turso_dart_rust_arc_decrement_strong_count_RustOpaque_flutter_rust_bridgefor_generatedRustAutoOpaqueInnerWrapperArcDatabase( - ptr: *const std::ffi::c_void, - ) { - MoiArc:: >>>::decrement_strong_count(ptr as _); - } - #[unsafe(no_mangle)] pub extern "C" fn frbgen_turso_dart_rust_arc_increment_strong_count_RustOpaque_flutter_rust_bridgefor_generatedRustAutoOpaqueInnerWrapperStatement( ptr: *const std::ffi::c_void, @@ -1972,20 +1887,6 @@ mod web { MoiArc:: >>>::decrement_strong_count(ptr as _); } - #[wasm_bindgen] - pub fn rust_arc_increment_strong_count_RustOpaque_flutter_rust_bridgefor_generatedRustAutoOpaqueInnerWrapperArcDatabase( - ptr: *const std::ffi::c_void, - ) { - MoiArc:: >>>::increment_strong_count(ptr as _); - } - - #[wasm_bindgen] - pub fn rust_arc_decrement_strong_count_RustOpaque_flutter_rust_bridgefor_generatedRustAutoOpaqueInnerWrapperArcDatabase( - ptr: *const std::ffi::c_void, - ) { - MoiArc:: >>>::decrement_strong_count(ptr as _); - } - #[wasm_bindgen] pub fn rust_arc_increment_strong_count_RustOpaque_flutter_rust_bridgefor_generatedRustAutoOpaqueInnerWrapperStatement( ptr: *const std::ffi::c_void, diff --git a/bindings/dart/rust/src/helpers/value.rs b/bindings/dart/rust/src/helpers/value.rs index 1e1fe9fcd..e652bec34 100644 --- a/bindings/dart/rust/src/helpers/value.rs +++ b/bindings/dart/rust/src/helpers/value.rs @@ -6,9 +6,9 @@ pub enum Value { Null, } -impl Into for Value { - fn into(self) -> turso_core::Value { - match self { +impl From for turso_core::Value { + fn from(val: Value) -> Self { + match val { Value::Null => turso_core::Value::Null, Value::Integer(n) => turso_core::Value::Integer(n), Value::Real(n) => turso_core::Value::Float(n),