From 2c75b38f19749031caebed3f8c68bbba334dfae4 Mon Sep 17 00:00:00 2001 From: kodjomoustapha <107993382+kodjodevf@users.noreply.github.com> Date: Tue, 18 Jun 2024 13:59:16 +0100 Subject: [PATCH] + --- flutter_rust_bridge.yaml | 3 ++- lib/src/rust/api/image.dart | 2 +- lib/src/rust/frb_generated.dart | 4 ++-- lib/src/rust/frb_generated.io.dart | 2 +- lib/src/rust/frb_generated.web.dart | 2 +- pubspec.lock | 4 ++-- pubspec.yaml | 2 +- rust/Cargo.lock | 12 ++++++------ rust/Cargo.toml | 2 +- rust/src/frb_generated.io.rs | 4 ++-- rust/src/frb_generated.rs | 18 ++++++++++++------ rust/src/frb_generated.web.rs | 4 ++-- 12 files changed, 33 insertions(+), 26 deletions(-) diff --git a/flutter_rust_bridge.yaml b/flutter_rust_bridge.yaml index f009f9c0..c888c944 100644 --- a/flutter_rust_bridge.yaml +++ b/flutter_rust_bridge.yaml @@ -1,2 +1,3 @@ -rust_input: rust/src/api/**/*.rs +rust_root: rust/ +rust_input: crate::api dart_output: lib/src/rust \ No newline at end of file diff --git a/lib/src/rust/api/image.dart b/lib/src/rust/api/image.dart index 802b80f3..9c968306 100644 --- a/lib/src/rust/api/image.dart +++ b/lib/src/rust/api/image.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.39. +// Generated by `flutter_rust_bridge`@ 2.0.0-dev.40. // ignore_for_file: invalid_use_of_internal_member, unused_import, unnecessary_import diff --git a/lib/src/rust/frb_generated.dart b/lib/src/rust/frb_generated.dart index 14daf2fc..7a5107cb 100644 --- a/lib/src/rust/frb_generated.dart +++ b/lib/src/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.39. +// Generated by `flutter_rust_bridge`@ 2.0.0-dev.40. // 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 @@ -52,7 +52,7 @@ class RustLib extends BaseEntrypoint { kDefaultExternalLibraryLoaderConfig; @override - String get codegenVersion => '2.0.0-dev.39'; + String get codegenVersion => '2.0.0-dev.40'; @override int get rustContentHash => -287789500; diff --git a/lib/src/rust/frb_generated.io.dart b/lib/src/rust/frb_generated.io.dart index 92f0ad0a..1a78d5e1 100644 --- a/lib/src/rust/frb_generated.io.dart +++ b/lib/src/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.39. +// Generated by `flutter_rust_bridge`@ 2.0.0-dev.40. // 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 diff --git a/lib/src/rust/frb_generated.web.dart b/lib/src/rust/frb_generated.web.dart index 8e0fcd64..462cb49b 100644 --- a/lib/src/rust/frb_generated.web.dart +++ b/lib/src/rust/frb_generated.web.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.39. +// Generated by `flutter_rust_bridge`@ 2.0.0-dev.40. // 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 diff --git a/pubspec.lock b/pubspec.lock index 3da90634..826f296c 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -536,10 +536,10 @@ packages: dependency: "direct main" description: name: flutter_rust_bridge - sha256: ee0d9798156ba523ca24bfb690efd15614f823685df270447c480dd5923d9a0b + sha256: "4ab629fec14aa4a6a3b503d15ec81cf0cd2cf4d409eb2bbdd32491fea69d9f61" url: "https://pub.dev" source: hosted - version: "2.0.0-dev.39" + version: "2.0.0-dev.40" flutter_test: dependency: "direct dev" description: flutter diff --git a/pubspec.yaml b/pubspec.yaml index 1a6ba1ef..ff6f0693 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -79,7 +79,7 @@ dependencies: highlight: ^0.7.0 json_view: ^0.4.2 super_sliver_list: ^0.4.1 - flutter_rust_bridge: ^2.0.0-dev.39 + flutter_rust_bridge: ^2.0.0-dev.40 rust_lib_mangayomi: path: rust_builder pseudom: ^1.0.1 diff --git a/rust/Cargo.lock b/rust/Cargo.lock index f4cc86ab..3bab4a6e 100644 --- a/rust/Cargo.lock +++ b/rust/Cargo.lock @@ -187,9 +187,9 @@ checksum = "7f30e7476521f6f8af1a1c4c0b8cc94f0bee37d91763d0ca2665f299b6cd8aec" [[package]] name = "bytemuck" -version = "1.14.0" +version = "1.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "374d28ec25809ee0e23827c2ab573d729e293f281dfe393500e7ad618baa61c6" +checksum = "78834c15cb5d5efe3452d58b1e8ba890dd62d21907f867f383358198e56ebca5" [[package]] name = "byteorder" @@ -403,9 +403,9 @@ dependencies = [ [[package]] name = "flutter_rust_bridge" -version = "2.0.0-dev.39" +version = "2.0.0-dev.40" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92c9a3d358c2df51ac5ab05440334a63d7e2ce3229ca05d285769498bfe7fb8d" +checksum = "5c365fbbceacaafff62c4efcb50584955624ae4f5524355e947591116fe26792" dependencies = [ "allo-isolate", "android_logger", @@ -430,9 +430,9 @@ dependencies = [ [[package]] name = "flutter_rust_bridge_macros" -version = "2.0.0-dev.39" +version = "2.0.0-dev.40" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7c73c8b391f3c0aed00493871aee6541c03d117d553fa5c121f126dfbbad5157" +checksum = "a20b6a0e0ff1075c8425d5a157704376a342a9a1da6e5c0ecd358ae18c9a66cf" dependencies = [ "hex", "md-5", diff --git a/rust/Cargo.toml b/rust/Cargo.toml index c8b0e3ed..53508504 100644 --- a/rust/Cargo.toml +++ b/rust/Cargo.toml @@ -7,5 +7,5 @@ edition = "2021" crate-type = ["cdylib", "staticlib"] [dependencies] -flutter_rust_bridge = "=2.0.0-dev.39" +flutter_rust_bridge = "=2.0.0-dev.40" image = "0.25.0" diff --git a/rust/src/frb_generated.io.rs b/rust/src/frb_generated.io.rs index 1784fece..678a33ee 100644 --- a/rust/src/frb_generated.io.rs +++ b/rust/src/frb_generated.io.rs @@ -1,11 +1,11 @@ // This file is automatically generated, so please do not edit it. -// Generated by `flutter_rust_bridge`@ 2.0.0-dev.39. +// Generated by `flutter_rust_bridge`@ 2.0.0-dev.40. // Section: imports use super::*; use flutter_rust_bridge::for_generated::byteorder::{NativeEndian, ReadBytesExt, WriteBytesExt}; -use flutter_rust_bridge::for_generated::{transform_result_dco, Lockable}; +use flutter_rust_bridge::for_generated::{transform_result_dco, Lifetimeable, Lockable}; use flutter_rust_bridge::{Handler, IntoIntoDart}; // Section: boilerplate diff --git a/rust/src/frb_generated.rs b/rust/src/frb_generated.rs index f6998522..fcfb819a 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.39. +// Generated by `flutter_rust_bridge`@ 2.0.0-dev.40. #![allow( non_camel_case_types, @@ -16,13 +16,17 @@ clippy::too_many_arguments, clippy::match_single_binding, clippy::clone_on_copy, - clippy::let_unit_value + clippy::let_unit_value, + clippy::deref_addrof, + clippy::explicit_auto_deref, + clippy::borrow_deref_ref, + clippy::needless_borrow )] // Section: imports use flutter_rust_bridge::for_generated::byteorder::{NativeEndian, ReadBytesExt, WriteBytesExt}; -use flutter_rust_bridge::for_generated::{transform_result_dco, Lockable}; +use flutter_rust_bridge::for_generated::{transform_result_dco, Lifetimeable, Lockable}; use flutter_rust_bridge::{Handler, IntoIntoDart}; // Section: boilerplate @@ -32,7 +36,7 @@ flutter_rust_bridge::frb_generated_boilerplate!( default_rust_opaque = RustOpaqueMoi, default_rust_auto_opaque = RustAutoOpaqueMoi, ); -pub(crate) const FLUTTER_RUST_BRIDGE_CODEGEN_VERSION: &str = "2.0.0-dev.39"; +pub(crate) const FLUTTER_RUST_BRIDGE_CODEGEN_VERSION: &str = "2.0.0-dev.40"; pub(crate) const FLUTTER_RUST_BRIDGE_CODEGEN_CONTENT_HASH: i32 = -287789500; // Section: executor @@ -64,8 +68,10 @@ fn wire__crate__api__image__process_crop_image_impl( flutter_rust_bridge::for_generated::SseDeserializer::new(message); let api_image = >::sse_decode(&mut deserializer); deserializer.end(); - transform_result_sse((move || { - Result::<_, ()>::Ok(crate::api::image::process_crop_image(api_image)) + transform_result_sse::<_, ()>((move || { + let output_ok = + Result::<_, ()>::Ok(crate::api::image::process_crop_image(api_image))?; + Ok(output_ok) })()) }, ) diff --git a/rust/src/frb_generated.web.rs b/rust/src/frb_generated.web.rs index bc660479..d83e6cd0 100644 --- a/rust/src/frb_generated.web.rs +++ b/rust/src/frb_generated.web.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.39. +// Generated by `flutter_rust_bridge`@ 2.0.0-dev.40. // Section: imports @@ -7,7 +7,7 @@ use super::*; use flutter_rust_bridge::for_generated::byteorder::{NativeEndian, ReadBytesExt, WriteBytesExt}; use flutter_rust_bridge::for_generated::wasm_bindgen; use flutter_rust_bridge::for_generated::wasm_bindgen::prelude::*; -use flutter_rust_bridge::for_generated::{transform_result_dco, Lockable}; +use flutter_rust_bridge::for_generated::{transform_result_dco, Lifetimeable, Lockable}; use flutter_rust_bridge::{Handler, IntoIntoDart}; // Section: boilerplate