From 48e653df09940c2b7fb87b89db3db76c7411744e Mon Sep 17 00:00:00 2001 From: iota9star Date: Wed, 30 Sep 2026 10:58:24 +0800 Subject: [PATCH 1/6] feat: upgrade flutter_rust_bridge to 2.13.0 Regenerate the bindings with codegen 2.13.0, bump the runtime dependency on both sides (the Rust side pins =2.13.0, the root Dart dependency stays capped to the codegen minor line), install codegen 2.13.0 in CI, and release as 3.3.2. The bridge content hash is unchanged from 2.12.0, so the wire format is compatible. --- .github/workflows/build-all-platforms.yml | 4 +- CHANGELOG.md | 4 + darwin/fjs.podspec | 2 +- example/analysis_options.yaml | 9 + example/pubspec.lock | 15 +- ios/fjs.podspec | 2 +- lib/src/frb/api/bytecode.dart | 2 +- lib/src/frb/api/engine.dart | 2 +- lib/src/frb/api/error.dart | 2 +- lib/src/frb/api/runtime.dart | 2 +- lib/src/frb/api/source.dart | 4 +- lib/src/frb/api/value.dart | 2 +- lib/src/frb/frb_generated.dart | 4 +- lib/src/frb/frb_generated.io.dart | 2 +- lib/src/frb/frb_generated.web.dart | 2 +- libfjs/Cargo.lock | 10 +- libfjs/Cargo.toml | 4 +- libfjs/src/frb_generated.rs | 606 +++++++++++----------- macos/fjs.podspec | 2 +- pubspec.yaml | 4 +- tool/check_darwin_package_support.sh | 4 +- 21 files changed, 343 insertions(+), 345 deletions(-) diff --git a/.github/workflows/build-all-platforms.yml b/.github/workflows/build-all-platforms.yml index 7b3ba37..0fd3e2c 100644 --- a/.github/workflows/build-all-platforms.yml +++ b/.github/workflows/build-all-platforms.yml @@ -147,8 +147,8 @@ jobs: - name: Install nightly Rust with rustfmt run: rustup toolchain install nightly --profile minimal --component rustfmt - - name: Install FRB codegen 2.12.0 - run: cargo install flutter_rust_bridge_codegen --version 2.12.0 --locked + - name: Install FRB codegen 2.13.0 + run: cargo install flutter_rust_bridge_codegen --version 2.13.0 --locked - name: Install pinned cargo-expand 1.0.126 run: cargo install cargo-expand --version 1.0.126 --locked diff --git a/CHANGELOG.md b/CHANGELOG.md index 0478da3..8b1a1da 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ # Changelog +## 3.3.2 + +* **INTERNAL**: Upgraded `flutter_rust_bridge` to 2.13.0 — codegen, runtime dependency, and regenerated bindings. The bridge content hash is unchanged from 2.12.0, so the wire format stays compatible. CI installs codegen 2.13.0 and the root dependency stays capped to the codegen minor line (`>=2.13.0 <2.14.0`). + ## 3.3.1 * **FIX**: Published pub packages now ship `darwin/fjs/Binaries/fjs.xcframework.zip` again. The tag-triggered publish workflow materializes the signed SwiftPM composite from the verified precompiled generation before `flutter pub publish` and hard-fails when the binary is absent, so Swift Package Manager resolution no longer fails with a missing `FjsBinary` archive. diff --git a/darwin/fjs.podspec b/darwin/fjs.podspec index 7a9cc9b..0b679ec 100644 --- a/darwin/fjs.podspec +++ b/darwin/fjs.podspec @@ -4,7 +4,7 @@ # Pod::Spec.new do |s| s.name = 'fjs' - s.version = '3.3.1' + s.version = '3.3.2' s.summary = 'A high-performance JavaScript runtime for Flutter applications, built with Rust and powered by QuickJS.' s.description = <<-DESC A high-performance JavaScript runtime for Flutter applications, built with Rust and powered by QuickJS. diff --git a/example/analysis_options.yaml b/example/analysis_options.yaml index a29d774..b7f45d1 100644 --- a/example/analysis_options.yaml +++ b/example/analysis_options.yaml @@ -7,6 +7,15 @@ # The following line activates a set of recommended lints for Flutter apps, # packages, and plugins designed to encourage good coding practices. +analyzer: + exclude: + - build/** + - android/** + - ios/** + - web/** + - windows/** + - macos/** + - linux/** include: package:flutter_lints/flutter.yaml linter: diff --git a/example/pubspec.lock b/example/pubspec.lock index 7482aed..b14f676 100644 --- a/example/pubspec.lock +++ b/example/pubspec.lock @@ -151,7 +151,7 @@ packages: path: ".." relative: true source: path - version: "3.3.1" + version: "3.3.2" flutter: dependency: "direct main" description: flutter @@ -198,10 +198,10 @@ packages: dependency: transitive description: name: flutter_rust_bridge - sha256: e87d6b9ee934dcd24a128ccb2bd91905d2d5fe5c06245d6a8f5477d4907a437a + sha256: ec69331e2335ab4d456c0a9fc700892c2c85b72b9c0cb39df3ecfe8833d5d5c8 url: "https://pub.dev" source: hosted - version: "2.12.0" + version: "2.13.0" flutter_test: dependency: "direct dev" description: flutter @@ -326,6 +326,15 @@ packages: url: "https://pub.dev" source: hosted version: "6.0.0" + logging: + dependency: transitive + description: + name: logging + sha256: c8245ada5f1717ed44271ed1c26b8ce85ca3228fd2ffdb75468ab01979309d61 + url: "https://pub.dev" + source: hosted + version: "1.3.0" + matcher: dependency: transitive description: diff --git a/ios/fjs.podspec b/ios/fjs.podspec index 19d5d3a..47e0519 100644 --- a/ios/fjs.podspec +++ b/ios/fjs.podspec @@ -4,7 +4,7 @@ # Pod::Spec.new do |s| s.name = 'fjs' - s.version = '3.3.1' + s.version = '3.3.2' s.summary = 'A high-performance JavaScript runtime for Flutter applications, built with Rust and powered by QuickJS.' s.description = <<-DESC A high-performance JavaScript runtime for Flutter applications, built with Rust and powered by QuickJS. diff --git a/lib/src/frb/api/bytecode.dart b/lib/src/frb/api/bytecode.dart index 10aa3b2..c591df2 100644 --- a/lib/src/frb/api/bytecode.dart +++ b/lib/src/frb/api/bytecode.dart @@ -1,5 +1,5 @@ // This file is automatically generated, so please do not edit it. -// @generated by `flutter_rust_bridge`@ 2.12.0. +// @generated by `flutter_rust_bridge`@ 2.13.0. // ignore_for_file: invalid_use_of_internal_member, unused_import, unnecessary_import diff --git a/lib/src/frb/api/engine.dart b/lib/src/frb/api/engine.dart index e3ee581..43275c5 100644 --- a/lib/src/frb/api/engine.dart +++ b/lib/src/frb/api/engine.dart @@ -1,5 +1,5 @@ // This file is automatically generated, so please do not edit it. -// @generated by `flutter_rust_bridge`@ 2.12.0. +// @generated by `flutter_rust_bridge`@ 2.13.0. // ignore_for_file: invalid_use_of_internal_member, unused_import, unnecessary_import diff --git a/lib/src/frb/api/error.dart b/lib/src/frb/api/error.dart index 6d541d2..98c2115 100644 --- a/lib/src/frb/api/error.dart +++ b/lib/src/frb/api/error.dart @@ -1,5 +1,5 @@ // This file is automatically generated, so please do not edit it. -// @generated by `flutter_rust_bridge`@ 2.12.0. +// @generated by `flutter_rust_bridge`@ 2.13.0. // ignore_for_file: invalid_use_of_internal_member, unused_import, unnecessary_import diff --git a/lib/src/frb/api/runtime.dart b/lib/src/frb/api/runtime.dart index 53ffd37..806d9c2 100644 --- a/lib/src/frb/api/runtime.dart +++ b/lib/src/frb/api/runtime.dart @@ -1,5 +1,5 @@ // This file is automatically generated, so please do not edit it. -// @generated by `flutter_rust_bridge`@ 2.12.0. +// @generated by `flutter_rust_bridge`@ 2.13.0. // ignore_for_file: invalid_use_of_internal_member, unused_import, unnecessary_import diff --git a/lib/src/frb/api/source.dart b/lib/src/frb/api/source.dart index 177348d..a11797d 100644 --- a/lib/src/frb/api/source.dart +++ b/lib/src/frb/api/source.dart @@ -1,5 +1,5 @@ // This file is automatically generated, so please do not edit it. -// @generated by `flutter_rust_bridge`@ 2.12.0. +// @generated by `flutter_rust_bridge`@ 2.13.0. // ignore_for_file: invalid_use_of_internal_member, unused_import, unnecessary_import @@ -9,7 +9,7 @@ import 'package:freezed_annotation/freezed_annotation.dart' hide protected; part 'source.freezed.dart'; // These functions are ignored because they are not marked as `pub`: `bounded_read_capacity`, `ensure_within_size_limit`, `read_file_bounded_sync`, `read_file_bounded` -// These function are ignored because they are on traits that is not defined in current crate (put an empty `#[frb]` on it to unignore): `assert_fields_are_eq`, `assert_fields_are_eq`, `assert_fields_are_eq`, `assert_fields_are_eq`, `clone`, `clone`, `clone`, `clone`, `clone`, `clone`, `clone`, `clone`, `clone`, `clone`, `cmp`, `cmp`, `cmp`, `cmp`, `cmp`, `eq`, `eq`, `eq`, `eq`, `eq`, `fmt`, `fmt`, `fmt`, `fmt`, `fmt`, `fmt`, `fmt`, `fmt`, `fmt`, `fmt`, `from`, `from`, `from`, `hash`, `hash`, `hash`, `hash`, `hash`, `partial_cmp`, `partial_cmp`, `partial_cmp`, `partial_cmp`, `partial_cmp` +// These function are ignored because they are on traits that is not defined in current crate (put an empty `#[frb]` on it to unignore): `assert_fields_are_eq`, `assert_fields_are_eq`, `assert_fields_are_eq`, `assert_fields_are_eq`, `assert_fields_are_eq`, `clone`, `clone`, `clone`, `clone`, `clone`, `clone`, `clone`, `clone`, `clone`, `clone`, `cmp`, `cmp`, `cmp`, `cmp`, `cmp`, `eq`, `eq`, `eq`, `eq`, `eq`, `fmt`, `fmt`, `fmt`, `fmt`, `fmt`, `fmt`, `fmt`, `fmt`, `fmt`, `fmt`, `from`, `from`, `from`, `hash`, `hash`, `hash`, `hash`, `hash`, `partial_cmp`, `partial_cmp`, `partial_cmp`, `partial_cmp`, `partial_cmp` // These functions are ignored (category: IgnoreBecauseExplicitAttribute): `as_path`, `bytes`, `code`, `get_raw_source_code_sync`, `get_raw_source_code`, `path` /// Options for configuring builtin Node.js modules. diff --git a/lib/src/frb/api/value.dart b/lib/src/frb/api/value.dart index 184ae23..5beecad 100644 --- a/lib/src/frb/api/value.dart +++ b/lib/src/frb/api/value.dart @@ -1,5 +1,5 @@ // This file is automatically generated, so please do not edit it. -// @generated by `flutter_rust_bridge`@ 2.12.0. +// @generated by `flutter_rust_bridge`@ 2.13.0. // ignore_for_file: invalid_use_of_internal_member, unused_import, unnecessary_import diff --git a/lib/src/frb/frb_generated.dart b/lib/src/frb/frb_generated.dart index dce5942..d3a8681 100644 --- a/lib/src/frb/frb_generated.dart +++ b/lib/src/frb/frb_generated.dart @@ -1,5 +1,5 @@ // This file is automatically generated, so please do not edit it. -// @generated by `flutter_rust_bridge`@ 2.12.0. +// @generated by `flutter_rust_bridge`@ 2.13.0. // 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 @@ -72,7 +72,7 @@ class LibFjs extends BaseEntrypoint { kDefaultExternalLibraryLoaderConfig; @override - String get codegenVersion => '2.12.0'; + String get codegenVersion => '2.13.0'; @override int get rustContentHash => -2005216402; diff --git a/lib/src/frb/frb_generated.io.dart b/lib/src/frb/frb_generated.io.dart index 9f59708..128787b 100644 --- a/lib/src/frb/frb_generated.io.dart +++ b/lib/src/frb/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.12.0. +// @generated by `flutter_rust_bridge`@ 2.13.0. // 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/frb/frb_generated.web.dart b/lib/src/frb/frb_generated.web.dart index ce51be5..feb71b2 100644 --- a/lib/src/frb/frb_generated.web.dart +++ b/lib/src/frb/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.12.0. +// @generated by `flutter_rust_bridge`@ 2.13.0. // 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/libfjs/Cargo.lock b/libfjs/Cargo.lock index 9cffe3f..c897c05 100644 --- a/libfjs/Cargo.lock +++ b/libfjs/Cargo.lock @@ -773,7 +773,7 @@ checksum = "aedcfb3409746eddb02b9e19ebda1c3394f759a152e48ee875a0844d1b955484" [[package]] name = "fjs" -version = "3.3.1" +version = "3.3.2" dependencies = [ "anyhow", "flate2", @@ -838,9 +838,9 @@ dependencies = [ [[package]] name = "flutter_rust_bridge" -version = "2.12.0" +version = "2.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a0884853aae8a6517b5b58cf36f55da487f2fe110e1686938eb29b6640aae4a5" +checksum = "24a973d15b8fc7de9fb29cdfbec58a2ac41f6252492d3b882abfdc603e32b34f" dependencies = [ "allo-isolate", "android_logger", @@ -867,9 +867,9 @@ dependencies = [ [[package]] name = "flutter_rust_bridge_macros" -version = "2.12.0" +version = "2.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b5ce32f35f710ced8c5aa557f023f1a624e737b5460cee2b70fcd3a8df09e1b" +checksum = "901eec2d226107dad1c55b30f7421c4687bebcf70ed43ca44d1b447ca087b238" dependencies = [ "hex", "md-5 0.10.6", diff --git a/libfjs/Cargo.toml b/libfjs/Cargo.toml index b295fc3..fd56234 100644 --- a/libfjs/Cargo.toml +++ b/libfjs/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "fjs" -version = "3.3.1" +version = "3.3.2" edition = "2024" rust-version = "1.95" license = "MIT" @@ -15,7 +15,7 @@ crate-type = ["cdylib", "staticlib"] [dependencies] anyhow = "1" -flutter_rust_bridge = "=2.12.0" +flutter_rust_bridge = "=2.13.0" futures = "0.3" rquickjs = { git = "https://github.com/DelSkayn/rquickjs.git", rev = "3d5ecfc94e3f9ea3a9769422ca718a7dd063e00f", version = "0.14", features = ["full-async", "bindgen", "loader", "dyn-load", "parallel", "macro", "futures"] } tokio = { version = "1", features = ["full"] } diff --git a/libfjs/src/frb_generated.rs b/libfjs/src/frb_generated.rs index 5f65f4d..10ddde0 100644 --- a/libfjs/src/frb_generated.rs +++ b/libfjs/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.12.0. +// @generated by `flutter_rust_bridge`@ 2.13.0. #![allow( non_camel_case_types, @@ -21,7 +21,8 @@ clippy::explicit_auto_deref, clippy::borrow_deref_ref, clippy::uninlined_format_args, - clippy::needless_borrow + clippy::needless_borrow, + mismatched_lifetime_syntaxes )] // Section: imports @@ -40,7 +41,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.12.0"; +pub(crate) const FLUTTER_RUST_BRIDGE_CODEGEN_VERSION: &str = "2.13.0"; pub(crate) const FLUTTER_RUST_BRIDGE_CODEGEN_CONTENT_HASH: i32 = -2005216402; // Section: executor @@ -96,11 +97,11 @@ fn wire__crate__api__runtime__JsAsyncContext_eval_impl( } } let api_that_guard = api_that_guard.unwrap(); - let output_ok = Result::<_, ()>::Ok( + let output_ok = Ok::<_, ()>( crate::api::runtime::JsAsyncContext::eval(&*api_that_guard, api_code) .await, )?; - Ok(output_ok) + std::result::Result::Ok(output_ok) })() .await, ) @@ -155,14 +156,14 @@ fn wire__crate__api__runtime__JsAsyncContext_eval_file_impl( } } let api_that_guard = api_that_guard.unwrap(); - let output_ok = Result::<_, ()>::Ok( + let output_ok = Ok::<_, ()>( crate::api::runtime::JsAsyncContext::eval_file( &*api_that_guard, api_path, ) .await, )?; - Ok(output_ok) + std::result::Result::Ok(output_ok) })() .await, ) @@ -218,7 +219,7 @@ fn wire__crate__api__runtime__JsAsyncContext_eval_file_with_options_impl( } } let api_that_guard = api_that_guard.unwrap(); - let output_ok = Result::<_, ()>::Ok( + let output_ok = Ok::<_, ()>( crate::api::runtime::JsAsyncContext::eval_file_with_options( &*api_that_guard, api_path, @@ -226,7 +227,7 @@ fn wire__crate__api__runtime__JsAsyncContext_eval_file_with_options_impl( ) .await, )?; - Ok(output_ok) + std::result::Result::Ok(output_ok) })() .await, ) @@ -284,7 +285,7 @@ fn wire__crate__api__runtime__JsAsyncContext_eval_function_impl( } } let api_that_guard = api_that_guard.unwrap(); - let output_ok = Result::<_, ()>::Ok( + let output_ok = Ok::<_, ()>( crate::api::runtime::JsAsyncContext::eval_function( &*api_that_guard, api_module, @@ -293,7 +294,7 @@ fn wire__crate__api__runtime__JsAsyncContext_eval_function_impl( ) .await, )?; - Ok(output_ok) + std::result::Result::Ok(output_ok) })() .await, ) @@ -349,7 +350,7 @@ fn wire__crate__api__runtime__JsAsyncContext_eval_with_options_impl( } } let api_that_guard = api_that_guard.unwrap(); - let output_ok = Result::<_, ()>::Ok( + let output_ok = Ok::<_, ()>( crate::api::runtime::JsAsyncContext::eval_with_options( &*api_that_guard, api_code, @@ -357,7 +358,7 @@ fn wire__crate__api__runtime__JsAsyncContext_eval_with_options_impl( ) .await, )?; - Ok(output_ok) + std::result::Result::Ok(output_ok) })() .await, ) @@ -415,7 +416,7 @@ fn wire__crate__api__runtime__JsAsyncContext_from_impl( let api_runtime_guard = api_runtime_guard.unwrap(); let output_ok = crate::api::runtime::JsAsyncContext::from(&*api_runtime_guard).await?; - Ok(output_ok) + std::result::Result::Ok(output_ok) })() .await, ) @@ -473,7 +474,7 @@ fn wire__crate__api__runtime__JsAsyncContext_get_available_modules_impl( &*api_that_guard, ) .await?; - Ok(output_ok) + std::result::Result::Ok(output_ok) })() .await, ) @@ -514,7 +515,7 @@ fn wire__crate__api__runtime__JsAsyncRuntime_create_impl( let output_ok = crate::api::runtime::JsAsyncRuntime::create(api_builtins, api_modules) .await?; - Ok(output_ok) + std::result::Result::Ok(output_ok) })() .await, ) @@ -568,11 +569,11 @@ fn wire__crate__api__runtime__JsAsyncRuntime_memory_usage_impl( } } let api_that_guard = api_that_guard.unwrap(); - let output_ok = Result::<_, ()>::Ok( + let output_ok = Ok::<_, ()>( crate::api::runtime::JsAsyncRuntime::memory_usage(&*api_that_guard) .await, )?; - Ok(output_ok) + std::result::Result::Ok(output_ok) })() .await, ) @@ -604,7 +605,7 @@ fn wire__crate__api__runtime__JsAsyncRuntime_new_impl( deserializer.end(); transform_result_sse::<_, crate::api::error::JsError>((move || { let output_ok = crate::api::runtime::JsAsyncRuntime::new()?; - Ok(output_ok) + std::result::Result::Ok(output_ok) })()) }, ) @@ -655,10 +656,10 @@ fn wire__crate__api__runtime__JsAsyncRuntime_run_gc_impl( } } let api_that_guard = api_that_guard.unwrap(); - let output_ok = Result::<_, ()>::Ok({ + let output_ok = Ok::<_, ()>({ crate::api::runtime::JsAsyncRuntime::run_gc(&*api_that_guard).await; })?; - Ok(output_ok) + std::result::Result::Ok(output_ok) })() .await, ) @@ -713,14 +714,14 @@ fn wire__crate__api__runtime__JsAsyncRuntime_set_gc_threshold_impl( } } let api_that_guard = api_that_guard.unwrap(); - let output_ok = Result::<_, ()>::Ok({ + let output_ok = Ok::<_, ()>({ crate::api::runtime::JsAsyncRuntime::set_gc_threshold( &*api_that_guard, api_threshold, ) .await; })?; - Ok(output_ok) + std::result::Result::Ok(output_ok) })() .await, ) @@ -780,7 +781,7 @@ fn wire__crate__api__runtime__JsAsyncRuntime_set_info_impl( api_info, ) .await?; - Ok(output_ok) + std::result::Result::Ok(output_ok) })() .await, ) @@ -835,14 +836,14 @@ fn wire__crate__api__runtime__JsAsyncRuntime_set_max_stack_size_impl( } } let api_that_guard = api_that_guard.unwrap(); - let output_ok = Result::<_, ()>::Ok({ + let output_ok = Ok::<_, ()>({ crate::api::runtime::JsAsyncRuntime::set_max_stack_size( &*api_that_guard, api_limit, ) .await; })?; - Ok(output_ok) + std::result::Result::Ok(output_ok) })() .await, ) @@ -897,14 +898,14 @@ fn wire__crate__api__runtime__JsAsyncRuntime_set_memory_limit_impl( } } let api_that_guard = api_that_guard.unwrap(); - let output_ok = Result::<_, ()>::Ok({ + let output_ok = Ok::<_, ()>({ crate::api::runtime::JsAsyncRuntime::set_memory_limit( &*api_that_guard, api_limit, ) .await; })?; - Ok(output_ok) + std::result::Result::Ok(output_ok) })() .await, ) @@ -945,7 +946,7 @@ fn wire__crate__api__bytecode__JsBytecode_compile_impl( let output_ok = crate::api::bytecode::JsBytecode::compile(api_module, api_options) .await?; - Ok(output_ok) + std::result::Result::Ok(output_ok) })() .await, ) @@ -990,7 +991,7 @@ fn wire__crate__api__bytecode__JsBytecode_compile_module_bundle_impl( api_options, ) .await?; - Ok(output_ok) + std::result::Result::Ok(output_ok) })() .await, ) @@ -1031,7 +1032,7 @@ fn wire__crate__api__bytecode__JsBytecode_compile_module_bundle_sync_impl( api_entry, api_options, )?; - Ok(output_ok) + std::result::Result::Ok(output_ok) })()) }, ) @@ -1073,7 +1074,7 @@ fn wire__crate__api__bytecode__JsBytecode_compile_script_impl( api_options, ) .await?; - Ok(output_ok) + std::result::Result::Ok(output_ok) })() .await, ) @@ -1114,7 +1115,7 @@ fn wire__crate__api__bytecode__JsBytecode_compile_script_sync_impl( api_source, api_options, )?; - Ok(output_ok) + std::result::Result::Ok(output_ok) })()) }, ) @@ -1148,7 +1149,7 @@ fn wire__crate__api__bytecode__JsBytecode_compile_sync_impl( transform_result_sse::<_, crate::api::error::JsError>((move || { let output_ok = crate::api::bytecode::JsBytecode::compile_sync(api_module, api_options)?; - Ok(output_ok) + std::result::Result::Ok(output_ok) })()) }, ) @@ -1182,7 +1183,7 @@ fn wire__crate__api__bytecode__JsBytecode_validate_impl( (move || async move { let output_ok = crate::api::bytecode::JsBytecode::validate(api_module).await?; - Ok(output_ok) + std::result::Result::Ok(output_ok) })() .await, ) @@ -1220,7 +1221,7 @@ fn wire__crate__api__bytecode__JsBytecode_validate_bundle_impl( (move || async move { let output_ok = crate::api::bytecode::JsBytecode::validate_bundle(api_bundle).await?; - Ok(output_ok) + std::result::Result::Ok(output_ok) })() .await, ) @@ -1254,7 +1255,7 @@ fn wire__crate__api__bytecode__JsBytecode_validate_bundle_sync_impl( deserializer.end(); transform_result_sse::<_, crate::api::error::JsError>((move || { let output_ok = crate::api::bytecode::JsBytecode::validate_bundle_sync(api_bundle)?; - Ok(output_ok) + std::result::Result::Ok(output_ok) })()) }, ) @@ -1288,7 +1289,7 @@ fn wire__crate__api__bytecode__JsBytecode_validate_script_impl( (move || async move { let output_ok = crate::api::bytecode::JsBytecode::validate_script(api_script).await?; - Ok(output_ok) + std::result::Result::Ok(output_ok) })() .await, ) @@ -1321,7 +1322,7 @@ fn wire__crate__api__bytecode__JsBytecode_validate_script_sync_impl( deserializer.end(); transform_result_sse::<_, crate::api::error::JsError>((move || { let output_ok = crate::api::bytecode::JsBytecode::validate_script_sync(api_script)?; - Ok(output_ok) + std::result::Result::Ok(output_ok) })()) }, ) @@ -1351,7 +1352,7 @@ fn wire__crate__api__bytecode__JsBytecode_validate_sync_impl( deserializer.end(); transform_result_sse::<_, crate::api::error::JsError>((move || { let output_ok = crate::api::bytecode::JsBytecode::validate_sync(api_module)?; - Ok(output_ok) + std::result::Result::Ok(output_ok) })()) }, ) @@ -1397,11 +1398,11 @@ fn wire__crate__api__runtime__JsContext_eval_impl( } } let api_that_guard = api_that_guard.unwrap(); - let output_ok = Result::<_, ()>::Ok(crate::api::runtime::JsContext::eval( + let output_ok = Ok::<_, ()>(crate::api::runtime::JsContext::eval( &*api_that_guard, api_code, ))?; - Ok(output_ok) + std::result::Result::Ok(output_ok) })()) }, ) @@ -1447,11 +1448,11 @@ fn wire__crate__api__runtime__JsContext_eval_file_impl( } } let api_that_guard = api_that_guard.unwrap(); - let output_ok = Result::<_, ()>::Ok(crate::api::runtime::JsContext::eval_file( + let output_ok = Ok::<_, ()>(crate::api::runtime::JsContext::eval_file( &*api_that_guard, api_path, ))?; - Ok(output_ok) + std::result::Result::Ok(output_ok) })()) }, ) @@ -1499,12 +1500,12 @@ fn wire__crate__api__runtime__JsContext_eval_file_with_options_impl( } let api_that_guard = api_that_guard.unwrap(); let output_ok = - Result::<_, ()>::Ok(crate::api::runtime::JsContext::eval_file_with_options( + Ok::<_, ()>(crate::api::runtime::JsContext::eval_file_with_options( &*api_that_guard, api_path, api_options, ))?; - Ok(output_ok) + std::result::Result::Ok(output_ok) })()) }, ) @@ -1551,13 +1552,12 @@ fn wire__crate__api__runtime__JsContext_eval_with_options_impl( } } let api_that_guard = api_that_guard.unwrap(); - let output_ok = - Result::<_, ()>::Ok(crate::api::runtime::JsContext::eval_with_options( - &*api_that_guard, - api_code, - api_options, - ))?; - Ok(output_ok) + let output_ok = Ok::<_, ()>(crate::api::runtime::JsContext::eval_with_options( + &*api_that_guard, + api_code, + api_options, + ))?; + std::result::Result::Ok(output_ok) })()) }, ) @@ -1605,7 +1605,7 @@ fn wire__crate__api__runtime__JsContext_from_impl( } let api_runtime_guard = api_runtime_guard.unwrap(); let output_ok = crate::api::runtime::JsContext::from(&*api_runtime_guard)?; - Ok(output_ok) + std::result::Result::Ok(output_ok) })()) }, ) @@ -1652,7 +1652,7 @@ fn wire__crate__api__runtime__JsContext_get_available_modules_impl( let api_that_guard = api_that_guard.unwrap(); let output_ok = crate::api::runtime::JsContext::get_available_modules(&*api_that_guard)?; - Ok(output_ok) + std::result::Result::Ok(output_ok) })()) }, ) @@ -1714,7 +1714,7 @@ fn wire__crate__api__engine__JsEngine_call_impl( api_params, ) .await?; - Ok(output_ok) + std::result::Result::Ok(output_ok) })() .await, ) @@ -1771,7 +1771,7 @@ fn wire__crate__api__engine__JsEngine_clear_pending_modules_impl( let output_ok = crate::api::engine::JsEngine::clear_pending_modules(&*api_that_guard) .await?; - Ok(output_ok) + std::result::Result::Ok(output_ok) })() .await, ) @@ -1827,7 +1827,7 @@ fn wire__crate__api__engine__JsEngine_close_impl( let api_that_guard = api_that_guard.unwrap(); let output_ok = crate::api::engine::JsEngine::close(&*api_that_guard).await?; - Ok(output_ok) + std::result::Result::Ok(output_ok) })() .await, ) @@ -1884,7 +1884,7 @@ fn wire__crate__api__engine__JsEngine_close_gracefully_impl( let output_ok = crate::api::engine::JsEngine::close_gracefully(&*api_that_guard) .await?; - Ok(output_ok) + std::result::Result::Ok(output_ok) })() .await, ) @@ -1933,8 +1933,8 @@ fn wire__crate__api__engine__JsEngine_closed_impl( } let api_that_guard = api_that_guard.unwrap(); let output_ok = - Result::<_, ()>::Ok(crate::api::engine::JsEngine::closed(&*api_that_guard))?; - Ok(output_ok) + Ok::<_, ()>(crate::api::engine::JsEngine::closed(&*api_that_guard))?; + std::result::Result::Ok(output_ok) })()) }, ) @@ -1977,7 +1977,7 @@ fn wire__crate__api__engine__JsEngine_create_impl( api_runtime_options, ) .await?; - Ok(output_ok) + std::result::Result::Ok(output_ok) })() .await, ) @@ -2038,7 +2038,7 @@ fn wire__crate__api__engine__JsEngine_declare_new_bytecode_bundle_impl( api_bundle, ) .await?; - Ok(output_ok) + std::result::Result::Ok(output_ok) })() .await, ) @@ -2098,7 +2098,7 @@ fn wire__crate__api__engine__JsEngine_declare_new_bytecode_module_impl( api_module, ) .await?; - Ok(output_ok) + std::result::Result::Ok(output_ok) })() .await, ) @@ -2159,7 +2159,7 @@ fn wire__crate__api__engine__JsEngine_declare_new_bytecode_modules_impl( api_modules, ) .await?; - Ok(output_ok) + std::result::Result::Ok(output_ok) })() .await, ) @@ -2219,7 +2219,7 @@ fn wire__crate__api__engine__JsEngine_declare_new_module_impl( api_module, ) .await?; - Ok(output_ok) + std::result::Result::Ok(output_ok) })() .await, ) @@ -2279,7 +2279,7 @@ fn wire__crate__api__engine__JsEngine_declare_new_modules_impl( api_modules, ) .await?; - Ok(output_ok) + std::result::Result::Ok(output_ok) })() .await, ) @@ -2327,10 +2327,10 @@ fn wire__crate__api__engine__JsEngine_drain_unhandled_job_errors_impl( } } let api_that_guard = api_that_guard.unwrap(); - let output_ok = Result::<_, ()>::Ok( + let output_ok = Ok::<_, ()>( crate::api::engine::JsEngine::drain_unhandled_job_errors(&*api_that_guard), )?; - Ok(output_ok) + std::result::Result::Ok(output_ok) })()) }, ) @@ -2390,7 +2390,7 @@ fn wire__crate__api__engine__JsEngine_eval_impl( api_options, ) .await?; - Ok(output_ok) + std::result::Result::Ok(output_ok) })() .await, ) @@ -2451,7 +2451,7 @@ fn wire__crate__api__engine__JsEngine_evaluate_bytecode_bundle_impl( api_bundle, ) .await?; - Ok(output_ok) + std::result::Result::Ok(output_ok) })() .await, ) @@ -2511,7 +2511,7 @@ fn wire__crate__api__engine__JsEngine_evaluate_bytecode_module_impl( api_module, ) .await?; - Ok(output_ok) + std::result::Result::Ok(output_ok) })() .await, ) @@ -2571,7 +2571,7 @@ fn wire__crate__api__engine__JsEngine_evaluate_module_impl( api_module, ) .await?; - Ok(output_ok) + std::result::Result::Ok(output_ok) })() .await, ) @@ -2631,7 +2631,7 @@ fn wire__crate__api__engine__JsEngine_evaluate_script_bytecode_impl( api_script, ) .await?; - Ok(output_ok) + std::result::Result::Ok(output_ok) })() .await, ) @@ -2688,7 +2688,7 @@ fn wire__crate__api__engine__JsEngine_get_available_modules_impl( let output_ok = crate::api::engine::JsEngine::get_available_modules(&*api_that_guard) .await?; - Ok(output_ok) + std::result::Result::Ok(output_ok) })() .await, ) @@ -2745,7 +2745,7 @@ fn wire__crate__api__engine__JsEngine_get_declared_modules_impl( let output_ok = crate::api::engine::JsEngine::get_declared_modules(&*api_that_guard) .await?; - Ok(output_ok) + std::result::Result::Ok(output_ok) })() .await, ) @@ -2805,7 +2805,7 @@ fn wire__crate__api__engine__JsEngine_init_impl( let output_ok = crate::api::engine::JsEngine::init(&*api_that_guard, api_bridge) .await?; - Ok(output_ok) + std::result::Result::Ok(output_ok) })() .await, ) @@ -2862,7 +2862,7 @@ fn wire__crate__api__engine__JsEngine_init_without_bridge_impl( let output_ok = crate::api::engine::JsEngine::init_without_bridge(&*api_that_guard) .await?; - Ok(output_ok) + std::result::Result::Ok(output_ok) })() .await, ) @@ -2922,7 +2922,7 @@ fn wire__crate__api__engine__JsEngine_is_module_available_impl( api_module_name, ) .await?; - Ok(output_ok) + std::result::Result::Ok(output_ok) })() .await, ) @@ -2982,7 +2982,7 @@ fn wire__crate__api__engine__JsEngine_is_module_declared_impl( api_module_name, ) .await?; - Ok(output_ok) + std::result::Result::Ok(output_ok) })() .await, ) @@ -3038,7 +3038,7 @@ fn wire__crate__api__engine__JsEngine_memory_usage_impl( let api_that_guard = api_that_guard.unwrap(); let output_ok = crate::api::engine::JsEngine::memory_usage(&*api_that_guard).await?; - Ok(output_ok) + std::result::Result::Ok(output_ok) })() .await, ) @@ -3094,7 +3094,7 @@ fn wire__crate__api__engine__JsEngine_run_gc_impl( let api_that_guard = api_that_guard.unwrap(); let output_ok = crate::api::engine::JsEngine::run_gc(&*api_that_guard).await?; - Ok(output_ok) + std::result::Result::Ok(output_ok) })() .await, ) @@ -3143,8 +3143,8 @@ fn wire__crate__api__engine__JsEngine_running_impl( } let api_that_guard = api_that_guard.unwrap(); let output_ok = - Result::<_, ()>::Ok(crate::api::engine::JsEngine::running(&*api_that_guard))?; - Ok(output_ok) + Ok::<_, ()>(crate::api::engine::JsEngine::running(&*api_that_guard))?; + std::result::Result::Ok(output_ok) })()) }, ) @@ -3201,7 +3201,7 @@ fn wire__crate__api__engine__JsEngine_set_gc_threshold_impl( api_threshold, ) .await?; - Ok(output_ok) + std::result::Result::Ok(output_ok) })() .await, ) @@ -3259,7 +3259,7 @@ fn wire__crate__api__engine__JsEngine_set_info_impl( let output_ok = crate::api::engine::JsEngine::set_info(&*api_that_guard, api_info) .await?; - Ok(output_ok) + std::result::Result::Ok(output_ok) })() .await, ) @@ -3319,7 +3319,7 @@ fn wire__crate__api__engine__JsEngine_set_max_stack_size_impl( api_limit, ) .await?; - Ok(output_ok) + std::result::Result::Ok(output_ok) })() .await, ) @@ -3379,7 +3379,7 @@ fn wire__crate__api__engine__JsEngine_set_memory_limit_impl( api_limit, ) .await?; - Ok(output_ok) + std::result::Result::Ok(output_ok) })() .await, ) @@ -3420,7 +3420,7 @@ fn wire__crate__api__runtime__JsRuntime_create_impl( let output_ok = crate::api::runtime::JsRuntime::create(api_builtins, api_modules) .await?; - Ok(output_ok) + std::result::Result::Ok(output_ok) })() .await, ) @@ -3470,7 +3470,7 @@ fn wire__crate__api__runtime__JsRuntime_execute_pending_job_impl( let api_that_guard = api_that_guard.unwrap(); let output_ok = crate::api::runtime::JsRuntime::execute_pending_job(&*api_that_guard)?; - Ok(output_ok) + std::result::Result::Ok(output_ok) })()) }, ) @@ -3515,10 +3515,10 @@ fn wire__crate__api__runtime__JsRuntime_is_job_pending_impl( } } let api_that_guard = api_that_guard.unwrap(); - let output_ok = Result::<_, ()>::Ok( - crate::api::runtime::JsRuntime::is_job_pending(&*api_that_guard), - )?; - Ok(output_ok) + let output_ok = Ok::<_, ()>(crate::api::runtime::JsRuntime::is_job_pending( + &*api_that_guard, + ))?; + std::result::Result::Ok(output_ok) })()) }, ) @@ -3563,10 +3563,10 @@ fn wire__crate__api__runtime__JsRuntime_memory_usage_impl( } } let api_that_guard = api_that_guard.unwrap(); - let output_ok = Result::<_, ()>::Ok(crate::api::runtime::JsRuntime::memory_usage( + let output_ok = Ok::<_, ()>(crate::api::runtime::JsRuntime::memory_usage( &*api_that_guard, ))?; - Ok(output_ok) + std::result::Result::Ok(output_ok) })()) }, ) @@ -3595,7 +3595,7 @@ fn wire__crate__api__runtime__JsRuntime_new_impl( deserializer.end(); transform_result_sse::<_, crate::api::error::JsError>((move || { let output_ok = crate::api::runtime::JsRuntime::new()?; - Ok(output_ok) + std::result::Result::Ok(output_ok) })()) }, ) @@ -3640,10 +3640,10 @@ fn wire__crate__api__runtime__JsRuntime_run_gc_impl( } } let api_that_guard = api_that_guard.unwrap(); - let output_ok = Result::<_, ()>::Ok({ + let output_ok = Ok::<_, ()>({ crate::api::runtime::JsRuntime::run_gc(&*api_that_guard); })?; - Ok(output_ok) + std::result::Result::Ok(output_ok) })()) }, ) @@ -3689,10 +3689,10 @@ fn wire__crate__api__runtime__JsRuntime_set_dump_flags_impl( } } let api_that_guard = api_that_guard.unwrap(); - let output_ok = Result::<_, ()>::Ok({ + let output_ok = Ok::<_, ()>({ crate::api::runtime::JsRuntime::set_dump_flags(&*api_that_guard, api_flags); })?; - Ok(output_ok) + std::result::Result::Ok(output_ok) })()) }, ) @@ -3738,13 +3738,13 @@ fn wire__crate__api__runtime__JsRuntime_set_gc_threshold_impl( } } let api_that_guard = api_that_guard.unwrap(); - let output_ok = Result::<_, ()>::Ok({ + let output_ok = Ok::<_, ()>({ crate::api::runtime::JsRuntime::set_gc_threshold( &*api_that_guard, api_threshold, ); })?; - Ok(output_ok) + std::result::Result::Ok(output_ok) })()) }, ) @@ -3792,7 +3792,7 @@ fn wire__crate__api__runtime__JsRuntime_set_info_impl( let api_that_guard = api_that_guard.unwrap(); let output_ok = crate::api::runtime::JsRuntime::set_info(&*api_that_guard, api_info)?; - Ok(output_ok) + std::result::Result::Ok(output_ok) })()) }, ) @@ -3838,10 +3838,10 @@ fn wire__crate__api__runtime__JsRuntime_set_max_stack_size_impl( } } let api_that_guard = api_that_guard.unwrap(); - let output_ok = Result::<_, ()>::Ok({ + let output_ok = Ok::<_, ()>({ crate::api::runtime::JsRuntime::set_max_stack_size(&*api_that_guard, api_limit); })?; - Ok(output_ok) + std::result::Result::Ok(output_ok) })()) }, ) @@ -3887,10 +3887,10 @@ fn wire__crate__api__runtime__JsRuntime_set_memory_limit_impl( } } let api_that_guard = api_that_guard.unwrap(); - let output_ok = Result::<_, ()>::Ok({ + let output_ok = Ok::<_, ()>({ crate::api::runtime::JsRuntime::set_memory_limit(&*api_that_guard, api_limit); })?; - Ok(output_ok) + std::result::Result::Ok(output_ok) })()) }, ) @@ -3935,10 +3935,10 @@ fn wire__crate__api__runtime__MemoryUsage_array_count_impl( } } let api_that_guard = api_that_guard.unwrap(); - let output_ok = Result::<_, ()>::Ok( - crate::api::runtime::MemoryUsage::array_count(&*api_that_guard), - )?; - Ok(output_ok) + let output_ok = Ok::<_, ()>(crate::api::runtime::MemoryUsage::array_count( + &*api_that_guard, + ))?; + std::result::Result::Ok(output_ok) })()) }, ) @@ -3983,10 +3983,10 @@ fn wire__crate__api__runtime__MemoryUsage_atom_count_impl( } } let api_that_guard = api_that_guard.unwrap(); - let output_ok = Result::<_, ()>::Ok(crate::api::runtime::MemoryUsage::atom_count( + let output_ok = Ok::<_, ()>(crate::api::runtime::MemoryUsage::atom_count( &*api_that_guard, ))?; - Ok(output_ok) + std::result::Result::Ok(output_ok) })()) }, ) @@ -4031,10 +4031,10 @@ fn wire__crate__api__runtime__MemoryUsage_atom_size_impl( } } let api_that_guard = api_that_guard.unwrap(); - let output_ok = Result::<_, ()>::Ok(crate::api::runtime::MemoryUsage::atom_size( + let output_ok = Ok::<_, ()>(crate::api::runtime::MemoryUsage::atom_size( &*api_that_guard, ))?; - Ok(output_ok) + std::result::Result::Ok(output_ok) })()) }, ) @@ -4079,10 +4079,10 @@ fn wire__crate__api__runtime__MemoryUsage_binary_object_count_impl( } } let api_that_guard = api_that_guard.unwrap(); - let output_ok = Result::<_, ()>::Ok( + let output_ok = Ok::<_, ()>( crate::api::runtime::MemoryUsage::binary_object_count(&*api_that_guard), )?; - Ok(output_ok) + std::result::Result::Ok(output_ok) })()) }, ) @@ -4127,10 +4127,10 @@ fn wire__crate__api__runtime__MemoryUsage_binary_object_size_impl( } } let api_that_guard = api_that_guard.unwrap(); - let output_ok = Result::<_, ()>::Ok( - crate::api::runtime::MemoryUsage::binary_object_size(&*api_that_guard), - )?; - Ok(output_ok) + let output_ok = Ok::<_, ()>(crate::api::runtime::MemoryUsage::binary_object_size( + &*api_that_guard, + ))?; + std::result::Result::Ok(output_ok) })()) }, ) @@ -4175,10 +4175,10 @@ fn wire__crate__api__runtime__MemoryUsage_c_func_count_impl( } } let api_that_guard = api_that_guard.unwrap(); - let output_ok = Result::<_, ()>::Ok( - crate::api::runtime::MemoryUsage::c_func_count(&*api_that_guard), - )?; - Ok(output_ok) + let output_ok = Ok::<_, ()>(crate::api::runtime::MemoryUsage::c_func_count( + &*api_that_guard, + ))?; + std::result::Result::Ok(output_ok) })()) }, ) @@ -4223,10 +4223,10 @@ fn wire__crate__api__runtime__MemoryUsage_fast_array_count_impl( } } let api_that_guard = api_that_guard.unwrap(); - let output_ok = Result::<_, ()>::Ok( - crate::api::runtime::MemoryUsage::fast_array_count(&*api_that_guard), - )?; - Ok(output_ok) + let output_ok = Ok::<_, ()>(crate::api::runtime::MemoryUsage::fast_array_count( + &*api_that_guard, + ))?; + std::result::Result::Ok(output_ok) })()) }, ) @@ -4271,10 +4271,10 @@ fn wire__crate__api__runtime__MemoryUsage_fast_array_elements_impl( } } let api_that_guard = api_that_guard.unwrap(); - let output_ok = Result::<_, ()>::Ok( + let output_ok = Ok::<_, ()>( crate::api::runtime::MemoryUsage::fast_array_elements(&*api_that_guard), )?; - Ok(output_ok) + std::result::Result::Ok(output_ok) })()) }, ) @@ -4319,10 +4319,10 @@ fn wire__crate__api__runtime__MemoryUsage_js_func_code_size_impl( } } let api_that_guard = api_that_guard.unwrap(); - let output_ok = Result::<_, ()>::Ok( - crate::api::runtime::MemoryUsage::js_func_code_size(&*api_that_guard), - )?; - Ok(output_ok) + let output_ok = Ok::<_, ()>(crate::api::runtime::MemoryUsage::js_func_code_size( + &*api_that_guard, + ))?; + std::result::Result::Ok(output_ok) })()) }, ) @@ -4367,10 +4367,10 @@ fn wire__crate__api__runtime__MemoryUsage_js_func_count_impl( } } let api_that_guard = api_that_guard.unwrap(); - let output_ok = Result::<_, ()>::Ok( - crate::api::runtime::MemoryUsage::js_func_count(&*api_that_guard), - )?; - Ok(output_ok) + let output_ok = Ok::<_, ()>(crate::api::runtime::MemoryUsage::js_func_count( + &*api_that_guard, + ))?; + std::result::Result::Ok(output_ok) })()) }, ) @@ -4415,10 +4415,10 @@ fn wire__crate__api__runtime__MemoryUsage_js_func_pc2line_count_impl( } } let api_that_guard = api_that_guard.unwrap(); - let output_ok = Result::<_, ()>::Ok( + let output_ok = Ok::<_, ()>( crate::api::runtime::MemoryUsage::js_func_pc2line_count(&*api_that_guard), )?; - Ok(output_ok) + std::result::Result::Ok(output_ok) })()) }, ) @@ -4463,10 +4463,10 @@ fn wire__crate__api__runtime__MemoryUsage_js_func_pc2line_size_impl( } } let api_that_guard = api_that_guard.unwrap(); - let output_ok = Result::<_, ()>::Ok( + let output_ok = Ok::<_, ()>( crate::api::runtime::MemoryUsage::js_func_pc2line_size(&*api_that_guard), )?; - Ok(output_ok) + std::result::Result::Ok(output_ok) })()) }, ) @@ -4511,10 +4511,10 @@ fn wire__crate__api__runtime__MemoryUsage_js_func_size_impl( } } let api_that_guard = api_that_guard.unwrap(); - let output_ok = Result::<_, ()>::Ok( - crate::api::runtime::MemoryUsage::js_func_size(&*api_that_guard), - )?; - Ok(output_ok) + let output_ok = Ok::<_, ()>(crate::api::runtime::MemoryUsage::js_func_size( + &*api_that_guard, + ))?; + std::result::Result::Ok(output_ok) })()) }, ) @@ -4559,10 +4559,10 @@ fn wire__crate__api__runtime__MemoryUsage_malloc_count_impl( } } let api_that_guard = api_that_guard.unwrap(); - let output_ok = Result::<_, ()>::Ok( - crate::api::runtime::MemoryUsage::malloc_count(&*api_that_guard), - )?; - Ok(output_ok) + let output_ok = Ok::<_, ()>(crate::api::runtime::MemoryUsage::malloc_count( + &*api_that_guard, + ))?; + std::result::Result::Ok(output_ok) })()) }, ) @@ -4607,10 +4607,10 @@ fn wire__crate__api__runtime__MemoryUsage_malloc_limit_impl( } } let api_that_guard = api_that_guard.unwrap(); - let output_ok = Result::<_, ()>::Ok( - crate::api::runtime::MemoryUsage::malloc_limit(&*api_that_guard), - )?; - Ok(output_ok) + let output_ok = Ok::<_, ()>(crate::api::runtime::MemoryUsage::malloc_limit( + &*api_that_guard, + ))?; + std::result::Result::Ok(output_ok) })()) }, ) @@ -4655,10 +4655,10 @@ fn wire__crate__api__runtime__MemoryUsage_malloc_size_impl( } } let api_that_guard = api_that_guard.unwrap(); - let output_ok = Result::<_, ()>::Ok( - crate::api::runtime::MemoryUsage::malloc_size(&*api_that_guard), - )?; - Ok(output_ok) + let output_ok = Ok::<_, ()>(crate::api::runtime::MemoryUsage::malloc_size( + &*api_that_guard, + ))?; + std::result::Result::Ok(output_ok) })()) }, ) @@ -4703,10 +4703,10 @@ fn wire__crate__api__runtime__MemoryUsage_memory_used_count_impl( } } let api_that_guard = api_that_guard.unwrap(); - let output_ok = Result::<_, ()>::Ok( - crate::api::runtime::MemoryUsage::memory_used_count(&*api_that_guard), - )?; - Ok(output_ok) + let output_ok = Ok::<_, ()>(crate::api::runtime::MemoryUsage::memory_used_count( + &*api_that_guard, + ))?; + std::result::Result::Ok(output_ok) })()) }, ) @@ -4751,10 +4751,10 @@ fn wire__crate__api__runtime__MemoryUsage_memory_used_size_impl( } } let api_that_guard = api_that_guard.unwrap(); - let output_ok = Result::<_, ()>::Ok( - crate::api::runtime::MemoryUsage::memory_used_size(&*api_that_guard), - )?; - Ok(output_ok) + let output_ok = Ok::<_, ()>(crate::api::runtime::MemoryUsage::memory_used_size( + &*api_that_guard, + ))?; + std::result::Result::Ok(output_ok) })()) }, ) @@ -4799,10 +4799,10 @@ fn wire__crate__api__runtime__MemoryUsage_obj_count_impl( } } let api_that_guard = api_that_guard.unwrap(); - let output_ok = Result::<_, ()>::Ok(crate::api::runtime::MemoryUsage::obj_count( + let output_ok = Ok::<_, ()>(crate::api::runtime::MemoryUsage::obj_count( &*api_that_guard, ))?; - Ok(output_ok) + std::result::Result::Ok(output_ok) })()) }, ) @@ -4847,10 +4847,9 @@ fn wire__crate__api__runtime__MemoryUsage_obj_size_impl( } } let api_that_guard = api_that_guard.unwrap(); - let output_ok = Result::<_, ()>::Ok(crate::api::runtime::MemoryUsage::obj_size( - &*api_that_guard, - ))?; - Ok(output_ok) + let output_ok = + Ok::<_, ()>(crate::api::runtime::MemoryUsage::obj_size(&*api_that_guard))?; + std::result::Result::Ok(output_ok) })()) }, ) @@ -4895,10 +4894,10 @@ fn wire__crate__api__runtime__MemoryUsage_prop_count_impl( } } let api_that_guard = api_that_guard.unwrap(); - let output_ok = Result::<_, ()>::Ok(crate::api::runtime::MemoryUsage::prop_count( + let output_ok = Ok::<_, ()>(crate::api::runtime::MemoryUsage::prop_count( &*api_that_guard, ))?; - Ok(output_ok) + std::result::Result::Ok(output_ok) })()) }, ) @@ -4943,10 +4942,10 @@ fn wire__crate__api__runtime__MemoryUsage_prop_size_impl( } } let api_that_guard = api_that_guard.unwrap(); - let output_ok = Result::<_, ()>::Ok(crate::api::runtime::MemoryUsage::prop_size( + let output_ok = Ok::<_, ()>(crate::api::runtime::MemoryUsage::prop_size( &*api_that_guard, ))?; - Ok(output_ok) + std::result::Result::Ok(output_ok) })()) }, ) @@ -4991,10 +4990,10 @@ fn wire__crate__api__runtime__MemoryUsage_shape_count_impl( } } let api_that_guard = api_that_guard.unwrap(); - let output_ok = Result::<_, ()>::Ok( - crate::api::runtime::MemoryUsage::shape_count(&*api_that_guard), - )?; - Ok(output_ok) + let output_ok = Ok::<_, ()>(crate::api::runtime::MemoryUsage::shape_count( + &*api_that_guard, + ))?; + std::result::Result::Ok(output_ok) })()) }, ) @@ -5039,10 +5038,10 @@ fn wire__crate__api__runtime__MemoryUsage_shape_size_impl( } } let api_that_guard = api_that_guard.unwrap(); - let output_ok = Result::<_, ()>::Ok(crate::api::runtime::MemoryUsage::shape_size( + let output_ok = Ok::<_, ()>(crate::api::runtime::MemoryUsage::shape_size( &*api_that_guard, ))?; - Ok(output_ok) + std::result::Result::Ok(output_ok) })()) }, ) @@ -5087,10 +5086,10 @@ fn wire__crate__api__runtime__MemoryUsage_str_count_impl( } } let api_that_guard = api_that_guard.unwrap(); - let output_ok = Result::<_, ()>::Ok(crate::api::runtime::MemoryUsage::str_count( + let output_ok = Ok::<_, ()>(crate::api::runtime::MemoryUsage::str_count( &*api_that_guard, ))?; - Ok(output_ok) + std::result::Result::Ok(output_ok) })()) }, ) @@ -5135,10 +5134,9 @@ fn wire__crate__api__runtime__MemoryUsage_str_size_impl( } } let api_that_guard = api_that_guard.unwrap(); - let output_ok = Result::<_, ()>::Ok(crate::api::runtime::MemoryUsage::str_size( - &*api_that_guard, - ))?; - Ok(output_ok) + let output_ok = + Ok::<_, ()>(crate::api::runtime::MemoryUsage::str_size(&*api_that_guard))?; + std::result::Result::Ok(output_ok) })()) }, ) @@ -5183,10 +5181,9 @@ fn wire__crate__api__runtime__MemoryUsage_summary_impl( } } let api_that_guard = api_that_guard.unwrap(); - let output_ok = Result::<_, ()>::Ok(crate::api::runtime::MemoryUsage::summary( - &*api_that_guard, - ))?; - Ok(output_ok) + let output_ok = + Ok::<_, ()>(crate::api::runtime::MemoryUsage::summary(&*api_that_guard))?; + std::result::Result::Ok(output_ok) })()) }, ) @@ -5231,10 +5228,10 @@ fn wire__crate__api__runtime__MemoryUsage_total_allocations_impl( } } let api_that_guard = api_that_guard.unwrap(); - let output_ok = Result::<_, ()>::Ok( - crate::api::runtime::MemoryUsage::total_allocations(&*api_that_guard), - )?; - Ok(output_ok) + let output_ok = Ok::<_, ()>(crate::api::runtime::MemoryUsage::total_allocations( + &*api_that_guard, + ))?; + std::result::Result::Ok(output_ok) })()) }, ) @@ -5279,10 +5276,10 @@ fn wire__crate__api__runtime__MemoryUsage_total_memory_impl( } } let api_that_guard = api_that_guard.unwrap(); - let output_ok = Result::<_, ()>::Ok( - crate::api::runtime::MemoryUsage::total_memory(&*api_that_guard), - )?; - Ok(output_ok) + let output_ok = Ok::<_, ()>(crate::api::runtime::MemoryUsage::total_memory( + &*api_that_guard, + ))?; + std::result::Result::Ok(output_ok) })()) }, ) @@ -5312,10 +5309,10 @@ fn wire__crate__api__init_app_impl( deserializer.end(); move |context| { transform_result_sse::<_, ()>((move || { - let output_ok = Result::<_, ()>::Ok({ + let output_ok = Ok::<_, ()>({ crate::api::init_app(); })?; - Ok(output_ok) + std::result::Result::Ok(output_ok) })()) } }, @@ -5344,8 +5341,8 @@ fn wire__crate__api__source__js_builtin_options_all_impl( flutter_rust_bridge::for_generated::SseDeserializer::new(message); deserializer.end(); transform_result_sse::<_, ()>((move || { - let output_ok = Result::<_, ()>::Ok(crate::api::source::JsBuiltinOptions::all())?; - Ok(output_ok) + let output_ok = Ok::<_, ()>(crate::api::source::JsBuiltinOptions::all())?; + std::result::Result::Ok(output_ok) })()) }, ) @@ -5375,9 +5372,8 @@ fn wire__crate__api__source__js_builtin_options_default_impl( deserializer.end(); move |context| { transform_result_sse::<_, ()>((move || { - let output_ok = - Result::<_, ()>::Ok(crate::api::source::JsBuiltinOptions::default())?; - Ok(output_ok) + let output_ok = Ok::<_, ()>(crate::api::source::JsBuiltinOptions::default())?; + std::result::Result::Ok(output_ok) })()) } }, @@ -5406,9 +5402,8 @@ fn wire__crate__api__source__js_builtin_options_essential_impl( flutter_rust_bridge::for_generated::SseDeserializer::new(message); deserializer.end(); transform_result_sse::<_, ()>((move || { - let output_ok = - Result::<_, ()>::Ok(crate::api::source::JsBuiltinOptions::essential())?; - Ok(output_ok) + let output_ok = Ok::<_, ()>(crate::api::source::JsBuiltinOptions::essential())?; + std::result::Result::Ok(output_ok) })()) }, ) @@ -5436,8 +5431,8 @@ fn wire__crate__api__source__js_builtin_options_node_impl( flutter_rust_bridge::for_generated::SseDeserializer::new(message); deserializer.end(); transform_result_sse::<_, ()>((move || { - let output_ok = Result::<_, ()>::Ok(crate::api::source::JsBuiltinOptions::node())?; - Ok(output_ok) + let output_ok = Ok::<_, ()>(crate::api::source::JsBuiltinOptions::node())?; + std::result::Result::Ok(output_ok) })()) }, ) @@ -5465,8 +5460,8 @@ fn wire__crate__api__source__js_builtin_options_none_impl( flutter_rust_bridge::for_generated::SseDeserializer::new(message); deserializer.end(); transform_result_sse::<_, ()>((move || { - let output_ok = Result::<_, ()>::Ok(crate::api::source::JsBuiltinOptions::none())?; - Ok(output_ok) + let output_ok = Ok::<_, ()>(crate::api::source::JsBuiltinOptions::none())?; + std::result::Result::Ok(output_ok) })()) }, ) @@ -5494,8 +5489,8 @@ fn wire__crate__api__source__js_builtin_options_web_impl( flutter_rust_bridge::for_generated::SseDeserializer::new(message); deserializer.end(); transform_result_sse::<_, ()>((move || { - let output_ok = Result::<_, ()>::Ok(crate::api::source::JsBuiltinOptions::web())?; - Ok(output_ok) + let output_ok = Ok::<_, ()>(crate::api::source::JsBuiltinOptions::web())?; + std::result::Result::Ok(output_ok) })()) }, ) @@ -5526,8 +5521,8 @@ fn wire__crate__api__source__js_bytecode_endianness_default_impl( move |context| { transform_result_sse::<_, ()>((move || { let output_ok = - Result::<_, ()>::Ok(crate::api::source::JsBytecodeEndianness::default())?; - Ok(output_ok) + Ok::<_, ()>(crate::api::source::JsBytecodeEndianness::default())?; + std::result::Result::Ok(output_ok) })()) } }, @@ -5557,9 +5552,8 @@ fn wire__crate__api__source__js_code_is_bytes_impl( let api_that = ::sse_decode(&mut deserializer); deserializer.end(); transform_result_sse::<_, ()>((move || { - let output_ok = - Result::<_, ()>::Ok(crate::api::source::JsCode::is_bytes(&api_that))?; - Ok(output_ok) + let output_ok = Ok::<_, ()>(crate::api::source::JsCode::is_bytes(&api_that))?; + std::result::Result::Ok(output_ok) })()) }, ) @@ -5588,9 +5582,8 @@ fn wire__crate__api__source__js_code_is_code_impl( let api_that = ::sse_decode(&mut deserializer); deserializer.end(); transform_result_sse::<_, ()>((move || { - let output_ok = - Result::<_, ()>::Ok(crate::api::source::JsCode::is_code(&api_that))?; - Ok(output_ok) + let output_ok = Ok::<_, ()>(crate::api::source::JsCode::is_code(&api_that))?; + std::result::Result::Ok(output_ok) })()) }, ) @@ -5619,9 +5612,8 @@ fn wire__crate__api__source__js_code_is_path_impl( let api_that = ::sse_decode(&mut deserializer); deserializer.end(); transform_result_sse::<_, ()>((move || { - let output_ok = - Result::<_, ()>::Ok(crate::api::source::JsCode::is_path(&api_that))?; - Ok(output_ok) + let output_ok = Ok::<_, ()>(crate::api::source::JsCode::is_path(&api_that))?; + std::result::Result::Ok(output_ok) })()) }, ) @@ -5652,8 +5644,8 @@ fn wire__crate__api__engine__js_engine_runtime_options_default_impl( move |context| { transform_result_sse::<_, ()>((move || { let output_ok = - Result::<_, ()>::Ok(crate::api::engine::JsEngineRuntimeOptions::default())?; - Ok(output_ok) + Ok::<_, ()>(crate::api::engine::JsEngineRuntimeOptions::default())?; + std::result::Result::Ok(output_ok) })()) } }, @@ -5683,8 +5675,8 @@ fn wire__crate__api__error__js_error_code_impl( let api_that = ::sse_decode(&mut deserializer); deserializer.end(); transform_result_sse::<_, ()>((move || { - let output_ok = Result::<_, ()>::Ok(crate::api::error::JsError::code(&api_that))?; - Ok(output_ok) + let output_ok = Ok::<_, ()>(crate::api::error::JsError::code(&api_that))?; + std::result::Result::Ok(output_ok) })()) }, ) @@ -5713,9 +5705,8 @@ fn wire__crate__api__error__js_error_is_recoverable_impl( let api_that = ::sse_decode(&mut deserializer); deserializer.end(); transform_result_sse::<_, ()>((move || { - let output_ok = - Result::<_, ()>::Ok(crate::api::error::JsError::is_recoverable(&api_that))?; - Ok(output_ok) + let output_ok = Ok::<_, ()>(crate::api::error::JsError::is_recoverable(&api_that))?; + std::result::Result::Ok(output_ok) })()) }, ) @@ -5744,9 +5735,8 @@ fn wire__crate__api__error__js_error_to_string_impl( let api_that = ::sse_decode(&mut deserializer); deserializer.end(); transform_result_sse::<_, ()>((move || { - let output_ok = - Result::<_, ()>::Ok(crate::api::error::JsError::to_string(&api_that))?; - Ok(output_ok) + let output_ok = Ok::<_, ()>(crate::api::error::JsError::to_string(&api_that))?; + std::result::Result::Ok(output_ok) })()) }, ) @@ -5776,9 +5766,8 @@ fn wire__crate__api__source__js_eval_options_default_impl( deserializer.end(); move |context| { transform_result_sse::<_, ()>((move || { - let output_ok = - Result::<_, ()>::Ok(crate::api::source::JsEvalOptions::default())?; - Ok(output_ok) + let output_ok = Ok::<_, ()>(crate::api::source::JsEvalOptions::default())?; + std::result::Result::Ok(output_ok) })()) } }, @@ -5807,8 +5796,8 @@ fn wire__crate__api__source__js_eval_options_defaults_impl( flutter_rust_bridge::for_generated::SseDeserializer::new(message); deserializer.end(); transform_result_sse::<_, ()>((move || { - let output_ok = Result::<_, ()>::Ok(crate::api::source::JsEvalOptions::defaults())?; - Ok(output_ok) + let output_ok = Ok::<_, ()>(crate::api::source::JsEvalOptions::defaults())?; + std::result::Result::Ok(output_ok) })()) }, ) @@ -5836,8 +5825,8 @@ fn wire__crate__api__source__js_eval_options_module_impl( flutter_rust_bridge::for_generated::SseDeserializer::new(message); deserializer.end(); transform_result_sse::<_, ()>((move || { - let output_ok = Result::<_, ()>::Ok(crate::api::source::JsEvalOptions::module())?; - Ok(output_ok) + let output_ok = Ok::<_, ()>(crate::api::source::JsEvalOptions::module())?; + std::result::Result::Ok(output_ok) })()) }, ) @@ -5869,13 +5858,13 @@ fn wire__crate__api__source__js_eval_options_new_impl( let api_promise = >::sse_decode(&mut deserializer); deserializer.end(); transform_result_sse::<_, ()>((move || { - let output_ok = Result::<_, ()>::Ok(crate::api::source::JsEvalOptions::new( + let output_ok = Ok::<_, ()>(crate::api::source::JsEvalOptions::new( api_global, api_strict, api_backtrace_barrier, api_promise, ))?; - Ok(output_ok) + std::result::Result::Ok(output_ok) })()) }, ) @@ -5903,9 +5892,8 @@ fn wire__crate__api__source__js_eval_options_with_promise_impl( flutter_rust_bridge::for_generated::SseDeserializer::new(message); deserializer.end(); transform_result_sse::<_, ()>((move || { - let output_ok = - Result::<_, ()>::Ok(crate::api::source::JsEvalOptions::with_promise())?; - Ok(output_ok) + let output_ok = Ok::<_, ()>(crate::api::source::JsEvalOptions::with_promise())?; + std::result::Result::Ok(output_ok) })()) }, ) @@ -5936,10 +5924,11 @@ fn wire__crate__api__source__js_module_bytecode_bundle_new_impl( >::sse_decode(&mut deserializer); deserializer.end(); transform_result_sse::<_, ()>((move || { - let output_ok = Result::<_, ()>::Ok( - crate::api::source::JsModuleBytecodeBundle::new(api_entry, api_modules), - )?; - Ok(output_ok) + let output_ok = Ok::<_, ()>(crate::api::source::JsModuleBytecodeBundle::new( + api_entry, + api_modules, + ))?; + std::result::Result::Ok(output_ok) })()) }, ) @@ -5969,10 +5958,10 @@ fn wire__crate__api__source__js_module_bytecode_new_impl( let api_bytes = >::sse_decode(&mut deserializer); deserializer.end(); transform_result_sse::<_, ()>((move || { - let output_ok = Result::<_, ()>::Ok(crate::api::source::JsModuleBytecode::new( + let output_ok = Ok::<_, ()>(crate::api::source::JsModuleBytecode::new( api_name, api_bytes, ))?; - Ok(output_ok) + std::result::Result::Ok(output_ok) })()) }, ) @@ -6002,10 +5991,9 @@ fn wire__crate__api__source__js_module_bytecode_options_default_impl( deserializer.end(); move |context| { transform_result_sse::<_, ()>((move || { - let output_ok = Result::<_, ()>::Ok( - crate::api::source::JsModuleBytecodeOptions::default(), - )?; - Ok(output_ok) + let output_ok = + Ok::<_, ()>(crate::api::source::JsModuleBytecodeOptions::default())?; + std::result::Result::Ok(output_ok) })()) } }, @@ -6035,8 +6023,8 @@ fn wire__crate__api__source__js_module_bytecode_options_defaults_impl( deserializer.end(); transform_result_sse::<_, ()>((move || { let output_ok = - Result::<_, ()>::Ok(crate::api::source::JsModuleBytecodeOptions::defaults())?; - Ok(output_ok) + Ok::<_, ()>(crate::api::source::JsModuleBytecodeOptions::defaults())?; + std::result::Result::Ok(output_ok) })()) }, ) @@ -6066,10 +6054,9 @@ fn wire__crate__api__source__js_module_bytes_impl( let api_bytes = >::sse_decode(&mut deserializer); deserializer.end(); transform_result_sse::<_, ()>((move || { - let output_ok = Result::<_, ()>::Ok(crate::api::source::JsModule::bytes( - api_module, api_bytes, - ))?; - Ok(output_ok) + let output_ok = + Ok::<_, ()>(crate::api::source::JsModule::bytes(api_module, api_bytes))?; + std::result::Result::Ok(output_ok) })()) }, ) @@ -6100,8 +6087,8 @@ fn wire__crate__api__source__js_module_code_impl( deserializer.end(); transform_result_sse::<_, ()>((move || { let output_ok = - Result::<_, ()>::Ok(crate::api::source::JsModule::code(api_module, api_code))?; - Ok(output_ok) + Ok::<_, ()>(crate::api::source::JsModule::code(api_module, api_code))?; + std::result::Result::Ok(output_ok) })()) }, ) @@ -6132,8 +6119,8 @@ fn wire__crate__api__source__js_module_new_impl( deserializer.end(); transform_result_sse::<_, ()>((move || { let output_ok = - Result::<_, ()>::Ok(crate::api::source::JsModule::new(api_name, api_source))?; - Ok(output_ok) + Ok::<_, ()>(crate::api::source::JsModule::new(api_name, api_source))?; + std::result::Result::Ok(output_ok) })()) }, ) @@ -6164,8 +6151,8 @@ fn wire__crate__api__source__js_module_path_impl( deserializer.end(); transform_result_sse::<_, ()>((move || { let output_ok = - Result::<_, ()>::Ok(crate::api::source::JsModule::path(api_module, api_path))?; - Ok(output_ok) + Ok::<_, ()>(crate::api::source::JsModule::path(api_module, api_path))?; + std::result::Result::Ok(output_ok) })()) }, ) @@ -6195,10 +6182,10 @@ fn wire__crate__api__source__js_script_bytecode_new_impl( let api_bytes = >::sse_decode(&mut deserializer); deserializer.end(); transform_result_sse::<_, ()>((move || { - let output_ok = Result::<_, ()>::Ok(crate::api::source::JsScriptBytecode::new( + let output_ok = Ok::<_, ()>(crate::api::source::JsScriptBytecode::new( api_name, api_bytes, ))?; - Ok(output_ok) + std::result::Result::Ok(output_ok) })()) }, ) @@ -6228,10 +6215,9 @@ fn wire__crate__api__source__js_script_bytecode_options_default_impl( deserializer.end(); move |context| { transform_result_sse::<_, ()>((move || { - let output_ok = Result::<_, ()>::Ok( - crate::api::source::JsScriptBytecodeOptions::default(), - )?; - Ok(output_ok) + let output_ok = + Ok::<_, ()>(crate::api::source::JsScriptBytecodeOptions::default())?; + std::result::Result::Ok(output_ok) })()) } }, @@ -6261,8 +6247,8 @@ fn wire__crate__api__source__js_script_bytecode_options_defaults_impl( deserializer.end(); transform_result_sse::<_, ()>((move || { let output_ok = - Result::<_, ()>::Ok(crate::api::source::JsScriptBytecodeOptions::defaults())?; - Ok(output_ok) + Ok::<_, ()>(crate::api::source::JsScriptBytecodeOptions::defaults())?; + std::result::Result::Ok(output_ok) })()) }, ) @@ -6292,8 +6278,8 @@ fn wire__crate__api__value__js_value_default_impl( deserializer.end(); move |context| { transform_result_sse::<_, ()>((move || { - let output_ok = Result::<_, ()>::Ok(crate::api::value::JsValue::default())?; - Ok(output_ok) + let output_ok = Ok::<_, ()>(crate::api::value::JsValue::default())?; + std::result::Result::Ok(output_ok) })()) } }, @@ -6323,9 +6309,8 @@ fn wire__crate__api__value__js_value_is_array_impl( let api_that = ::sse_decode(&mut deserializer); deserializer.end(); transform_result_sse::<_, ()>((move || { - let output_ok = - Result::<_, ()>::Ok(crate::api::value::JsValue::is_array(&api_that))?; - Ok(output_ok) + let output_ok = Ok::<_, ()>(crate::api::value::JsValue::is_array(&api_that))?; + std::result::Result::Ok(output_ok) })()) }, ) @@ -6354,9 +6339,8 @@ fn wire__crate__api__value__js_value_is_boolean_impl( let api_that = ::sse_decode(&mut deserializer); deserializer.end(); transform_result_sse::<_, ()>((move || { - let output_ok = - Result::<_, ()>::Ok(crate::api::value::JsValue::is_boolean(&api_that))?; - Ok(output_ok) + let output_ok = Ok::<_, ()>(crate::api::value::JsValue::is_boolean(&api_that))?; + std::result::Result::Ok(output_ok) })()) }, ) @@ -6385,9 +6369,8 @@ fn wire__crate__api__value__js_value_is_bytes_impl( let api_that = ::sse_decode(&mut deserializer); deserializer.end(); transform_result_sse::<_, ()>((move || { - let output_ok = - Result::<_, ()>::Ok(crate::api::value::JsValue::is_bytes(&api_that))?; - Ok(output_ok) + let output_ok = Ok::<_, ()>(crate::api::value::JsValue::is_bytes(&api_that))?; + std::result::Result::Ok(output_ok) })()) }, ) @@ -6416,9 +6399,8 @@ fn wire__crate__api__value__js_value_is_date_impl( let api_that = ::sse_decode(&mut deserializer); deserializer.end(); transform_result_sse::<_, ()>((move || { - let output_ok = - Result::<_, ()>::Ok(crate::api::value::JsValue::is_date(&api_that))?; - Ok(output_ok) + let output_ok = Ok::<_, ()>(crate::api::value::JsValue::is_date(&api_that))?; + std::result::Result::Ok(output_ok) })()) }, ) @@ -6447,9 +6429,8 @@ fn wire__crate__api__value__js_value_is_none_impl( let api_that = ::sse_decode(&mut deserializer); deserializer.end(); transform_result_sse::<_, ()>((move || { - let output_ok = - Result::<_, ()>::Ok(crate::api::value::JsValue::is_none(&api_that))?; - Ok(output_ok) + let output_ok = Ok::<_, ()>(crate::api::value::JsValue::is_none(&api_that))?; + std::result::Result::Ok(output_ok) })()) }, ) @@ -6478,9 +6459,8 @@ fn wire__crate__api__value__js_value_is_number_impl( let api_that = ::sse_decode(&mut deserializer); deserializer.end(); transform_result_sse::<_, ()>((move || { - let output_ok = - Result::<_, ()>::Ok(crate::api::value::JsValue::is_number(&api_that))?; - Ok(output_ok) + let output_ok = Ok::<_, ()>(crate::api::value::JsValue::is_number(&api_that))?; + std::result::Result::Ok(output_ok) })()) }, ) @@ -6509,9 +6489,8 @@ fn wire__crate__api__value__js_value_is_object_impl( let api_that = ::sse_decode(&mut deserializer); deserializer.end(); transform_result_sse::<_, ()>((move || { - let output_ok = - Result::<_, ()>::Ok(crate::api::value::JsValue::is_object(&api_that))?; - Ok(output_ok) + let output_ok = Ok::<_, ()>(crate::api::value::JsValue::is_object(&api_that))?; + std::result::Result::Ok(output_ok) })()) }, ) @@ -6540,9 +6519,8 @@ fn wire__crate__api__value__js_value_is_primitive_impl( let api_that = ::sse_decode(&mut deserializer); deserializer.end(); transform_result_sse::<_, ()>((move || { - let output_ok = - Result::<_, ()>::Ok(crate::api::value::JsValue::is_primitive(&api_that))?; - Ok(output_ok) + let output_ok = Ok::<_, ()>(crate::api::value::JsValue::is_primitive(&api_that))?; + std::result::Result::Ok(output_ok) })()) }, ) @@ -6571,9 +6549,8 @@ fn wire__crate__api__value__js_value_is_string_impl( let api_that = ::sse_decode(&mut deserializer); deserializer.end(); transform_result_sse::<_, ()>((move || { - let output_ok = - Result::<_, ()>::Ok(crate::api::value::JsValue::is_string(&api_that))?; - Ok(output_ok) + let output_ok = Ok::<_, ()>(crate::api::value::JsValue::is_string(&api_that))?; + std::result::Result::Ok(output_ok) })()) }, ) @@ -6602,9 +6579,8 @@ fn wire__crate__api__value__js_value_type_name_impl( let api_that = ::sse_decode(&mut deserializer); deserializer.end(); transform_result_sse::<_, ()>((move || { - let output_ok = - Result::<_, ()>::Ok(crate::api::value::JsValue::type_name(&api_that))?; - Ok(output_ok) + let output_ok = Ok::<_, ()>(crate::api::value::JsValue::type_name(&api_that))?; + std::result::Result::Ok(output_ok) })()) }, ) @@ -9329,7 +9305,7 @@ impl SseEncode for usize { #[cfg(not(target_family = "wasm"))] mod io { // This file is automatically generated, so please do not edit it. - // @generated by `flutter_rust_bridge`@ 2.12.0. + // @generated by `flutter_rust_bridge`@ 2.13.0. // Section: imports @@ -9452,7 +9428,7 @@ pub use io::*; #[cfg(target_family = "wasm")] mod web { // This file is automatically generated, so please do not edit it. - // @generated by `flutter_rust_bridge`@ 2.12.0. + // @generated by `flutter_rust_bridge`@ 2.13.0. // Section: imports diff --git a/macos/fjs.podspec b/macos/fjs.podspec index ddfc401..00c17a7 100644 --- a/macos/fjs.podspec +++ b/macos/fjs.podspec @@ -4,7 +4,7 @@ # Pod::Spec.new do |s| s.name = 'fjs' - s.version = '3.3.1' + s.version = '3.3.2' s.summary = 'A high-performance JavaScript runtime for Flutter applications, built with Rust and powered by QuickJS.' s.description = <<-DESC A high-performance JavaScript runtime for Flutter applications, built with Rust and powered by QuickJS. diff --git a/pubspec.yaml b/pubspec.yaml index e2e8828..0675287 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -1,6 +1,6 @@ name: fjs description: "A high-performance JavaScript runtime for Flutter applications, built with Rust and powered by QuickJS." -version: 3.3.1 +version: 3.3.2 homepage: https://github.com/fluttercandies/fjs repository: https://github.com/fluttercandies/fjs issue_tracker: https://github.com/fluttercandies/fjs/issues @@ -23,7 +23,7 @@ dependencies: # newer releases, which tripped the generator's auto-upgrade into # rewriting this file. Keep resolution capped to the codegen's minor # line, pinned in build-all-platforms.yml. - flutter_rust_bridge: ">=2.12.0 <2.13.0" + flutter_rust_bridge: ">=2.13.0 <2.14.0" freezed_annotation: ^3.1.0 plugin_platform_interface: ^2.1.8 diff --git a/tool/check_darwin_package_support.sh b/tool/check_darwin_package_support.sh index d90c642..f59fb05 100755 --- a/tool/check_darwin_package_support.sh +++ b/tool/check_darwin_package_support.sh @@ -98,8 +98,8 @@ EXPECTED_FRB_CONTENT_HASH=-2005216402 DART_EXECUTABLE="${CARGOKIT_DART_EXECUTABLE:-dart}" check_version_invariants() { - [ "$PACKAGE_VERSION" = "3.3.1" ] || - fail "pubspec.yaml version must be 3.3.1, found $PACKAGE_VERSION" + [ "$PACKAGE_VERSION" = "3.3.2" ] || + fail "pubspec.yaml version must be 3.3.2, found $PACKAGE_VERSION" cargo_version="$(awk ' /^\[package\]$/ { in_package = 1; next } From bfe3be08c0779ccd37121bf7f136978062e6a57a Mon Sep 17 00:00:00 2001 From: iota9star Date: Wed, 30 Sep 2026 11:02:49 +0800 Subject: [PATCH 2/6] chore: pin the FRB runtime with an exact =2.13.0 constraint --- CHANGELOG.md | 2 +- pubspec.yaml | 8 +++----- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8b1a1da..2d66458 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,7 +2,7 @@ ## 3.3.2 -* **INTERNAL**: Upgraded `flutter_rust_bridge` to 2.13.0 — codegen, runtime dependency, and regenerated bindings. The bridge content hash is unchanged from 2.12.0, so the wire format stays compatible. CI installs codegen 2.13.0 and the root dependency stays capped to the codegen minor line (`>=2.13.0 <2.14.0`). +* **INTERNAL**: Upgraded `flutter_rust_bridge` to 2.13.0 — codegen, runtime dependency, and regenerated bindings. The bridge content hash is unchanged from 2.12.0, so the wire format stays compatible. CI installs codegen 2.13.0 and the root dependency pins the runtime with an exact constraint (`=2.13.0`), matching the codegen like the Rust side does. ## 3.3.1 diff --git a/pubspec.yaml b/pubspec.yaml index 0675287..02af243 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -19,11 +19,9 @@ dependencies: flutter: sdk: flutter # FRB requires the runtime package to match the pinned codegen exactly - # (it enforces this at run time); an unconstrained caret let CI resolve - # newer releases, which tripped the generator's auto-upgrade into - # rewriting this file. Keep resolution capped to the codegen's minor - # line, pinned in build-all-platforms.yml. - flutter_rust_bridge: ">=2.13.0 <2.14.0" + # (it enforces this at run time), so pin it with an exact constraint; + # the codegen version is pinned in build-all-platforms.yml. + flutter_rust_bridge: "=2.13.0" freezed_annotation: ^3.1.0 plugin_platform_interface: ^2.1.8 From 261c752f8dd882a865ba8e9b5b723bfc353c2dd7 Mon Sep 17 00:00:00 2001 From: iota9star Date: Wed, 30 Sep 2026 11:05:21 +0800 Subject: [PATCH 3/6] fix: tolerate only the expected FRB exact-pin warning in the pub dry-run pub does not support the = operator and warns when a dependency is pinned to a single version. The flutter_rust_bridge pin is deliberate (the bridge enforces runtime == codegen), so the release script now accepts exactly that one warning and still fails on anything else. --- CHANGELOG.md | 2 +- analysis_options.yaml | 7 +++++++ pubspec.yaml | 2 +- tool/prepare_darwin_release.sh | 22 +++++++++++++++++++++- 4 files changed, 30 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2d66458..d92d2e9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,7 +2,7 @@ ## 3.3.2 -* **INTERNAL**: Upgraded `flutter_rust_bridge` to 2.13.0 — codegen, runtime dependency, and regenerated bindings. The bridge content hash is unchanged from 2.12.0, so the wire format stays compatible. CI installs codegen 2.13.0 and the root dependency pins the runtime with an exact constraint (`=2.13.0`), matching the codegen like the Rust side does. +* **INTERNAL**: Upgraded `flutter_rust_bridge` to 2.13.0 — codegen, runtime dependency, and regenerated bindings. The bridge content hash is unchanged from 2.12.0, so the wire format stays compatible. CI installs codegen 2.13.0 and the root dependency pins the runtime with an exact bare-version constraint (`2.13.0`), matching the codegen like the Rust side does. ## 3.3.1 diff --git a/analysis_options.yaml b/analysis_options.yaml index 94c8a5a..ea8baec 100644 --- a/analysis_options.yaml +++ b/analysis_options.yaml @@ -3,6 +3,13 @@ include: package:flutter_lints/flutter.yaml analyzer: exclude: - lib/src/frb/** + - build/** + - android/** + - ios/** + - web/** + - windows/** + - macos/** + - linux/** linter: rules: diff --git a/pubspec.yaml b/pubspec.yaml index 02af243..b888894 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -21,7 +21,7 @@ dependencies: # FRB requires the runtime package to match the pinned codegen exactly # (it enforces this at run time), so pin it with an exact constraint; # the codegen version is pinned in build-all-platforms.yml. - flutter_rust_bridge: "=2.13.0" + flutter_rust_bridge: "2.13.0" freezed_annotation: ^3.1.0 plugin_platform_interface: ^2.1.8 diff --git a/tool/prepare_darwin_release.sh b/tool/prepare_darwin_release.sh index 534fd8b..ddfa7ff 100755 --- a/tool/prepare_darwin_release.sh +++ b/tool/prepare_darwin_release.sh @@ -85,7 +85,27 @@ cleanup_release_temp RELEASE_TEMP_DIR="" pod ipc spec "$ROOT_DIR/darwin/fjs.podspec" >/dev/null -(cd "$ROOT_DIR" && flutter pub publish --dry-run) + +# The runtime dependency is pinned to the exact FRB codegen version because +# FRB enforces runtime == codegen at run time, so pub's "should allow more +# than one version" warning for flutter_rust_bridge is expected; it is the +# only warning this script tolerates. Anything else still fails the release. +publish_log="$(mktemp "$ARTIFACT_DIR/.fjs-pub-dry-run.XXXXXX")" +publish_status=0 +(cd "$ROOT_DIR" && flutter pub publish --dry-run) >"$publish_log" 2>&1 || publish_status=$? +total_warnings="$(sed -nE 's/^Package has ([0-9]+) warnings?\.$/\1/p' "$publish_log" | tail -n 1)" +[ -n "$total_warnings" ] || total_warnings=0 +frb_pin_warnings="$(grep -c 'should allow more than one version' "$publish_log" || true)" +unexpected_warnings=$((total_warnings - frb_pin_warnings)) +if [ "$unexpected_warnings" -gt 0 ] || + { [ "$publish_status" -ne 0 ] && [ "$frb_pin_warnings" -eq 0 ]; } || + grep -q '^Error' "$publish_log"; then + cat "$publish_log" >&2 + echo "error: pub publish dry-run failed or reported unexpected warnings ($unexpected_warnings)" >&2 + rm -f "$publish_log" + exit 1 +fi +rm -f "$publish_log" echo "Darwin release artifact: $ARTIFACT_DIR/fjs.xcframework.zip" echo "SwiftPM checksum: $(cat "$ARTIFACT_DIR/fjs.xcframework.zip.checksum")" From a3338cb56a4330513678b32f09c386b0c4b544bd Mon Sep 17 00:00:00 2001 From: iota9star Date: Wed, 30 Sep 2026 11:05:53 +0800 Subject: [PATCH 4/6] chore: assert the FRB pin warning whitelist stays wired --- tool/check_darwin_package_support.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/tool/check_darwin_package_support.sh b/tool/check_darwin_package_support.sh index f59fb05..fccee82 100755 --- a/tool/check_darwin_package_support.sh +++ b/tool/check_darwin_package_support.sh @@ -339,6 +339,7 @@ fjs.xcframework.zip.checksum' require_contains "tool/prepare_darwin_release.sh" "--require-artifact" require_contains "tool/prepare_darwin_release.sh" "check_frb_codegen.sh" require_contains "tool/prepare_darwin_release.sh" "flutter pub publish --dry-run" + require_contains "tool/prepare_darwin_release.sh" "should allow more than one version" require_contains "tool/check_frb_codegen.sh" "FRB_FMT_TOOLCHAIN=nightly" require_contains ".github/workflows/build-all-platforms.yml" \ "rustup toolchain install nightly --profile minimal --component rustfmt" From 80db84fb72e93c93906ffd07ae98a050f114c278 Mon Sep 17 00:00:00 2001 From: iota9star Date: Wed, 30 Sep 2026 11:18:52 +0800 Subject: [PATCH 5/6] fix: match pubspec.lock canonical blank-line placement --- example/pubspec.lock | 1 - 1 file changed, 1 deletion(-) diff --git a/example/pubspec.lock b/example/pubspec.lock index b14f676..8c7bbef 100644 --- a/example/pubspec.lock +++ b/example/pubspec.lock @@ -334,7 +334,6 @@ packages: url: "https://pub.dev" source: hosted version: "1.3.0" - matcher: dependency: transitive description: From 69013316824e4530e84cbddd4d67883c3d96233c Mon Sep 17 00:00:00 2001 From: iota9star Date: Wed, 30 Sep 2026 11:41:17 +0800 Subject: [PATCH 6/6] fix: regenerate FRB headers under the current nightly The floating nightly installed locally was from June while CI installs the current one, and the newer rustc prints one fewer trait impl into the ignore header. Regenerate so both agree. --- lib/src/frb/api/source.dart | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/src/frb/api/source.dart b/lib/src/frb/api/source.dart index a11797d..0fe1e1d 100644 --- a/lib/src/frb/api/source.dart +++ b/lib/src/frb/api/source.dart @@ -9,7 +9,7 @@ import 'package:freezed_annotation/freezed_annotation.dart' hide protected; part 'source.freezed.dart'; // These functions are ignored because they are not marked as `pub`: `bounded_read_capacity`, `ensure_within_size_limit`, `read_file_bounded_sync`, `read_file_bounded` -// These function are ignored because they are on traits that is not defined in current crate (put an empty `#[frb]` on it to unignore): `assert_fields_are_eq`, `assert_fields_are_eq`, `assert_fields_are_eq`, `assert_fields_are_eq`, `assert_fields_are_eq`, `clone`, `clone`, `clone`, `clone`, `clone`, `clone`, `clone`, `clone`, `clone`, `clone`, `cmp`, `cmp`, `cmp`, `cmp`, `cmp`, `eq`, `eq`, `eq`, `eq`, `eq`, `fmt`, `fmt`, `fmt`, `fmt`, `fmt`, `fmt`, `fmt`, `fmt`, `fmt`, `fmt`, `from`, `from`, `from`, `hash`, `hash`, `hash`, `hash`, `hash`, `partial_cmp`, `partial_cmp`, `partial_cmp`, `partial_cmp`, `partial_cmp` +// These function are ignored because they are on traits that is not defined in current crate (put an empty `#[frb]` on it to unignore): `assert_fields_are_eq`, `assert_fields_are_eq`, `assert_fields_are_eq`, `assert_fields_are_eq`, `clone`, `clone`, `clone`, `clone`, `clone`, `clone`, `clone`, `clone`, `clone`, `clone`, `cmp`, `cmp`, `cmp`, `cmp`, `cmp`, `eq`, `eq`, `eq`, `eq`, `eq`, `fmt`, `fmt`, `fmt`, `fmt`, `fmt`, `fmt`, `fmt`, `fmt`, `fmt`, `fmt`, `from`, `from`, `from`, `hash`, `hash`, `hash`, `hash`, `hash`, `partial_cmp`, `partial_cmp`, `partial_cmp`, `partial_cmp`, `partial_cmp` // These functions are ignored (category: IgnoreBecauseExplicitAttribute): `as_path`, `bytes`, `code`, `get_raw_source_code_sync`, `get_raw_source_code`, `path` /// Options for configuring builtin Node.js modules.