diff --git a/Cargo.lock b/Cargo.lock index 27e25f2e1567..07ebd0a7d325 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1,6 +1,6 @@ # This file is automatically @generated by Cargo. # It is not intended for manual editing. -version = 4 +version = 3 [[package]] name = "aa-stroke" @@ -6790,7 +6790,6 @@ dependencies = [ "thiserror", "uniffi", "uniffi-example-geometry", - "uniffi-example-sprites", ] [[package]] diff --git a/toolkit/components/uniffi-bindgen-gecko-js/fixtures/external-types/Cargo.toml b/toolkit/components/uniffi-bindgen-gecko-js/fixtures/external-types/Cargo.toml index 64f13965569d..b70673374e03 100644 --- a/toolkit/components/uniffi-bindgen-gecko-js/fixtures/external-types/Cargo.toml +++ b/toolkit/components/uniffi-bindgen-gecko-js/fixtures/external-types/Cargo.toml @@ -8,7 +8,6 @@ publish = false [dependencies] uniffi-example-geometry = { path = "../geometry/" } -uniffi-example-sprites = { path = "../sprites/" } uniffi = { workspace = true } thiserror = "1.0" diff --git a/toolkit/components/uniffi-bindgen-gecko-js/fixtures/external-types/build.rs b/toolkit/components/uniffi-bindgen-gecko-js/fixtures/external-types/build.rs new file mode 100644 index 000000000000..13f56ca56b5c --- /dev/null +++ b/toolkit/components/uniffi-bindgen-gecko-js/fixtures/external-types/build.rs @@ -0,0 +1,7 @@ +/* This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ + +fn main() { + uniffi::generate_scaffolding("./src/external-types.udl").unwrap(); +} diff --git a/toolkit/components/uniffi-bindgen-gecko-js/fixtures/external-types/src/external-types.udl b/toolkit/components/uniffi-bindgen-gecko-js/fixtures/external-types/src/external-types.udl new file mode 100644 index 000000000000..d50fc680f789 --- /dev/null +++ b/toolkit/components/uniffi-bindgen-gecko-js/fixtures/external-types/src/external-types.udl @@ -0,0 +1,11 @@ +// A type defined in the `geometry` component +[External="uniffi_geometry"] +typedef extern Point; + +[External="uniffi_geometry"] +typedef extern Line; + +namespace external_types { + double gradient(Line? value); + Point? intersection(Line ln1, Line ln2); +}; diff --git a/toolkit/components/uniffi-bindgen-gecko-js/fixtures/external-types/src/lib.rs b/toolkit/components/uniffi-bindgen-gecko-js/fixtures/external-types/src/lib.rs index e4556e800795..2d12332312bc 100644 --- a/toolkit/components/uniffi-bindgen-gecko-js/fixtures/external-types/src/lib.rs +++ b/toolkit/components/uniffi-bindgen-gecko-js/fixtures/external-types/src/lib.rs @@ -2,11 +2,8 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -use std::sync::Arc; - use uniffi_geometry::{Line, Point}; -#[uniffi::export] pub fn gradient(value: Option) -> f64 { match value { None => 0.0, @@ -14,14 +11,8 @@ pub fn gradient(value: Option) -> f64 { } } -#[uniffi::export] pub fn intersection(ln1: Line, ln2: Line) -> Option { uniffi_geometry::intersection(ln1, ln2) } -#[uniffi::export] -pub fn move_sprite_to_origin(sprite: Arc) { - sprite.move_to(uniffi_sprites::Point { x: 0.0, y: 0.0 }) -} - -uniffi::setup_scaffolding!("external_types"); +include!(concat!(env!("OUT_DIR"), "/external-types.uniffi.rs")); diff --git a/toolkit/components/uniffi-bindgen-gecko-js/fixtures/generated/RustExternalTypes.sys.mjs b/toolkit/components/uniffi-bindgen-gecko-js/fixtures/generated/RustExternalTypes.sys.mjs index 6371a8f7affb..82dcdbc31a12 100644 --- a/toolkit/components/uniffi-bindgen-gecko-js/fixtures/generated/RustExternalTypes.sys.mjs +++ b/toolkit/components/uniffi-bindgen-gecko-js/fixtures/generated/RustExternalTypes.sys.mjs @@ -376,14 +376,6 @@ import { // Export the FFIConverter object to make external types work. export { FfiConverterTypePoint, Point }; -import { - FfiConverterTypeSprite, - Sprite, -} from "resource://gre/modules/RustSprites.sys.mjs"; - -// Export the FFIConverter object to make external types work. -export { FfiConverterTypeSprite, Sprite }; - @@ -454,31 +446,3 @@ export function intersection(ln1,ln2) { return Promise.reject(error) } } - -/** - * moveSpriteToOrigin - */ -export function moveSpriteToOrigin(sprite) { - - const liftResult = (result) => undefined; - const liftError = null; - const functionCall = () => { - try { - FfiConverterTypeSprite.checkType(sprite) - } catch (e) { - if (e instanceof UniFFITypeError) { - e.addItemDescriptionPart("sprite"); - } - throw e; - } - return UniFFIScaffolding.callAsyncWrapper( - 98, // external_types:uniffi_uniffi_fixture_external_types_fn_func_move_sprite_to_origin - FfiConverterTypeSprite.lower(sprite), - ) - } - try { - return functionCall().then((result) => handleRustResult(result, liftResult, liftError)); - } catch (error) { - return Promise.reject(error) - } -} diff --git a/toolkit/components/uniffi-bindgen-gecko-js/fixtures/generated/RustFixtureCallbacks.sys.mjs b/toolkit/components/uniffi-bindgen-gecko-js/fixtures/generated/RustFixtureCallbacks.sys.mjs index 67948fa9196b..336397ba04e5 100644 --- a/toolkit/components/uniffi-bindgen-gecko-js/fixtures/generated/RustFixtureCallbacks.sys.mjs +++ b/toolkit/components/uniffi-bindgen-gecko-js/fixtures/generated/RustFixtureCallbacks.sys.mjs @@ -706,7 +706,7 @@ export function callLogRepeat(logger,message,count,exclude) { throw e; } return UniFFIScaffolding.callAsyncWrapper( - 99, // fixture_callbacks:uniffi_uniffi_fixture_callbacks_fn_func_call_log_repeat + 98, // fixture_callbacks:uniffi_uniffi_fixture_callbacks_fn_func_call_log_repeat FfiConverterTypeLogger.lower(logger), FfiConverterString.lower(message), FfiConverterU32.lower(count), @@ -745,7 +745,7 @@ export function logEvenNumbers(logger,items) { throw e; } return UniFFIScaffolding.callAsyncWrapper( - 100, // fixture_callbacks:uniffi_uniffi_fixture_callbacks_fn_func_log_even_numbers + 99, // fixture_callbacks:uniffi_uniffi_fixture_callbacks_fn_func_log_even_numbers FfiConverterTypeLogger.lower(logger), FfiConverterSequencei32.lower(items), ) @@ -782,7 +782,7 @@ export function logEvenNumbersMainThread(logger,items) { throw e; } return UniFFIScaffolding.callSync( - 101, // fixture_callbacks:uniffi_uniffi_fixture_callbacks_fn_func_log_even_numbers_main_thread + 100, // fixture_callbacks:uniffi_uniffi_fixture_callbacks_fn_func_log_even_numbers_main_thread FfiConverterTypeLogger.lower(logger), FfiConverterSequencei32.lower(items), ) diff --git a/toolkit/components/uniffi-bindgen-gecko-js/fixtures/generated/RustFutures.sys.mjs b/toolkit/components/uniffi-bindgen-gecko-js/fixtures/generated/RustFutures.sys.mjs index c424da318cbf..871da04446d6 100644 --- a/toolkit/components/uniffi-bindgen-gecko-js/fixtures/generated/RustFutures.sys.mjs +++ b/toolkit/components/uniffi-bindgen-gecko-js/fixtures/generated/RustFutures.sys.mjs @@ -631,7 +631,7 @@ export class FutureTester { const liftError = null; const functionCall = () => { return UniFFIScaffolding.callSync( - 122, // futures:uniffi_uniffi_fixture_futures_fn_constructor_futuretester_init + 121, // futures:uniffi_uniffi_fixture_futures_fn_constructor_futuretester_init ) } return handleRustResult(functionCall(), liftResult, liftError);} @@ -656,7 +656,7 @@ export class FutureTester { throw e; } return UniFFIScaffolding.callSync( - 119, // futures:uniffi_uniffi_fixture_futures_fn_method_futuretester_complete_futures + 118, // futures:uniffi_uniffi_fixture_futures_fn_method_futuretester_complete_futures FfiConverterTypeFutureTester.lower(this), FfiConverterU8.lower(value), ) @@ -673,7 +673,7 @@ export class FutureTester { const liftError = null; const functionCall = () => { return UniFFIScaffolding.callAsync( - 120, // futures:uniffi_uniffi_fixture_futures_fn_method_futuretester_make_future + 119, // futures:uniffi_uniffi_fixture_futures_fn_method_futuretester_make_future FfiConverterTypeFutureTester.lower(this), ) } @@ -693,7 +693,7 @@ export class FutureTester { const liftError = null; const functionCall = () => { return UniFFIScaffolding.callSync( - 121, // futures:uniffi_uniffi_fixture_futures_fn_method_futuretester_wake_futures + 120, // futures:uniffi_uniffi_fixture_futures_fn_method_futuretester_wake_futures FfiConverterTypeFutureTester.lower(this), ) } @@ -756,7 +756,7 @@ export class RustTask { const liftError = null; const functionCall = () => { return UniFFIScaffolding.callSync( - 123, // futures:uniffi_uniffi_fixture_futures_fn_method_rusttask_run + 122, // futures:uniffi_uniffi_fixture_futures_fn_method_rusttask_run FfiConverterTypeRustTask.lower(this), ) } @@ -827,7 +827,7 @@ export class Traveller { throw e; } return UniFFIScaffolding.callSync( - 125, // futures:uniffi_uniffi_fixture_futures_fn_constructor_traveller_new + 124, // futures:uniffi_uniffi_fixture_futures_fn_constructor_traveller_new FfiConverterString.lower(name), ) } @@ -842,7 +842,7 @@ export class Traveller { const liftError = null; const functionCall = () => { return UniFFIScaffolding.callSync( - 124, // futures:uniffi_uniffi_fixture_futures_fn_method_traveller_name + 123, // futures:uniffi_uniffi_fixture_futures_fn_method_traveller_name FfiConverterTypeTraveller.lower(this), ) } @@ -919,7 +919,7 @@ export class WorkerQueue { throw e; } return UniFFIScaffolding.callSync( - 126, // futures:uniffi_uniffi_fixture_futures_fn_method_workerqueue_add_task + 125, // futures:uniffi_uniffi_fixture_futures_fn_method_workerqueue_add_task FfiConverterTypeWorkerQueue.lower(this), FfiConverterTypeRustTask.lower(task), ) @@ -1073,7 +1073,7 @@ export function expensiveComputation() { const liftError = null; const functionCall = () => { return UniFFIScaffolding.callAsync( - 102, // futures:uniffi_uniffi_fixture_futures_fn_func_expensive_computation + 101, // futures:uniffi_uniffi_fixture_futures_fn_func_expensive_computation ) } try { @@ -1096,7 +1096,7 @@ export function initializeGeckoGlobalWorkerQueue() { const liftError = null; const functionCall = () => { return UniFFIScaffolding.callSync( - 103, // futures:uniffi_uniffi_fixture_futures_fn_func_initialize_gecko_global_worker_queue + 102, // futures:uniffi_uniffi_fixture_futures_fn_func_initialize_gecko_global_worker_queue ) } return handleRustResult(functionCall(), liftResult, liftError); @@ -1120,7 +1120,7 @@ export function initializeGlobalWorkerQueue(workerQueue) { throw e; } return UniFFIScaffolding.callSync( - 104, // futures:uniffi_uniffi_fixture_futures_fn_func_initialize_global_worker_queue + 103, // futures:uniffi_uniffi_fixture_futures_fn_func_initialize_global_worker_queue FfiConverterTypeWorkerQueue.lower(workerQueue), ) } @@ -1145,7 +1145,7 @@ export function roundtripF32(v) { throw e; } return UniFFIScaffolding.callAsync( - 105, // futures:uniffi_uniffi_fixture_futures_fn_func_roundtrip_f32 + 104, // futures:uniffi_uniffi_fixture_futures_fn_func_roundtrip_f32 FfiConverterF32.lower(v), ) } @@ -1174,7 +1174,7 @@ export function roundtripF64(v) { throw e; } return UniFFIScaffolding.callAsync( - 106, // futures:uniffi_uniffi_fixture_futures_fn_func_roundtrip_f64 + 105, // futures:uniffi_uniffi_fixture_futures_fn_func_roundtrip_f64 FfiConverterF64.lower(v), ) } @@ -1203,7 +1203,7 @@ export function roundtripI16(v) { throw e; } return UniFFIScaffolding.callAsync( - 107, // futures:uniffi_uniffi_fixture_futures_fn_func_roundtrip_i16 + 106, // futures:uniffi_uniffi_fixture_futures_fn_func_roundtrip_i16 FfiConverterI16.lower(v), ) } @@ -1232,7 +1232,7 @@ export function roundtripI32(v) { throw e; } return UniFFIScaffolding.callAsync( - 108, // futures:uniffi_uniffi_fixture_futures_fn_func_roundtrip_i32 + 107, // futures:uniffi_uniffi_fixture_futures_fn_func_roundtrip_i32 FfiConverterI32.lower(v), ) } @@ -1261,7 +1261,7 @@ export function roundtripI64(v) { throw e; } return UniFFIScaffolding.callAsync( - 109, // futures:uniffi_uniffi_fixture_futures_fn_func_roundtrip_i64 + 108, // futures:uniffi_uniffi_fixture_futures_fn_func_roundtrip_i64 FfiConverterI64.lower(v), ) } @@ -1290,7 +1290,7 @@ export function roundtripI8(v) { throw e; } return UniFFIScaffolding.callAsync( - 110, // futures:uniffi_uniffi_fixture_futures_fn_func_roundtrip_i8 + 109, // futures:uniffi_uniffi_fixture_futures_fn_func_roundtrip_i8 FfiConverterI8.lower(v), ) } @@ -1319,7 +1319,7 @@ export function roundtripMap(v) { throw e; } return UniFFIScaffolding.callAsync( - 111, // futures:uniffi_uniffi_fixture_futures_fn_func_roundtrip_map + 110, // futures:uniffi_uniffi_fixture_futures_fn_func_roundtrip_map FfiConverterMapStringString.lower(v), ) } @@ -1348,7 +1348,7 @@ export function roundtripObj(v) { throw e; } return UniFFIScaffolding.callAsync( - 112, // futures:uniffi_uniffi_fixture_futures_fn_func_roundtrip_obj + 111, // futures:uniffi_uniffi_fixture_futures_fn_func_roundtrip_obj FfiConverterTypeTraveller.lower(v), ) } @@ -1377,7 +1377,7 @@ export function roundtripString(v) { throw e; } return UniFFIScaffolding.callAsync( - 113, // futures:uniffi_uniffi_fixture_futures_fn_func_roundtrip_string + 112, // futures:uniffi_uniffi_fixture_futures_fn_func_roundtrip_string FfiConverterString.lower(v), ) } @@ -1406,7 +1406,7 @@ export function roundtripU16(v) { throw e; } return UniFFIScaffolding.callAsync( - 114, // futures:uniffi_uniffi_fixture_futures_fn_func_roundtrip_u16 + 113, // futures:uniffi_uniffi_fixture_futures_fn_func_roundtrip_u16 FfiConverterU16.lower(v), ) } @@ -1435,7 +1435,7 @@ export function roundtripU32(v) { throw e; } return UniFFIScaffolding.callAsync( - 115, // futures:uniffi_uniffi_fixture_futures_fn_func_roundtrip_u32 + 114, // futures:uniffi_uniffi_fixture_futures_fn_func_roundtrip_u32 FfiConverterU32.lower(v), ) } @@ -1464,7 +1464,7 @@ export function roundtripU64(v) { throw e; } return UniFFIScaffolding.callAsync( - 116, // futures:uniffi_uniffi_fixture_futures_fn_func_roundtrip_u64 + 115, // futures:uniffi_uniffi_fixture_futures_fn_func_roundtrip_u64 FfiConverterU64.lower(v), ) } @@ -1493,7 +1493,7 @@ export function roundtripU8(v) { throw e; } return UniFFIScaffolding.callAsync( - 117, // futures:uniffi_uniffi_fixture_futures_fn_func_roundtrip_u8 + 116, // futures:uniffi_uniffi_fixture_futures_fn_func_roundtrip_u8 FfiConverterU8.lower(v), ) } @@ -1522,7 +1522,7 @@ export function roundtripVec(v) { throw e; } return UniFFIScaffolding.callAsync( - 118, // futures:uniffi_uniffi_fixture_futures_fn_func_roundtrip_vec + 117, // futures:uniffi_uniffi_fixture_futures_fn_func_roundtrip_vec FfiConverterSequenceu32.lower(v), ) } diff --git a/toolkit/components/uniffi-bindgen-gecko-js/fixtures/generated/RustGeometry.sys.mjs b/toolkit/components/uniffi-bindgen-gecko-js/fixtures/generated/RustGeometry.sys.mjs index 2afdf9d10f07..51f7eca59d30 100644 --- a/toolkit/components/uniffi-bindgen-gecko-js/fixtures/generated/RustGeometry.sys.mjs +++ b/toolkit/components/uniffi-bindgen-gecko-js/fixtures/generated/RustGeometry.sys.mjs @@ -511,7 +511,7 @@ export function gradient(ln) { throw e; } return UniFFIScaffolding.callAsyncWrapper( - 127, // geometry:uniffi_uniffi_geometry_fn_func_gradient + 126, // geometry:uniffi_uniffi_geometry_fn_func_gradient FfiConverterTypeLine.lower(ln), ) } @@ -548,7 +548,7 @@ export function intersection(ln1,ln2) { throw e; } return UniFFIScaffolding.callAsyncWrapper( - 128, // geometry:uniffi_uniffi_geometry_fn_func_intersection + 127, // geometry:uniffi_uniffi_geometry_fn_func_intersection FfiConverterTypeLine.lower(ln1), FfiConverterTypeLine.lower(ln2), ) diff --git a/toolkit/components/uniffi-bindgen-gecko-js/fixtures/generated/RustRefcounts.sys.mjs b/toolkit/components/uniffi-bindgen-gecko-js/fixtures/generated/RustRefcounts.sys.mjs index 863b73c52293..d1dfb4052cc0 100644 --- a/toolkit/components/uniffi-bindgen-gecko-js/fixtures/generated/RustRefcounts.sys.mjs +++ b/toolkit/components/uniffi-bindgen-gecko-js/fixtures/generated/RustRefcounts.sys.mjs @@ -340,7 +340,7 @@ export class SingletonObject { const liftError = null; const functionCall = () => { return UniFFIScaffolding.callSync( - 131, // refcounts:uniffi_uniffi_fixture_refcounts_fn_method_singletonobject_method + 130, // refcounts:uniffi_uniffi_fixture_refcounts_fn_method_singletonobject_method FfiConverterTypeSingletonObject.lower(this), ) } @@ -392,7 +392,7 @@ export function getJsRefcount() { const liftError = null; const functionCall = () => { return UniFFIScaffolding.callSync( - 129, // refcounts:uniffi_uniffi_fixture_refcounts_fn_func_get_js_refcount + 128, // refcounts:uniffi_uniffi_fixture_refcounts_fn_func_get_js_refcount ) } return handleRustResult(functionCall(), liftResult, liftError); @@ -408,7 +408,7 @@ export function getSingleton() { const liftError = null; const functionCall = () => { return UniFFIScaffolding.callSync( - 130, // refcounts:uniffi_uniffi_fixture_refcounts_fn_func_get_singleton + 129, // refcounts:uniffi_uniffi_fixture_refcounts_fn_func_get_singleton ) } return handleRustResult(functionCall(), liftResult, liftError); diff --git a/toolkit/components/uniffi-bindgen-gecko-js/fixtures/generated/RustRondpoint.sys.mjs b/toolkit/components/uniffi-bindgen-gecko-js/fixtures/generated/RustRondpoint.sys.mjs index 6a2f800ba3e9..f8e604e94036 100644 --- a/toolkit/components/uniffi-bindgen-gecko-js/fixtures/generated/RustRondpoint.sys.mjs +++ b/toolkit/components/uniffi-bindgen-gecko-js/fixtures/generated/RustRondpoint.sys.mjs @@ -634,7 +634,7 @@ export class Optionneur { const liftError = null; const functionCall = () => { return UniFFIScaffolding.callAsyncWrapper( - 162, // rondpoint:uniffi_uniffi_rondpoint_fn_constructor_optionneur_new + 161, // rondpoint:uniffi_uniffi_rondpoint_fn_constructor_optionneur_new ) } try { @@ -660,7 +660,7 @@ export class Optionneur { throw e; } return UniFFIScaffolding.callAsyncWrapper( - 137, // rondpoint:uniffi_uniffi_rondpoint_fn_method_optionneur_sinon_boolean + 136, // rondpoint:uniffi_uniffi_rondpoint_fn_method_optionneur_sinon_boolean FfiConverterTypeOptionneur.lower(this), FfiConverterBool.lower(value), ) @@ -689,7 +689,7 @@ export class Optionneur { throw e; } return UniFFIScaffolding.callAsyncWrapper( - 138, // rondpoint:uniffi_uniffi_rondpoint_fn_method_optionneur_sinon_enum + 137, // rondpoint:uniffi_uniffi_rondpoint_fn_method_optionneur_sinon_enum FfiConverterTypeOptionneur.lower(this), FfiConverterTypeEnumeration.lower(value), ) @@ -718,7 +718,7 @@ export class Optionneur { throw e; } return UniFFIScaffolding.callAsyncWrapper( - 139, // rondpoint:uniffi_uniffi_rondpoint_fn_method_optionneur_sinon_f32 + 138, // rondpoint:uniffi_uniffi_rondpoint_fn_method_optionneur_sinon_f32 FfiConverterTypeOptionneur.lower(this), FfiConverterF32.lower(value), ) @@ -747,7 +747,7 @@ export class Optionneur { throw e; } return UniFFIScaffolding.callAsyncWrapper( - 140, // rondpoint:uniffi_uniffi_rondpoint_fn_method_optionneur_sinon_f64 + 139, // rondpoint:uniffi_uniffi_rondpoint_fn_method_optionneur_sinon_f64 FfiConverterTypeOptionneur.lower(this), FfiConverterF64.lower(value), ) @@ -776,7 +776,7 @@ export class Optionneur { throw e; } return UniFFIScaffolding.callAsyncWrapper( - 141, // rondpoint:uniffi_uniffi_rondpoint_fn_method_optionneur_sinon_i16_dec + 140, // rondpoint:uniffi_uniffi_rondpoint_fn_method_optionneur_sinon_i16_dec FfiConverterTypeOptionneur.lower(this), FfiConverterI16.lower(value), ) @@ -805,7 +805,7 @@ export class Optionneur { throw e; } return UniFFIScaffolding.callAsyncWrapper( - 142, // rondpoint:uniffi_uniffi_rondpoint_fn_method_optionneur_sinon_i16_hex + 141, // rondpoint:uniffi_uniffi_rondpoint_fn_method_optionneur_sinon_i16_hex FfiConverterTypeOptionneur.lower(this), FfiConverterI16.lower(value), ) @@ -834,7 +834,7 @@ export class Optionneur { throw e; } return UniFFIScaffolding.callAsyncWrapper( - 143, // rondpoint:uniffi_uniffi_rondpoint_fn_method_optionneur_sinon_i32_dec + 142, // rondpoint:uniffi_uniffi_rondpoint_fn_method_optionneur_sinon_i32_dec FfiConverterTypeOptionneur.lower(this), FfiConverterI32.lower(value), ) @@ -863,7 +863,7 @@ export class Optionneur { throw e; } return UniFFIScaffolding.callAsyncWrapper( - 144, // rondpoint:uniffi_uniffi_rondpoint_fn_method_optionneur_sinon_i32_hex + 143, // rondpoint:uniffi_uniffi_rondpoint_fn_method_optionneur_sinon_i32_hex FfiConverterTypeOptionneur.lower(this), FfiConverterI32.lower(value), ) @@ -892,7 +892,7 @@ export class Optionneur { throw e; } return UniFFIScaffolding.callAsyncWrapper( - 145, // rondpoint:uniffi_uniffi_rondpoint_fn_method_optionneur_sinon_i64_dec + 144, // rondpoint:uniffi_uniffi_rondpoint_fn_method_optionneur_sinon_i64_dec FfiConverterTypeOptionneur.lower(this), FfiConverterI64.lower(value), ) @@ -921,7 +921,7 @@ export class Optionneur { throw e; } return UniFFIScaffolding.callAsyncWrapper( - 146, // rondpoint:uniffi_uniffi_rondpoint_fn_method_optionneur_sinon_i64_hex + 145, // rondpoint:uniffi_uniffi_rondpoint_fn_method_optionneur_sinon_i64_hex FfiConverterTypeOptionneur.lower(this), FfiConverterI64.lower(value), ) @@ -950,7 +950,7 @@ export class Optionneur { throw e; } return UniFFIScaffolding.callAsyncWrapper( - 147, // rondpoint:uniffi_uniffi_rondpoint_fn_method_optionneur_sinon_i8_dec + 146, // rondpoint:uniffi_uniffi_rondpoint_fn_method_optionneur_sinon_i8_dec FfiConverterTypeOptionneur.lower(this), FfiConverterI8.lower(value), ) @@ -979,7 +979,7 @@ export class Optionneur { throw e; } return UniFFIScaffolding.callAsyncWrapper( - 148, // rondpoint:uniffi_uniffi_rondpoint_fn_method_optionneur_sinon_i8_hex + 147, // rondpoint:uniffi_uniffi_rondpoint_fn_method_optionneur_sinon_i8_hex FfiConverterTypeOptionneur.lower(this), FfiConverterI8.lower(value), ) @@ -1008,7 +1008,7 @@ export class Optionneur { throw e; } return UniFFIScaffolding.callAsyncWrapper( - 149, // rondpoint:uniffi_uniffi_rondpoint_fn_method_optionneur_sinon_null + 148, // rondpoint:uniffi_uniffi_rondpoint_fn_method_optionneur_sinon_null FfiConverterTypeOptionneur.lower(this), FfiConverterOptionalstring.lower(value), ) @@ -1037,7 +1037,7 @@ export class Optionneur { throw e; } return UniFFIScaffolding.callAsyncWrapper( - 150, // rondpoint:uniffi_uniffi_rondpoint_fn_method_optionneur_sinon_sequence + 149, // rondpoint:uniffi_uniffi_rondpoint_fn_method_optionneur_sinon_sequence FfiConverterTypeOptionneur.lower(this), FfiConverterSequencestring.lower(value), ) @@ -1066,7 +1066,7 @@ export class Optionneur { throw e; } return UniFFIScaffolding.callAsyncWrapper( - 151, // rondpoint:uniffi_uniffi_rondpoint_fn_method_optionneur_sinon_string + 150, // rondpoint:uniffi_uniffi_rondpoint_fn_method_optionneur_sinon_string FfiConverterTypeOptionneur.lower(this), FfiConverterString.lower(value), ) @@ -1095,7 +1095,7 @@ export class Optionneur { throw e; } return UniFFIScaffolding.callAsyncWrapper( - 152, // rondpoint:uniffi_uniffi_rondpoint_fn_method_optionneur_sinon_u16_dec + 151, // rondpoint:uniffi_uniffi_rondpoint_fn_method_optionneur_sinon_u16_dec FfiConverterTypeOptionneur.lower(this), FfiConverterU16.lower(value), ) @@ -1124,7 +1124,7 @@ export class Optionneur { throw e; } return UniFFIScaffolding.callAsyncWrapper( - 153, // rondpoint:uniffi_uniffi_rondpoint_fn_method_optionneur_sinon_u16_hex + 152, // rondpoint:uniffi_uniffi_rondpoint_fn_method_optionneur_sinon_u16_hex FfiConverterTypeOptionneur.lower(this), FfiConverterU16.lower(value), ) @@ -1153,7 +1153,7 @@ export class Optionneur { throw e; } return UniFFIScaffolding.callAsyncWrapper( - 154, // rondpoint:uniffi_uniffi_rondpoint_fn_method_optionneur_sinon_u32_dec + 153, // rondpoint:uniffi_uniffi_rondpoint_fn_method_optionneur_sinon_u32_dec FfiConverterTypeOptionneur.lower(this), FfiConverterU32.lower(value), ) @@ -1182,7 +1182,7 @@ export class Optionneur { throw e; } return UniFFIScaffolding.callAsyncWrapper( - 155, // rondpoint:uniffi_uniffi_rondpoint_fn_method_optionneur_sinon_u32_hex + 154, // rondpoint:uniffi_uniffi_rondpoint_fn_method_optionneur_sinon_u32_hex FfiConverterTypeOptionneur.lower(this), FfiConverterU32.lower(value), ) @@ -1211,7 +1211,7 @@ export class Optionneur { throw e; } return UniFFIScaffolding.callAsyncWrapper( - 156, // rondpoint:uniffi_uniffi_rondpoint_fn_method_optionneur_sinon_u32_oct + 155, // rondpoint:uniffi_uniffi_rondpoint_fn_method_optionneur_sinon_u32_oct FfiConverterTypeOptionneur.lower(this), FfiConverterU32.lower(value), ) @@ -1240,7 +1240,7 @@ export class Optionneur { throw e; } return UniFFIScaffolding.callAsyncWrapper( - 157, // rondpoint:uniffi_uniffi_rondpoint_fn_method_optionneur_sinon_u64_dec + 156, // rondpoint:uniffi_uniffi_rondpoint_fn_method_optionneur_sinon_u64_dec FfiConverterTypeOptionneur.lower(this), FfiConverterU64.lower(value), ) @@ -1269,7 +1269,7 @@ export class Optionneur { throw e; } return UniFFIScaffolding.callAsyncWrapper( - 158, // rondpoint:uniffi_uniffi_rondpoint_fn_method_optionneur_sinon_u64_hex + 157, // rondpoint:uniffi_uniffi_rondpoint_fn_method_optionneur_sinon_u64_hex FfiConverterTypeOptionneur.lower(this), FfiConverterU64.lower(value), ) @@ -1298,7 +1298,7 @@ export class Optionneur { throw e; } return UniFFIScaffolding.callAsyncWrapper( - 159, // rondpoint:uniffi_uniffi_rondpoint_fn_method_optionneur_sinon_u8_dec + 158, // rondpoint:uniffi_uniffi_rondpoint_fn_method_optionneur_sinon_u8_dec FfiConverterTypeOptionneur.lower(this), FfiConverterU8.lower(value), ) @@ -1327,7 +1327,7 @@ export class Optionneur { throw e; } return UniFFIScaffolding.callAsyncWrapper( - 160, // rondpoint:uniffi_uniffi_rondpoint_fn_method_optionneur_sinon_u8_hex + 159, // rondpoint:uniffi_uniffi_rondpoint_fn_method_optionneur_sinon_u8_hex FfiConverterTypeOptionneur.lower(this), FfiConverterU8.lower(value), ) @@ -1356,7 +1356,7 @@ export class Optionneur { throw e; } return UniFFIScaffolding.callAsyncWrapper( - 161, // rondpoint:uniffi_uniffi_rondpoint_fn_method_optionneur_sinon_zero + 160, // rondpoint:uniffi_uniffi_rondpoint_fn_method_optionneur_sinon_zero FfiConverterTypeOptionneur.lower(this), FfiConverterOptionali32.lower(value), ) @@ -1424,7 +1424,7 @@ export class Retourneur { const liftError = null; const functionCall = () => { return UniFFIScaffolding.callAsyncWrapper( - 178, // rondpoint:uniffi_uniffi_rondpoint_fn_constructor_retourneur_new + 177, // rondpoint:uniffi_uniffi_rondpoint_fn_constructor_retourneur_new ) } try { @@ -1450,7 +1450,7 @@ export class Retourneur { throw e; } return UniFFIScaffolding.callAsyncWrapper( - 163, // rondpoint:uniffi_uniffi_rondpoint_fn_method_retourneur_identique_boolean + 162, // rondpoint:uniffi_uniffi_rondpoint_fn_method_retourneur_identique_boolean FfiConverterTypeRetourneur.lower(this), FfiConverterBool.lower(value), ) @@ -1479,7 +1479,7 @@ export class Retourneur { throw e; } return UniFFIScaffolding.callAsyncWrapper( - 164, // rondpoint:uniffi_uniffi_rondpoint_fn_method_retourneur_identique_double + 163, // rondpoint:uniffi_uniffi_rondpoint_fn_method_retourneur_identique_double FfiConverterTypeRetourneur.lower(this), FfiConverterF64.lower(value), ) @@ -1508,7 +1508,7 @@ export class Retourneur { throw e; } return UniFFIScaffolding.callAsyncWrapper( - 165, // rondpoint:uniffi_uniffi_rondpoint_fn_method_retourneur_identique_float + 164, // rondpoint:uniffi_uniffi_rondpoint_fn_method_retourneur_identique_float FfiConverterTypeRetourneur.lower(this), FfiConverterF32.lower(value), ) @@ -1537,7 +1537,7 @@ export class Retourneur { throw e; } return UniFFIScaffolding.callAsyncWrapper( - 166, // rondpoint:uniffi_uniffi_rondpoint_fn_method_retourneur_identique_i16 + 165, // rondpoint:uniffi_uniffi_rondpoint_fn_method_retourneur_identique_i16 FfiConverterTypeRetourneur.lower(this), FfiConverterI16.lower(value), ) @@ -1566,7 +1566,7 @@ export class Retourneur { throw e; } return UniFFIScaffolding.callAsyncWrapper( - 167, // rondpoint:uniffi_uniffi_rondpoint_fn_method_retourneur_identique_i32 + 166, // rondpoint:uniffi_uniffi_rondpoint_fn_method_retourneur_identique_i32 FfiConverterTypeRetourneur.lower(this), FfiConverterI32.lower(value), ) @@ -1595,7 +1595,7 @@ export class Retourneur { throw e; } return UniFFIScaffolding.callAsyncWrapper( - 168, // rondpoint:uniffi_uniffi_rondpoint_fn_method_retourneur_identique_i64 + 167, // rondpoint:uniffi_uniffi_rondpoint_fn_method_retourneur_identique_i64 FfiConverterTypeRetourneur.lower(this), FfiConverterI64.lower(value), ) @@ -1624,7 +1624,7 @@ export class Retourneur { throw e; } return UniFFIScaffolding.callAsyncWrapper( - 169, // rondpoint:uniffi_uniffi_rondpoint_fn_method_retourneur_identique_i8 + 168, // rondpoint:uniffi_uniffi_rondpoint_fn_method_retourneur_identique_i8 FfiConverterTypeRetourneur.lower(this), FfiConverterI8.lower(value), ) @@ -1653,7 +1653,7 @@ export class Retourneur { throw e; } return UniFFIScaffolding.callAsyncWrapper( - 170, // rondpoint:uniffi_uniffi_rondpoint_fn_method_retourneur_identique_nombres + 169, // rondpoint:uniffi_uniffi_rondpoint_fn_method_retourneur_identique_nombres FfiConverterTypeRetourneur.lower(this), FfiConverterTypeDictionnaireNombres.lower(value), ) @@ -1682,7 +1682,7 @@ export class Retourneur { throw e; } return UniFFIScaffolding.callAsyncWrapper( - 171, // rondpoint:uniffi_uniffi_rondpoint_fn_method_retourneur_identique_nombres_signes + 170, // rondpoint:uniffi_uniffi_rondpoint_fn_method_retourneur_identique_nombres_signes FfiConverterTypeRetourneur.lower(this), FfiConverterTypeDictionnaireNombresSignes.lower(value), ) @@ -1711,7 +1711,7 @@ export class Retourneur { throw e; } return UniFFIScaffolding.callAsyncWrapper( - 172, // rondpoint:uniffi_uniffi_rondpoint_fn_method_retourneur_identique_optionneur_dictionnaire + 171, // rondpoint:uniffi_uniffi_rondpoint_fn_method_retourneur_identique_optionneur_dictionnaire FfiConverterTypeRetourneur.lower(this), FfiConverterTypeOptionneurDictionnaire.lower(value), ) @@ -1740,7 +1740,7 @@ export class Retourneur { throw e; } return UniFFIScaffolding.callAsyncWrapper( - 173, // rondpoint:uniffi_uniffi_rondpoint_fn_method_retourneur_identique_string + 172, // rondpoint:uniffi_uniffi_rondpoint_fn_method_retourneur_identique_string FfiConverterTypeRetourneur.lower(this), FfiConverterString.lower(value), ) @@ -1769,7 +1769,7 @@ export class Retourneur { throw e; } return UniFFIScaffolding.callAsyncWrapper( - 174, // rondpoint:uniffi_uniffi_rondpoint_fn_method_retourneur_identique_u16 + 173, // rondpoint:uniffi_uniffi_rondpoint_fn_method_retourneur_identique_u16 FfiConverterTypeRetourneur.lower(this), FfiConverterU16.lower(value), ) @@ -1798,7 +1798,7 @@ export class Retourneur { throw e; } return UniFFIScaffolding.callAsyncWrapper( - 175, // rondpoint:uniffi_uniffi_rondpoint_fn_method_retourneur_identique_u32 + 174, // rondpoint:uniffi_uniffi_rondpoint_fn_method_retourneur_identique_u32 FfiConverterTypeRetourneur.lower(this), FfiConverterU32.lower(value), ) @@ -1827,7 +1827,7 @@ export class Retourneur { throw e; } return UniFFIScaffolding.callAsyncWrapper( - 176, // rondpoint:uniffi_uniffi_rondpoint_fn_method_retourneur_identique_u64 + 175, // rondpoint:uniffi_uniffi_rondpoint_fn_method_retourneur_identique_u64 FfiConverterTypeRetourneur.lower(this), FfiConverterU64.lower(value), ) @@ -1856,7 +1856,7 @@ export class Retourneur { throw e; } return UniFFIScaffolding.callAsyncWrapper( - 177, // rondpoint:uniffi_uniffi_rondpoint_fn_method_retourneur_identique_u8 + 176, // rondpoint:uniffi_uniffi_rondpoint_fn_method_retourneur_identique_u8 FfiConverterTypeRetourneur.lower(this), FfiConverterU8.lower(value), ) @@ -1924,7 +1924,7 @@ export class Stringifier { const liftError = null; const functionCall = () => { return UniFFIScaffolding.callAsyncWrapper( - 191, // rondpoint:uniffi_uniffi_rondpoint_fn_constructor_stringifier_new + 190, // rondpoint:uniffi_uniffi_rondpoint_fn_constructor_stringifier_new ) } try { @@ -1950,7 +1950,7 @@ export class Stringifier { throw e; } return UniFFIScaffolding.callAsyncWrapper( - 179, // rondpoint:uniffi_uniffi_rondpoint_fn_method_stringifier_to_string_boolean + 178, // rondpoint:uniffi_uniffi_rondpoint_fn_method_stringifier_to_string_boolean FfiConverterTypeStringifier.lower(this), FfiConverterBool.lower(value), ) @@ -1979,7 +1979,7 @@ export class Stringifier { throw e; } return UniFFIScaffolding.callAsyncWrapper( - 180, // rondpoint:uniffi_uniffi_rondpoint_fn_method_stringifier_to_string_double + 179, // rondpoint:uniffi_uniffi_rondpoint_fn_method_stringifier_to_string_double FfiConverterTypeStringifier.lower(this), FfiConverterF64.lower(value), ) @@ -2008,7 +2008,7 @@ export class Stringifier { throw e; } return UniFFIScaffolding.callAsyncWrapper( - 181, // rondpoint:uniffi_uniffi_rondpoint_fn_method_stringifier_to_string_float + 180, // rondpoint:uniffi_uniffi_rondpoint_fn_method_stringifier_to_string_float FfiConverterTypeStringifier.lower(this), FfiConverterF32.lower(value), ) @@ -2037,7 +2037,7 @@ export class Stringifier { throw e; } return UniFFIScaffolding.callAsyncWrapper( - 182, // rondpoint:uniffi_uniffi_rondpoint_fn_method_stringifier_to_string_i16 + 181, // rondpoint:uniffi_uniffi_rondpoint_fn_method_stringifier_to_string_i16 FfiConverterTypeStringifier.lower(this), FfiConverterI16.lower(value), ) @@ -2066,7 +2066,7 @@ export class Stringifier { throw e; } return UniFFIScaffolding.callAsyncWrapper( - 183, // rondpoint:uniffi_uniffi_rondpoint_fn_method_stringifier_to_string_i32 + 182, // rondpoint:uniffi_uniffi_rondpoint_fn_method_stringifier_to_string_i32 FfiConverterTypeStringifier.lower(this), FfiConverterI32.lower(value), ) @@ -2095,7 +2095,7 @@ export class Stringifier { throw e; } return UniFFIScaffolding.callAsyncWrapper( - 184, // rondpoint:uniffi_uniffi_rondpoint_fn_method_stringifier_to_string_i64 + 183, // rondpoint:uniffi_uniffi_rondpoint_fn_method_stringifier_to_string_i64 FfiConverterTypeStringifier.lower(this), FfiConverterI64.lower(value), ) @@ -2124,7 +2124,7 @@ export class Stringifier { throw e; } return UniFFIScaffolding.callAsyncWrapper( - 185, // rondpoint:uniffi_uniffi_rondpoint_fn_method_stringifier_to_string_i8 + 184, // rondpoint:uniffi_uniffi_rondpoint_fn_method_stringifier_to_string_i8 FfiConverterTypeStringifier.lower(this), FfiConverterI8.lower(value), ) @@ -2153,7 +2153,7 @@ export class Stringifier { throw e; } return UniFFIScaffolding.callAsyncWrapper( - 186, // rondpoint:uniffi_uniffi_rondpoint_fn_method_stringifier_to_string_u16 + 185, // rondpoint:uniffi_uniffi_rondpoint_fn_method_stringifier_to_string_u16 FfiConverterTypeStringifier.lower(this), FfiConverterU16.lower(value), ) @@ -2182,7 +2182,7 @@ export class Stringifier { throw e; } return UniFFIScaffolding.callAsyncWrapper( - 187, // rondpoint:uniffi_uniffi_rondpoint_fn_method_stringifier_to_string_u32 + 186, // rondpoint:uniffi_uniffi_rondpoint_fn_method_stringifier_to_string_u32 FfiConverterTypeStringifier.lower(this), FfiConverterU32.lower(value), ) @@ -2211,7 +2211,7 @@ export class Stringifier { throw e; } return UniFFIScaffolding.callAsyncWrapper( - 188, // rondpoint:uniffi_uniffi_rondpoint_fn_method_stringifier_to_string_u64 + 187, // rondpoint:uniffi_uniffi_rondpoint_fn_method_stringifier_to_string_u64 FfiConverterTypeStringifier.lower(this), FfiConverterU64.lower(value), ) @@ -2240,7 +2240,7 @@ export class Stringifier { throw e; } return UniFFIScaffolding.callAsyncWrapper( - 189, // rondpoint:uniffi_uniffi_rondpoint_fn_method_stringifier_to_string_u8 + 188, // rondpoint:uniffi_uniffi_rondpoint_fn_method_stringifier_to_string_u8 FfiConverterTypeStringifier.lower(this), FfiConverterU8.lower(value), ) @@ -2269,7 +2269,7 @@ export class Stringifier { throw e; } return UniFFIScaffolding.callAsyncWrapper( - 190, // rondpoint:uniffi_uniffi_rondpoint_fn_method_stringifier_well_known_string + 189, // rondpoint:uniffi_uniffi_rondpoint_fn_method_stringifier_well_known_string FfiConverterTypeStringifier.lower(this), FfiConverterString.lower(value), ) @@ -3646,7 +3646,7 @@ export function copieCarte(c) { throw e; } return UniFFIScaffolding.callAsyncWrapper( - 132, // rondpoint:uniffi_uniffi_rondpoint_fn_func_copie_carte + 131, // rondpoint:uniffi_uniffi_rondpoint_fn_func_copie_carte FfiConverterMapStringTypeEnumerationAvecDonnees.lower(c), ) } @@ -3675,7 +3675,7 @@ export function copieDictionnaire(d) { throw e; } return UniFFIScaffolding.callAsyncWrapper( - 133, // rondpoint:uniffi_uniffi_rondpoint_fn_func_copie_dictionnaire + 132, // rondpoint:uniffi_uniffi_rondpoint_fn_func_copie_dictionnaire FfiConverterTypeDictionnaire.lower(d), ) } @@ -3704,7 +3704,7 @@ export function copieEnumeration(e) { throw e; } return UniFFIScaffolding.callAsyncWrapper( - 134, // rondpoint:uniffi_uniffi_rondpoint_fn_func_copie_enumeration + 133, // rondpoint:uniffi_uniffi_rondpoint_fn_func_copie_enumeration FfiConverterTypeEnumeration.lower(e), ) } @@ -3733,7 +3733,7 @@ export function copieEnumerations(e) { throw e; } return UniFFIScaffolding.callAsyncWrapper( - 135, // rondpoint:uniffi_uniffi_rondpoint_fn_func_copie_enumerations + 134, // rondpoint:uniffi_uniffi_rondpoint_fn_func_copie_enumerations FfiConverterSequenceTypeEnumeration.lower(e), ) } @@ -3762,7 +3762,7 @@ export function switcheroo(b) { throw e; } return UniFFIScaffolding.callAsyncWrapper( - 136, // rondpoint:uniffi_uniffi_rondpoint_fn_func_switcheroo + 135, // rondpoint:uniffi_uniffi_rondpoint_fn_func_switcheroo FfiConverterBool.lower(b), ) } diff --git a/toolkit/components/uniffi-bindgen-gecko-js/fixtures/generated/RustSprites.sys.mjs b/toolkit/components/uniffi-bindgen-gecko-js/fixtures/generated/RustSprites.sys.mjs index 22483351aa9a..53ed9d198e6d 100644 --- a/toolkit/components/uniffi-bindgen-gecko-js/fixtures/generated/RustSprites.sys.mjs +++ b/toolkit/components/uniffi-bindgen-gecko-js/fixtures/generated/RustSprites.sys.mjs @@ -339,7 +339,7 @@ export class Sprite { throw e; } return UniFFIScaffolding.callAsyncWrapper( - 196, // sprites:uniffi_uniffi_sprites_fn_constructor_sprite_new + 195, // sprites:uniffi_uniffi_sprites_fn_constructor_sprite_new FfiConverterOptionalTypePoint.lower(initialPosition), ) } @@ -373,7 +373,7 @@ export class Sprite { throw e; } return UniFFIScaffolding.callAsyncWrapper( - 197, // sprites:uniffi_uniffi_sprites_fn_constructor_sprite_new_relative_to + 196, // sprites:uniffi_uniffi_sprites_fn_constructor_sprite_new_relative_to FfiConverterTypePoint.lower(reference), FfiConverterTypeVector.lower(direction), ) @@ -393,7 +393,7 @@ export class Sprite { const liftError = null; const functionCall = () => { return UniFFIScaffolding.callAsyncWrapper( - 193, // sprites:uniffi_uniffi_sprites_fn_method_sprite_get_position + 192, // sprites:uniffi_uniffi_sprites_fn_method_sprite_get_position FfiConverterTypeSprite.lower(this), ) } @@ -420,7 +420,7 @@ export class Sprite { throw e; } return UniFFIScaffolding.callAsyncWrapper( - 194, // sprites:uniffi_uniffi_sprites_fn_method_sprite_move_by + 193, // sprites:uniffi_uniffi_sprites_fn_method_sprite_move_by FfiConverterTypeSprite.lower(this), FfiConverterTypeVector.lower(direction), ) @@ -448,7 +448,7 @@ export class Sprite { throw e; } return UniFFIScaffolding.callAsyncWrapper( - 195, // sprites:uniffi_uniffi_sprites_fn_method_sprite_move_to + 194, // sprites:uniffi_uniffi_sprites_fn_method_sprite_move_to FfiConverterTypeSprite.lower(this), FfiConverterTypePoint.lower(position), ) @@ -702,31 +702,31 @@ export class FfiConverterOptionalTypePoint extends FfiConverterArrayBuffer { * translate * @returns {Point} */ -export function translate(p,v) { +export function translate(position,direction) { const liftResult = (result) => FfiConverterTypePoint.lift(result); const liftError = null; const functionCall = () => { try { - FfiConverterTypePoint.checkType(p) + FfiConverterTypePoint.checkType(position) } catch (e) { if (e instanceof UniFFITypeError) { - e.addItemDescriptionPart("p"); + e.addItemDescriptionPart("position"); } throw e; } try { - FfiConverterTypeVector.checkType(v) + FfiConverterTypeVector.checkType(direction) } catch (e) { if (e instanceof UniFFITypeError) { - e.addItemDescriptionPart("v"); + e.addItemDescriptionPart("direction"); } throw e; } return UniFFIScaffolding.callAsyncWrapper( - 192, // sprites:uniffi_uniffi_sprites_fn_func_translate - FfiConverterTypePoint.lower(p), - FfiConverterTypeVector.lower(v), + 191, // sprites:uniffi_uniffi_sprites_fn_func_translate + FfiConverterTypePoint.lower(position), + FfiConverterTypeVector.lower(direction), ) } try { diff --git a/toolkit/components/uniffi-bindgen-gecko-js/fixtures/generated/RustTodolist.sys.mjs b/toolkit/components/uniffi-bindgen-gecko-js/fixtures/generated/RustTodolist.sys.mjs index 833d9e7e944c..c6aca371086f 100644 --- a/toolkit/components/uniffi-bindgen-gecko-js/fixtures/generated/RustTodolist.sys.mjs +++ b/toolkit/components/uniffi-bindgen-gecko-js/fixtures/generated/RustTodolist.sys.mjs @@ -312,7 +312,7 @@ export class TodoList { const liftError = null; const functionCall = () => { return UniFFIScaffolding.callAsyncWrapper( - 212, // todolist:uniffi_uniffi_todolist_fn_constructor_todolist_new + 211, // todolist:uniffi_uniffi_todolist_fn_constructor_todolist_new ) } try { @@ -337,7 +337,7 @@ export class TodoList { throw e; } return UniFFIScaffolding.callAsyncWrapper( - 201, // todolist:uniffi_uniffi_todolist_fn_method_todolist_add_entries + 200, // todolist:uniffi_uniffi_todolist_fn_method_todolist_add_entries FfiConverterTypeTodoList.lower(this), FfiConverterSequenceTypeTodoEntry.lower(entries), ) @@ -365,7 +365,7 @@ export class TodoList { throw e; } return UniFFIScaffolding.callAsyncWrapper( - 202, // todolist:uniffi_uniffi_todolist_fn_method_todolist_add_entry + 201, // todolist:uniffi_uniffi_todolist_fn_method_todolist_add_entry FfiConverterTypeTodoList.lower(this), FfiConverterTypeTodoEntry.lower(entry), ) @@ -393,7 +393,7 @@ export class TodoList { throw e; } return UniFFIScaffolding.callAsyncWrapper( - 203, // todolist:uniffi_uniffi_todolist_fn_method_todolist_add_item + 202, // todolist:uniffi_uniffi_todolist_fn_method_todolist_add_item FfiConverterTypeTodoList.lower(this), FfiConverterString.lower(todo), ) @@ -421,7 +421,7 @@ export class TodoList { throw e; } return UniFFIScaffolding.callAsyncWrapper( - 204, // todolist:uniffi_uniffi_todolist_fn_method_todolist_add_items + 203, // todolist:uniffi_uniffi_todolist_fn_method_todolist_add_items FfiConverterTypeTodoList.lower(this), FfiConverterSequencestring.lower(items), ) @@ -449,7 +449,7 @@ export class TodoList { throw e; } return UniFFIScaffolding.callAsyncWrapper( - 205, // todolist:uniffi_uniffi_todolist_fn_method_todolist_clear_item + 204, // todolist:uniffi_uniffi_todolist_fn_method_todolist_clear_item FfiConverterTypeTodoList.lower(this), FfiConverterString.lower(todo), ) @@ -470,7 +470,7 @@ export class TodoList { const liftError = null; const functionCall = () => { return UniFFIScaffolding.callAsyncWrapper( - 206, // todolist:uniffi_uniffi_todolist_fn_method_todolist_get_entries + 205, // todolist:uniffi_uniffi_todolist_fn_method_todolist_get_entries FfiConverterTypeTodoList.lower(this), ) } @@ -490,7 +490,7 @@ export class TodoList { const liftError = (data) => FfiConverterTypeTodoError.lift(data); const functionCall = () => { return UniFFIScaffolding.callAsyncWrapper( - 207, // todolist:uniffi_uniffi_todolist_fn_method_todolist_get_first + 206, // todolist:uniffi_uniffi_todolist_fn_method_todolist_get_first FfiConverterTypeTodoList.lower(this), ) } @@ -510,7 +510,7 @@ export class TodoList { const liftError = null; const functionCall = () => { return UniFFIScaffolding.callAsyncWrapper( - 208, // todolist:uniffi_uniffi_todolist_fn_method_todolist_get_items + 207, // todolist:uniffi_uniffi_todolist_fn_method_todolist_get_items FfiConverterTypeTodoList.lower(this), ) } @@ -530,7 +530,7 @@ export class TodoList { const liftError = (data) => FfiConverterTypeTodoError.lift(data); const functionCall = () => { return UniFFIScaffolding.callAsyncWrapper( - 209, // todolist:uniffi_uniffi_todolist_fn_method_todolist_get_last + 208, // todolist:uniffi_uniffi_todolist_fn_method_todolist_get_last FfiConverterTypeTodoList.lower(this), ) } @@ -550,7 +550,7 @@ export class TodoList { const liftError = (data) => FfiConverterTypeTodoError.lift(data); const functionCall = () => { return UniFFIScaffolding.callAsyncWrapper( - 210, // todolist:uniffi_uniffi_todolist_fn_method_todolist_get_last_entry + 209, // todolist:uniffi_uniffi_todolist_fn_method_todolist_get_last_entry FfiConverterTypeTodoList.lower(this), ) } @@ -569,7 +569,7 @@ export class TodoList { const liftError = null; const functionCall = () => { return UniFFIScaffolding.callAsyncWrapper( - 211, // todolist:uniffi_uniffi_todolist_fn_method_todolist_make_default + 210, // todolist:uniffi_uniffi_todolist_fn_method_todolist_make_default FfiConverterTypeTodoList.lower(this), ) } @@ -961,7 +961,7 @@ export function createEntryWith(todo) { throw e; } return UniFFIScaffolding.callAsyncWrapper( - 198, // todolist:uniffi_uniffi_todolist_fn_func_create_entry_with + 197, // todolist:uniffi_uniffi_todolist_fn_func_create_entry_with FfiConverterString.lower(todo), ) } @@ -982,7 +982,7 @@ export function getDefaultList() { const liftError = null; const functionCall = () => { return UniFFIScaffolding.callAsyncWrapper( - 199, // todolist:uniffi_uniffi_todolist_fn_func_get_default_list + 198, // todolist:uniffi_uniffi_todolist_fn_func_get_default_list ) } try { @@ -1009,7 +1009,7 @@ export function setDefaultList(list) { throw e; } return UniFFIScaffolding.callAsyncWrapper( - 200, // todolist:uniffi_uniffi_todolist_fn_func_set_default_list + 199, // todolist:uniffi_uniffi_todolist_fn_func_set_default_list FfiConverterTypeTodoList.lower(list), ) } diff --git a/toolkit/components/uniffi-bindgen-gecko-js/fixtures/generated/RustUniffiTraitInterfaces.sys.mjs b/toolkit/components/uniffi-bindgen-gecko-js/fixtures/generated/RustUniffiTraitInterfaces.sys.mjs index 78ce3e65a8c3..9c27a2a27a3f 100644 --- a/toolkit/components/uniffi-bindgen-gecko-js/fixtures/generated/RustUniffiTraitInterfaces.sys.mjs +++ b/toolkit/components/uniffi-bindgen-gecko-js/fixtures/generated/RustUniffiTraitInterfaces.sys.mjs @@ -357,7 +357,7 @@ export class Calc { throw e; } return UniFFIScaffolding.callSync( - 215, // uniffi_trait_interfaces:uniffi_uniffi_trait_interfaces_fn_method_calc_add + 214, // uniffi_trait_interfaces:uniffi_uniffi_trait_interfaces_fn_method_calc_add FfiConverterTypeCalc.lower(this), FfiConverterU32.lower(a), FfiConverterU32.lower(b), @@ -411,7 +411,7 @@ export function makeBuggyCalculator() { const liftError = null; const functionCall = () => { return UniFFIScaffolding.callSync( - 213, // uniffi_trait_interfaces:uniffi_uniffi_trait_interfaces_fn_func_make_buggy_calculator + 212, // uniffi_trait_interfaces:uniffi_uniffi_trait_interfaces_fn_func_make_buggy_calculator ) } return handleRustResult(functionCall(), liftResult, liftError); @@ -427,7 +427,7 @@ export function makeCalculator() { const liftError = null; const functionCall = () => { return UniFFIScaffolding.callSync( - 214, // uniffi_trait_interfaces:uniffi_uniffi_trait_interfaces_fn_func_make_calculator + 213, // uniffi_trait_interfaces:uniffi_uniffi_trait_interfaces_fn_func_make_calculator ) } return handleRustResult(functionCall(), liftResult, liftError); diff --git a/toolkit/components/uniffi-bindgen-gecko-js/fixtures/geometry/build.rs b/toolkit/components/uniffi-bindgen-gecko-js/fixtures/geometry/build.rs new file mode 100644 index 000000000000..2dd1c96bc3a0 --- /dev/null +++ b/toolkit/components/uniffi-bindgen-gecko-js/fixtures/geometry/build.rs @@ -0,0 +1,7 @@ +/* This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ + +fn main() { + uniffi::generate_scaffolding("src/geometry.udl").unwrap(); +} diff --git a/toolkit/components/uniffi-bindgen-gecko-js/fixtures/geometry/src/geometry.udl b/toolkit/components/uniffi-bindgen-gecko-js/fixtures/geometry/src/geometry.udl new file mode 100644 index 000000000000..af60d429bfcb --- /dev/null +++ b/toolkit/components/uniffi-bindgen-gecko-js/fixtures/geometry/src/geometry.udl @@ -0,0 +1,15 @@ + +namespace geometry { + double gradient(Line ln); + Point? intersection(Line ln1, Line ln2); +}; + +dictionary Point { + double coord_x; + double coord_y; +}; + +dictionary Line { + Point start; + Point end; +}; diff --git a/toolkit/components/uniffi-bindgen-gecko-js/fixtures/geometry/src/lib.rs b/toolkit/components/uniffi-bindgen-gecko-js/fixtures/geometry/src/lib.rs index 12281ef79ece..d710b150bb36 100644 --- a/toolkit/components/uniffi-bindgen-gecko-js/fixtures/geometry/src/lib.rs +++ b/toolkit/components/uniffi-bindgen-gecko-js/fixtures/geometry/src/lib.rs @@ -6,26 +6,24 @@ // Silence, clippy! const EPSILON: f64 = 0.0001f64; -#[derive(Debug, Clone, uniffi::Record)] +#[derive(Debug, Clone)] pub struct Point { coord_x: f64, coord_y: f64, } -#[derive(Debug, Clone, uniffi::Record)] +#[derive(Debug, Clone)] pub struct Line { start: Point, end: Point, } -#[uniffi::export] pub fn gradient(ln: Line) -> f64 { let rise = ln.end.coord_y - ln.start.coord_y; let run = ln.end.coord_x - ln.start.coord_x; rise / run } -#[uniffi::export] pub fn intersection(ln1: Line, ln2: Line) -> Option { // TODO: yuck, should be able to take &Line as argument here // and have rust figure it out with a bunch of annotations... @@ -46,4 +44,4 @@ pub fn intersection(ln1: Line, ln2: Line) -> Option { }) } -uniffi::setup_scaffolding!("geometry"); +uniffi::include_scaffolding!("geometry"); diff --git a/toolkit/components/uniffi-bindgen-gecko-js/fixtures/sprites/build.rs b/toolkit/components/uniffi-bindgen-gecko-js/fixtures/sprites/build.rs new file mode 100644 index 000000000000..26ac3085b89e --- /dev/null +++ b/toolkit/components/uniffi-bindgen-gecko-js/fixtures/sprites/build.rs @@ -0,0 +1,7 @@ +/* This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ + +fn main() { + uniffi::generate_scaffolding("src/sprites.udl").unwrap(); +} diff --git a/toolkit/components/uniffi-bindgen-gecko-js/fixtures/sprites/src/lib.rs b/toolkit/components/uniffi-bindgen-gecko-js/fixtures/sprites/src/lib.rs index 0b3f3a1eea78..d3cc11e4082d 100644 --- a/toolkit/components/uniffi-bindgen-gecko-js/fixtures/sprites/src/lib.rs +++ b/toolkit/components/uniffi-bindgen-gecko-js/fixtures/sprites/src/lib.rs @@ -5,22 +5,21 @@ use std::sync::RwLock; // A point in two-dimensional space. -#[derive(Debug, Clone, uniffi::Record)] +#[derive(Debug, Clone)] pub struct Point { - pub x: f64, - pub y: f64, + x: f64, + y: f64, } // A magnitude and direction in two-dimensional space. // For simplicity we represent this as a point relative to the origin. -#[derive(Debug, Clone, uniffi::Record)] +#[derive(Debug, Clone)] pub struct Vector { - pub dx: f64, - pub dy: f64, + dx: f64, + dy: f64, } // Move from the given Point, according to the given Vector. -#[uniffi::export] pub fn translate(p: &Point, v: Vector) -> Point { Point { x: p.x + v.dx, @@ -30,40 +29,37 @@ pub fn translate(p: &Point, v: Vector) -> Point { // An entity in our imaginary world, which occupies a position in space // and which can move about over time. -#[derive(Debug, uniffi::Object)] +#[derive(Debug)] pub struct Sprite { // We must use interior mutability for managing mutable state, hence the `RwLock`. current_position: RwLock, } -#[uniffi::export] impl Sprite { - #[uniffi::constructor] - pub fn new(initial_position: Option) -> Sprite { + fn new(initial_position: Option) -> Sprite { Sprite { current_position: RwLock::new(initial_position.unwrap_or(Point { x: 0.0, y: 0.0 })), } } - #[uniffi::constructor] - pub fn new_relative_to(reference: Point, direction: Vector) -> Sprite { + fn new_relative_to(reference: Point, direction: Vector) -> Sprite { Sprite { current_position: RwLock::new(translate(&reference, direction)), } } - pub fn get_position(&self) -> Point { + fn get_position(&self) -> Point { self.current_position.read().unwrap().clone() } - pub fn move_to(&self, position: Point) { + fn move_to(&self, position: Point) { *self.current_position.write().unwrap() = position; } - pub fn move_by(&self, direction: Vector) { + fn move_by(&self, direction: Vector) { let mut current_position = self.current_position.write().unwrap(); *current_position = translate(¤t_position, direction) } } -uniffi::setup_scaffolding!("sprites"); +uniffi::include_scaffolding!("sprites"); diff --git a/toolkit/components/uniffi-bindgen-gecko-js/fixtures/tests/xpcshell/test_external_types.js b/toolkit/components/uniffi-bindgen-gecko-js/fixtures/tests/xpcshell/test_external_types.js index 16894477cca4..699dcfe6f343 100644 --- a/toolkit/components/uniffi-bindgen-gecko-js/fixtures/tests/xpcshell/test_external_types.js +++ b/toolkit/components/uniffi-bindgen-gecko-js/fixtures/tests/xpcshell/test_external_types.js @@ -4,11 +4,8 @@ const ExternalTypes = ChromeUtils.importESModule( "resource://gre/modules/RustExternalTypes.sys.mjs" ); -const Sprites = ChromeUtils.importESModule( - "resource://gre/modules/RustSprites.sys.mjs" -); -add_task(async function testDataTypes() { +add_task(async function () { const line = new ExternalTypes.Line({ start: await new ExternalTypes.Point({ coordX: 0, coordY: 0 }), end: await new ExternalTypes.Point({ coordX: 2, coordY: 1 }), @@ -17,9 +14,3 @@ add_task(async function testDataTypes() { Assert.equal(await ExternalTypes.gradient(null), 0.0); }); - -add_task(async function testInterface() { - const s = await Sprites.Sprite.init(new Sprites.Point({ x: 100, y: 100 })); - await ExternalTypes.moveSpriteToOrigin(s); - Assert.deepEqual(await s.getPosition(), new Sprites.Point({ x: 0, y: 0 })); -}); diff --git a/toolkit/components/uniffi-bindgen-gecko-js/fixtures/todolist/src/lib.rs b/toolkit/components/uniffi-bindgen-gecko-js/fixtures/todolist/src/lib.rs index b339e24c617b..11cdc63aee18 100644 --- a/toolkit/components/uniffi-bindgen-gecko-js/fixtures/todolist/src/lib.rs +++ b/toolkit/components/uniffi-bindgen-gecko-js/fixtures/todolist/src/lib.rs @@ -68,13 +68,13 @@ pub struct TodoList { } impl TodoList { - pub fn new() -> Self { + fn new() -> Self { Self { items: RwLock::new(Vec::new()), } } - pub fn add_item>(&self, item: S) -> Result<()> { + fn add_item>(&self, item: S) -> Result<()> { let item = item.into(); if item.is_empty() { return Err(TodoError::EmptyString( @@ -89,36 +89,36 @@ impl TodoList { Ok(()) } - pub fn get_last(&self) -> Result { + fn get_last(&self) -> Result { let items = self.items.read().unwrap(); items.last().cloned().ok_or(TodoError::EmptyTodoList) } - pub fn get_first(&self) -> Result { + fn get_first(&self) -> Result { let items = self.items.read().unwrap(); items.first().cloned().ok_or(TodoError::EmptyTodoList) } - pub fn add_entries(&self, entries: Vec) { + fn add_entries(&self, entries: Vec) { let mut items = self.items.write().unwrap(); items.extend(entries.into_iter().map(|e| e.text)) } - pub fn add_entry(&self, entry: TodoEntry) -> Result<()> { + fn add_entry(&self, entry: TodoEntry) -> Result<()> { self.add_item(entry.text) } - pub fn add_items>(&self, items: Vec) { + fn add_items>(&self, items: Vec) { let mut my_items = self.items.write().unwrap(); my_items.extend(items.into_iter().map(Into::into)) } - pub fn get_items(&self) -> Vec { + fn get_items(&self) -> Vec { let items = self.items.read().unwrap(); items.clone() } - pub fn get_entries(&self) -> Vec { + fn get_entries(&self) -> Vec { let items = self.items.read().unwrap(); items .iter() @@ -126,12 +126,12 @@ impl TodoList { .collect() } - pub fn get_last_entry(&self) -> Result { + fn get_last_entry(&self) -> Result { let text = self.get_last()?; Ok(TodoEntry { text }) } - pub fn clear_item>(&self, item: S) -> Result<()> { + fn clear_item>(&self, item: S) -> Result<()> { let item = item.into(); let mut items = self.items.write().unwrap(); let idx = items @@ -142,7 +142,7 @@ impl TodoList { Ok(()) } - pub fn make_default(self: Arc) { + fn make_default(self: Arc) { set_default_list(self); } } diff --git a/toolkit/components/uniffi-bindgen-gecko-js/src/render/cpp.rs b/toolkit/components/uniffi-bindgen-gecko-js/src/render/cpp.rs index af78d2381fe6..30d5feaa2fe1 100644 --- a/toolkit/components/uniffi-bindgen-gecko-js/src/render/cpp.rs +++ b/toolkit/components/uniffi-bindgen-gecko-js/src/render/cpp.rs @@ -22,7 +22,6 @@ use uniffi_bindgen::interface::{ AsType, Callable, CallbackInterface, ComponentInterface, FfiDefinition, FfiFunction, FfiType, }; -use super::shared::*; use crate::{CallbackIds, Component, FunctionIds, ObjectIds}; #[derive(Template)] @@ -141,7 +140,7 @@ impl CPPScaffoldingTemplate { .iter() .map(move |obj| PointerType { object_id: object_ids.get(&c.ci, obj), - name: pointer_type(&c.ci.namespace(), obj.name()), + name: pointer_type(&c.ci, obj.name()), label: format!("{}::{}", c.ci.namespace(), obj.name()), clone_fn: obj.ffi_object_clone().name().to_string(), free_fn: obj.ffi_object_free().name().to_string(), @@ -415,28 +414,16 @@ struct ScaffoldingCallAsyncInfo { fn scaffolding_converter(ci: &ComponentInterface, ffi_type: &FfiType) -> String { match ffi_type { FfiType::RustArcPtr(name) => { - // Check if this is an external type - for (extern_name, crate_name, _, _) in ci.iter_external_types() { - if extern_name == name { - return format!( - "ScaffoldingObjectConverter<&{}>", - pointer_type(crate_name_to_namespace(&crate_name), name), - ); - } - } - format!( - "ScaffoldingObjectConverter<&{}>", - pointer_type(ci.namespace(), name), - ) + format!("ScaffoldingObjectConverter<&{}>", pointer_type(ci, name),) } _ => format!("ScaffoldingConverter<{}>", cpp_type(ffi_type)), } } -fn pointer_type(namespace: &str, name: &str) -> String { +fn pointer_type(ci: &ComponentInterface, name: &str) -> String { format!( "k{}{}PointerType", - namespace.to_upper_camel_case(), + ci.namespace().to_upper_camel_case(), name.to_upper_camel_case() ) } diff --git a/toolkit/components/uniffi-bindgen-gecko-js/src/render/js.rs b/toolkit/components/uniffi-bindgen-gecko-js/src/render/js.rs index 39de974bbbcb..cb922a05d063 100644 --- a/toolkit/components/uniffi-bindgen-gecko-js/src/render/js.rs +++ b/toolkit/components/uniffi-bindgen-gecko-js/src/render/js.rs @@ -61,7 +61,11 @@ impl<'a> JSBindingsTemplate<'a> { } fn js_module_name_for_crate_name(&self, crate_name: &str) -> String { - js_module_name(crate_name_to_namespace(crate_name)) + let namespace = match crate_name { + "uniffi_geometry" => "geometry", + s => s, + }; + js_module_name(namespace) } } diff --git a/toolkit/components/uniffi-bindgen-gecko-js/src/render/shared.rs b/toolkit/components/uniffi-bindgen-gecko-js/src/render/shared.rs index 23b1851666c8..2a0b3b1833ef 100644 --- a/toolkit/components/uniffi-bindgen-gecko-js/src/render/shared.rs +++ b/toolkit/components/uniffi-bindgen-gecko-js/src/render/shared.rs @@ -34,16 +34,6 @@ fn call_style(callable: impl Callable, config: &Config, spec: &str) -> CallStyle } } -/// Map Rust crate names to UniFFI namespaces. -pub fn crate_name_to_namespace(crate_name: &str) -> &str { - // TODO: remove this hack, we should be able to calculate this by walking the CI data. - match crate_name { - "uniffi_geometry" => "geometry", - "uniffi_sprites" => "sprites", - s => s, - } -} - #[ext] pub impl Function { fn call_style(&self, config: &Config) -> CallStyle { diff --git a/toolkit/components/uniffi-js/UniFFIGeneratedScaffolding.cpp b/toolkit/components/uniffi-js/UniFFIGeneratedScaffolding.cpp index df42b4248204..92ec66be18b0 100644 --- a/toolkit/components/uniffi-js/UniFFIGeneratedScaffolding.cpp +++ b/toolkit/components/uniffi-js/UniFFIGeneratedScaffolding.cpp @@ -846,7 +846,6 @@ extern "C" { uint32_t ffi_uniffi_custom_types_uniffi_contract_version(); double uniffi_uniffi_fixture_external_types_fn_func_gradient(RustBuffer, RustCallStatus*); RustBuffer uniffi_uniffi_fixture_external_types_fn_func_intersection(RustBuffer, RustBuffer, RustCallStatus*); - void uniffi_uniffi_fixture_external_types_fn_func_move_sprite_to_origin(void*, RustCallStatus*); RustBuffer ffi_uniffi_fixture_external_types_rustbuffer_alloc(uint64_t, RustCallStatus*); RustBuffer ffi_uniffi_fixture_external_types_rustbuffer_from_bytes(ForeignBytes, RustCallStatus*); void ffi_uniffi_fixture_external_types_rustbuffer_free(RustBuffer, RustCallStatus*); @@ -905,7 +904,6 @@ extern "C" { void ffi_uniffi_fixture_external_types_rust_future_complete_void(uint64_t, RustCallStatus*); uint16_t uniffi_uniffi_fixture_external_types_checksum_func_gradient(); uint16_t uniffi_uniffi_fixture_external_types_checksum_func_intersection(); - uint16_t uniffi_uniffi_fixture_external_types_checksum_func_move_sprite_to_origin(); uint32_t ffi_uniffi_fixture_external_types_uniffi_contract_version(); typedef void (*CallbackInterfaceLoggerMethod0)(uint64_t, RustBuffer, void*, RustCallStatus*); typedef void (*CallbackInterfaceLoggerMethod1)(uint64_t, RustBuffer, uint32_t, RustBuffer, void*, RustCallStatus*); @@ -5646,31 +5644,6 @@ public: ); } }; -class ScaffoldingCallHandlerUniffiUniffiFixtureExternalTypesFnFuncMoveSpriteToOrigin : public UniffiSyncCallHandler { -private: - // PrepareRustArgs stores the resulting arguments in these fields - typename ScaffoldingObjectConverter<&kSpritesSpritePointerType>::IntermediateType mSprite; - - // MakeRustCall stores the result of the call in these fields - -public: - void PrepareRustArgs(const dom::Sequence& aArgs, ErrorResult& aError) override { - ScaffoldingObjectConverter<&kSpritesSpritePointerType>::FromJs(aArgs[0], &mSprite, aError); - if (aError.Failed()) { - return; - } - } - - void MakeRustCall(RustCallStatus* aOutStatus) override { - uniffi_uniffi_fixture_external_types_fn_func_move_sprite_to_origin( - ScaffoldingObjectConverter<&kSpritesSpritePointerType>::IntoRust(std::move(mSprite)), - aOutStatus - ); - } - - virtual void ExtractSuccessfulCallResult(JSContext* aCx, dom::Optional& aDest, ErrorResult& aError) override { - } -}; class ScaffoldingCallHandlerUniffiUniffiFixtureCallbacksFnFuncCallLogRepeat : public UniffiSyncCallHandler { private: // PrepareRustArgs stores the resulting arguments in these fields @@ -9147,19 +9120,19 @@ public: class ScaffoldingCallHandlerUniffiUniffiSpritesFnFuncTranslate : public UniffiSyncCallHandler { private: // PrepareRustArgs stores the resulting arguments in these fields - typename ScaffoldingConverter::IntermediateType mP; - typename ScaffoldingConverter::IntermediateType mV; + typename ScaffoldingConverter::IntermediateType mPosition; + typename ScaffoldingConverter::IntermediateType mDirection; // MakeRustCall stores the result of the call in these fields typename ScaffoldingConverter::IntermediateType mUniffiReturnValue; public: void PrepareRustArgs(const dom::Sequence& aArgs, ErrorResult& aError) override { - ScaffoldingConverter::FromJs(aArgs[0], &mP, aError); + ScaffoldingConverter::FromJs(aArgs[0], &mPosition, aError); if (aError.Failed()) { return; } - ScaffoldingConverter::FromJs(aArgs[1], &mV, aError); + ScaffoldingConverter::FromJs(aArgs[1], &mDirection, aError); if (aError.Failed()) { return; } @@ -9168,8 +9141,8 @@ public: void MakeRustCall(RustCallStatus* aOutStatus) override { mUniffiReturnValue = ScaffoldingConverter::FromRust( uniffi_uniffi_sprites_fn_func_translate( - ScaffoldingConverter::IntoRust(std::move(mP)), - ScaffoldingConverter::IntoRust(std::move(mV)), + ScaffoldingConverter::IntoRust(std::move(mPosition)), + ScaffoldingConverter::IntoRust(std::move(mDirection)), aOutStatus ) ); @@ -10223,309 +10196,306 @@ UniquePtr GetSyncCallHandler(uint64_t aId) { return MakeUnique(); } case 98: { - return MakeUnique(); - } - case 99: { return MakeUnique(); } - case 100: { + case 99: { return MakeUnique(); } - case 101: { + case 100: { return MakeUnique(); } - case 103: { + case 102: { return MakeUnique(); } - case 104: { + case 103: { return MakeUnique(); } - case 119: { + case 118: { return MakeUnique(); } - case 121: { + case 120: { return MakeUnique(); } - case 122: { + case 121: { return MakeUnique(); } - case 123: { + case 122: { return MakeUnique(); } - case 124: { + case 123: { return MakeUnique(); } - case 125: { + case 124: { return MakeUnique(); } - case 126: { + case 125: { return MakeUnique(); } - case 127: { + case 126: { return MakeUnique(); } - case 128: { + case 127: { return MakeUnique(); } - case 129: { + case 128: { return MakeUnique(); } - case 130: { + case 129: { return MakeUnique(); } - case 131: { + case 130: { return MakeUnique(); } - case 132: { + case 131: { return MakeUnique(); } - case 133: { + case 132: { return MakeUnique(); } - case 134: { + case 133: { return MakeUnique(); } - case 135: { + case 134: { return MakeUnique(); } - case 136: { + case 135: { return MakeUnique(); } - case 137: { + case 136: { return MakeUnique(); } - case 138: { + case 137: { return MakeUnique(); } - case 139: { + case 138: { return MakeUnique(); } - case 140: { + case 139: { return MakeUnique(); } - case 141: { + case 140: { return MakeUnique(); } - case 142: { + case 141: { return MakeUnique(); } - case 143: { + case 142: { return MakeUnique(); } - case 144: { + case 143: { return MakeUnique(); } - case 145: { + case 144: { return MakeUnique(); } - case 146: { + case 145: { return MakeUnique(); } - case 147: { + case 146: { return MakeUnique(); } - case 148: { + case 147: { return MakeUnique(); } - case 149: { + case 148: { return MakeUnique(); } - case 150: { + case 149: { return MakeUnique(); } - case 151: { + case 150: { return MakeUnique(); } - case 152: { + case 151: { return MakeUnique(); } - case 153: { + case 152: { return MakeUnique(); } - case 154: { + case 153: { return MakeUnique(); } - case 155: { + case 154: { return MakeUnique(); } - case 156: { + case 155: { return MakeUnique(); } - case 157: { + case 156: { return MakeUnique(); } - case 158: { + case 157: { return MakeUnique(); } - case 159: { + case 158: { return MakeUnique(); } - case 160: { + case 159: { return MakeUnique(); } - case 161: { + case 160: { return MakeUnique(); } - case 162: { + case 161: { return MakeUnique(); } - case 163: { + case 162: { return MakeUnique(); } - case 164: { + case 163: { return MakeUnique(); } - case 165: { + case 164: { return MakeUnique(); } - case 166: { + case 165: { return MakeUnique(); } - case 167: { + case 166: { return MakeUnique(); } - case 168: { + case 167: { return MakeUnique(); } - case 169: { + case 168: { return MakeUnique(); } - case 170: { + case 169: { return MakeUnique(); } - case 171: { + case 170: { return MakeUnique(); } - case 172: { + case 171: { return MakeUnique(); } - case 173: { + case 172: { return MakeUnique(); } - case 174: { + case 173: { return MakeUnique(); } - case 175: { + case 174: { return MakeUnique(); } - case 176: { + case 175: { return MakeUnique(); } - case 177: { + case 176: { return MakeUnique(); } - case 178: { + case 177: { return MakeUnique(); } - case 179: { + case 178: { return MakeUnique(); } - case 180: { + case 179: { return MakeUnique(); } - case 181: { + case 180: { return MakeUnique(); } - case 182: { + case 181: { return MakeUnique(); } - case 183: { + case 182: { return MakeUnique(); } - case 184: { + case 183: { return MakeUnique(); } - case 185: { + case 184: { return MakeUnique(); } - case 186: { + case 185: { return MakeUnique(); } - case 187: { + case 186: { return MakeUnique(); } - case 188: { + case 187: { return MakeUnique(); } - case 189: { + case 188: { return MakeUnique(); } - case 190: { + case 189: { return MakeUnique(); } - case 191: { + case 190: { return MakeUnique(); } - case 192: { + case 191: { return MakeUnique(); } - case 193: { + case 192: { return MakeUnique(); } - case 194: { + case 193: { return MakeUnique(); } - case 195: { + case 194: { return MakeUnique(); } - case 196: { + case 195: { return MakeUnique(); } - case 197: { + case 196: { return MakeUnique(); } - case 198: { + case 197: { return MakeUnique(); } - case 199: { + case 198: { return MakeUnique(); } - case 200: { + case 199: { return MakeUnique(); } - case 201: { + case 200: { return MakeUnique(); } - case 202: { + case 201: { return MakeUnique(); } - case 203: { + case 202: { return MakeUnique(); } - case 204: { + case 203: { return MakeUnique(); } - case 205: { + case 204: { return MakeUnique(); } - case 206: { + case 205: { return MakeUnique(); } - case 207: { + case 206: { return MakeUnique(); } - case 208: { + case 207: { return MakeUnique(); } - case 209: { + case 208: { return MakeUnique(); } - case 210: { + case 209: { return MakeUnique(); } - case 211: { + case 210: { return MakeUnique(); } - case 212: { + case 211: { return MakeUnique(); } - case 213: { + case 212: { return MakeUnique(); } - case 214: { + case 213: { return MakeUnique(); } - case 215: { + case 214: { return MakeUnique(); } #endif /* MOZ_UNIFFI_FIXTURES */ @@ -10540,52 +10510,52 @@ UniquePtr GetAsyncCallHandler(uint64_t aId) { #ifdef MOZ_UNIFFI_FIXTURES - case 102: { + case 101: { return MakeUnique(); } - case 105: { + case 104: { return MakeUnique(); } - case 106: { + case 105: { return MakeUnique(); } - case 107: { + case 106: { return MakeUnique(); } - case 108: { + case 107: { return MakeUnique(); } - case 109: { + case 108: { return MakeUnique(); } - case 110: { + case 109: { return MakeUnique(); } - case 111: { + case 110: { return MakeUnique(); } - case 112: { + case 111: { return MakeUnique(); } - case 113: { + case 112: { return MakeUnique(); } - case 114: { + case 113: { return MakeUnique(); } - case 115: { + case 114: { return MakeUnique(); } - case 116: { + case 115: { return MakeUnique(); } - case 117: { + case 116: { return MakeUnique(); } - case 118: { + case 117: { return MakeUnique(); } - case 120: { + case 119: { return MakeUnique(); } #endif /* MOZ_UNIFFI_FIXTURES */