No Bug - Vendor app-services 5da98f694a7ad8ba86c3b936038f7483e9cfb9b1, r=markh

Differential Revision: https://phabricator.services.mozilla.com/D246633

.cargo/config.toml.in

@@ -70,9 +70,9 @@ git = "https://github.com/jfkthame/mapped_hyph.git"
 rev = "eff105f6ad7ec9b79816cfc1985a28e5340ad14b"
 replace-with = "vendored-sources"
 
-[source."git+https://github.com/mozilla/application-services?rev=41e0b8f5679977ff2f551eb60fa9b3288ce1f2d8"]
+[source."git+https://github.com/mozilla/application-services?rev=5da98f694a7ad8ba86c3b936038f7483e9cfb9b1"]
 git = "https://github.com/mozilla/application-services"
-rev = "41e0b8f5679977ff2f551eb60fa9b3288ce1f2d8"
+rev = "5da98f694a7ad8ba86c3b936038f7483e9cfb9b1"
 replace-with = "vendored-sources"
 
 [source."git+https://github.com/mozilla/audioipc?rev=e6f44a2bd1e57d11dfc737632a9e849077632330"]

Cargo.lock

@@ -1852,7 +1852,7 @@ dependencies = [
 [[package]]
 name = "error-support"
 version = "0.1.0"
-source = "git+https://github.com/mozilla/application-services?rev=41e0b8f5679977ff2f551eb60fa9b3288ce1f2d8#41e0b8f5679977ff2f551eb60fa9b3288ce1f2d8"
+source = "git+https://github.com/mozilla/application-services?rev=5da98f694a7ad8ba86c3b936038f7483e9cfb9b1#5da98f694a7ad8ba86c3b936038f7483e9cfb9b1"
 dependencies = [
  "error-support-macros",
  "lazy_static",
@@ -1864,7 +1864,7 @@ dependencies = [
 [[package]]
 name = "error-support-macros"
 version = "0.1.0"
-source = "git+https://github.com/mozilla/application-services?rev=41e0b8f5679977ff2f551eb60fa9b3288ce1f2d8#41e0b8f5679977ff2f551eb60fa9b3288ce1f2d8"
+source = "git+https://github.com/mozilla/application-services?rev=5da98f694a7ad8ba86c3b936038f7483e9cfb9b1#5da98f694a7ad8ba86c3b936038f7483e9cfb9b1"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -1981,7 +1981,7 @@ dependencies = [
 [[package]]
 name = "firefox-versioning"
 version = "0.1.0"
-source = "git+https://github.com/mozilla/application-services?rev=41e0b8f5679977ff2f551eb60fa9b3288ce1f2d8#41e0b8f5679977ff2f551eb60fa9b3288ce1f2d8"
+source = "git+https://github.com/mozilla/application-services?rev=5da98f694a7ad8ba86c3b936038f7483e9cfb9b1#5da98f694a7ad8ba86c3b936038f7483e9cfb9b1"
 dependencies = [
  "serde_json",
  "thiserror 1.999.999",
@@ -3318,7 +3318,7 @@ dependencies = [
 [[package]]
 name = "interrupt-support"
 version = "0.1.0"
-source = "git+https://github.com/mozilla/application-services?rev=41e0b8f5679977ff2f551eb60fa9b3288ce1f2d8#41e0b8f5679977ff2f551eb60fa9b3288ce1f2d8"
+source = "git+https://github.com/mozilla/application-services?rev=5da98f694a7ad8ba86c3b936038f7483e9cfb9b1#5da98f694a7ad8ba86c3b936038f7483e9cfb9b1"
 dependencies = [
  "lazy_static",
  "parking_lot",
@@ -5035,7 +5035,7 @@ checksum = "d01a5bd0424d00070b0098dd17ebca6f961a959dead1dbcbbbc1d1cd8d3deeba"
 [[package]]
 name = "payload-support"
 version = "0.1.0"
-source = "git+https://github.com/mozilla/application-services?rev=41e0b8f5679977ff2f551eb60fa9b3288ce1f2d8#41e0b8f5679977ff2f551eb60fa9b3288ce1f2d8"
+source = "git+https://github.com/mozilla/application-services?rev=5da98f694a7ad8ba86c3b936038f7483e9cfb9b1#5da98f694a7ad8ba86c3b936038f7483e9cfb9b1"
 dependencies = [
  "serde",
  "serde_derive",
@@ -5538,7 +5538,7 @@ checksum = "dbb5fb1acd8a1a18b3dd5be62d25485eb770e05afb408a9627d14d451bae12da"
 [[package]]
 name = "relevancy"
 version = "0.1.0"
-source = "git+https://github.com/mozilla/application-services?rev=41e0b8f5679977ff2f551eb60fa9b3288ce1f2d8#41e0b8f5679977ff2f551eb60fa9b3288ce1f2d8"
+source = "git+https://github.com/mozilla/application-services?rev=5da98f694a7ad8ba86c3b936038f7483e9cfb9b1#5da98f694a7ad8ba86c3b936038f7483e9cfb9b1"
 dependencies = [
  "anyhow",
  "base64 0.21.999",
@@ -5563,7 +5563,7 @@ dependencies = [
 [[package]]
 name = "remote_settings"
 version = "0.1.0"
-source = "git+https://github.com/mozilla/application-services?rev=41e0b8f5679977ff2f551eb60fa9b3288ce1f2d8#41e0b8f5679977ff2f551eb60fa9b3288ce1f2d8"
+source = "git+https://github.com/mozilla/application-services?rev=5da98f694a7ad8ba86c3b936038f7483e9cfb9b1#5da98f694a7ad8ba86c3b936038f7483e9cfb9b1"
 dependencies = [
  "anyhow",
  "camino",
@@ -5904,7 +5904,7 @@ dependencies = [
 [[package]]
 name = "search"
 version = "0.1.0"
-source = "git+https://github.com/mozilla/application-services?rev=41e0b8f5679977ff2f551eb60fa9b3288ce1f2d8#41e0b8f5679977ff2f551eb60fa9b3288ce1f2d8"
+source = "git+https://github.com/mozilla/application-services?rev=5da98f694a7ad8ba86c3b936038f7483e9cfb9b1#5da98f694a7ad8ba86c3b936038f7483e9cfb9b1"
 dependencies = [
  "error-support",
  "firefox-versioning",
@@ -6195,7 +6195,7 @@ dependencies = [
 [[package]]
 name = "sql-support"
 version = "0.1.0"
-source = "git+https://github.com/mozilla/application-services?rev=41e0b8f5679977ff2f551eb60fa9b3288ce1f2d8#41e0b8f5679977ff2f551eb60fa9b3288ce1f2d8"
+source = "git+https://github.com/mozilla/application-services?rev=5da98f694a7ad8ba86c3b936038f7483e9cfb9b1#5da98f694a7ad8ba86c3b936038f7483e9cfb9b1"
 dependencies = [
  "interrupt-support",
  "lazy_static",
@@ -6401,7 +6401,7 @@ checksum = "81cdd64d312baedb58e21336b31bc043b77e01cc99033ce76ef539f78e965ebc"
 [[package]]
 name = "suggest"
 version = "0.1.0"
-source = "git+https://github.com/mozilla/application-services?rev=41e0b8f5679977ff2f551eb60fa9b3288ce1f2d8#41e0b8f5679977ff2f551eb60fa9b3288ce1f2d8"
+source = "git+https://github.com/mozilla/application-services?rev=5da98f694a7ad8ba86c3b936038f7483e9cfb9b1#5da98f694a7ad8ba86c3b936038f7483e9cfb9b1"
 dependencies = [
  "anyhow",
  "chrono",
@@ -6453,7 +6453,7 @@ dependencies = [
 [[package]]
 name = "sync-guid"
 version = "0.1.0"
-source = "git+https://github.com/mozilla/application-services?rev=41e0b8f5679977ff2f551eb60fa9b3288ce1f2d8#41e0b8f5679977ff2f551eb60fa9b3288ce1f2d8"
+source = "git+https://github.com/mozilla/application-services?rev=5da98f694a7ad8ba86c3b936038f7483e9cfb9b1#5da98f694a7ad8ba86c3b936038f7483e9cfb9b1"
 dependencies = [
  "base64 0.21.999",
  "rand",
@@ -6464,7 +6464,7 @@ dependencies = [
 [[package]]
 name = "sync15"
 version = "0.1.0"
-source = "git+https://github.com/mozilla/application-services?rev=41e0b8f5679977ff2f551eb60fa9b3288ce1f2d8#41e0b8f5679977ff2f551eb60fa9b3288ce1f2d8"
+source = "git+https://github.com/mozilla/application-services?rev=5da98f694a7ad8ba86c3b936038f7483e9cfb9b1#5da98f694a7ad8ba86c3b936038f7483e9cfb9b1"
 dependencies = [
  "anyhow",
  "error-support",
@@ -6504,7 +6504,7 @@ dependencies = [
 [[package]]
 name = "tabs"
 version = "0.1.0"
-source = "git+https://github.com/mozilla/application-services?rev=41e0b8f5679977ff2f551eb60fa9b3288ce1f2d8#41e0b8f5679977ff2f551eb60fa9b3288ce1f2d8"
+source = "git+https://github.com/mozilla/application-services?rev=5da98f694a7ad8ba86c3b936038f7483e9cfb9b1#5da98f694a7ad8ba86c3b936038f7483e9cfb9b1"
 dependencies = [
  "anyhow",
  "error-support",
@@ -6848,7 +6848,7 @@ checksum = "497961ef93d974e23eb6f433eb5fe1b7930b659f06d12dec6fc44a8f554c0bba"
 [[package]]
 name = "types"
 version = "0.1.0"
-source = "git+https://github.com/mozilla/application-services?rev=41e0b8f5679977ff2f551eb60fa9b3288ce1f2d8#41e0b8f5679977ff2f551eb60fa9b3288ce1f2d8"
+source = "git+https://github.com/mozilla/application-services?rev=5da98f694a7ad8ba86c3b936038f7483e9cfb9b1#5da98f694a7ad8ba86c3b936038f7483e9cfb9b1"
 dependencies = [
  "rusqlite 0.33.0",
  "serde",
@@ -7230,7 +7230,7 @@ checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
 [[package]]
 name = "viaduct"
 version = "0.1.0"
-source = "git+https://github.com/mozilla/application-services?rev=41e0b8f5679977ff2f551eb60fa9b3288ce1f2d8#41e0b8f5679977ff2f551eb60fa9b3288ce1f2d8"
+source = "git+https://github.com/mozilla/application-services?rev=5da98f694a7ad8ba86c3b936038f7483e9cfb9b1#5da98f694a7ad8ba86c3b936038f7483e9cfb9b1"
 dependencies = [
  "ffi-support",
  "log",
@@ -7400,7 +7400,7 @@ dependencies = [
 [[package]]
 name = "webext-storage"
 version = "0.1.0"
-source = "git+https://github.com/mozilla/application-services?rev=41e0b8f5679977ff2f551eb60fa9b3288ce1f2d8#41e0b8f5679977ff2f551eb60fa9b3288ce1f2d8"
+source = "git+https://github.com/mozilla/application-services?rev=5da98f694a7ad8ba86c3b936038f7483e9cfb9b1#5da98f694a7ad8ba86c3b936038f7483e9cfb9b1"
 dependencies = [
  "anyhow",
  "error-support",

Cargo.toml

@@ -260,14 +260,14 @@ malloc_size_of_derive = { path = "xpcom/rust/malloc_size_of_derive" }
 objc = { git = "https://github.com/glandium/rust-objc", rev = "4de89f5aa9851ceca4d40e7ac1e2759410c04324" }
 
 # application-services overrides to make updating them all simpler.
-interrupt-support = { git = "https://github.com/mozilla/application-services", rev = "41e0b8f5679977ff2f551eb60fa9b3288ce1f2d8" }
+interrupt-support = { git = "https://github.com/mozilla/application-services", rev = "5da98f694a7ad8ba86c3b936038f7483e9cfb9b1" }
-relevancy = { git = "https://github.com/mozilla/application-services", rev = "41e0b8f5679977ff2f551eb60fa9b3288ce1f2d8" }
+relevancy = { git = "https://github.com/mozilla/application-services", rev = "5da98f694a7ad8ba86c3b936038f7483e9cfb9b1" }
-search = { git = "https://github.com/mozilla/application-services", rev = "41e0b8f5679977ff2f551eb60fa9b3288ce1f2d8" }
+search = { git = "https://github.com/mozilla/application-services", rev = "5da98f694a7ad8ba86c3b936038f7483e9cfb9b1" }
-sql-support = { git = "https://github.com/mozilla/application-services", rev = "41e0b8f5679977ff2f551eb60fa9b3288ce1f2d8" }
+sql-support = { git = "https://github.com/mozilla/application-services", rev = "5da98f694a7ad8ba86c3b936038f7483e9cfb9b1" }
-suggest = { git = "https://github.com/mozilla/application-services", rev = "41e0b8f5679977ff2f551eb60fa9b3288ce1f2d8" }
+suggest = { git = "https://github.com/mozilla/application-services", rev = "5da98f694a7ad8ba86c3b936038f7483e9cfb9b1" }
-sync15 = { git = "https://github.com/mozilla/application-services", rev = "41e0b8f5679977ff2f551eb60fa9b3288ce1f2d8" }
+sync15 = { git = "https://github.com/mozilla/application-services", rev = "5da98f694a7ad8ba86c3b936038f7483e9cfb9b1" }
-tabs = { git = "https://github.com/mozilla/application-services", rev = "41e0b8f5679977ff2f551eb60fa9b3288ce1f2d8" }
+tabs = { git = "https://github.com/mozilla/application-services", rev = "5da98f694a7ad8ba86c3b936038f7483e9cfb9b1" }
-viaduct = { git = "https://github.com/mozilla/application-services", rev = "41e0b8f5679977ff2f551eb60fa9b3288ce1f2d8" }
+viaduct = { git = "https://github.com/mozilla/application-services", rev = "5da98f694a7ad8ba86c3b936038f7483e9cfb9b1" }
-webext-storage = { git = "https://github.com/mozilla/application-services", rev = "41e0b8f5679977ff2f551eb60fa9b3288ce1f2d8" }
+webext-storage = { git = "https://github.com/mozilla/application-services", rev = "5da98f694a7ad8ba86c3b936038f7483e9cfb9b1" }
 
 allocator-api2 = { path = "third_party/rust/allocator-api2" }

third_party/rust/relevancy/.cargo-checksum.json

@@ -1 +1 @@
-{"files":{"Cargo.toml":"fa569d53ba068f1626419e3910775ad6b5fce69f17a41a342640cba42a57f291","src/bin/generate-test-data.rs":"7cc80b56929091d02675b9dd9bf4c657a95cda502656cf2ec8d91f56d7a393c7","src/db.rs":"d9dd44501ee3b19c696d8830d3036f7bfe0e8ad7751d5a057f5d8295ebf0bd4f","src/error.rs":"3a1308e65440769d9435fc95528d4ef42994c84d88e1da04ba058491dea387c4","src/ingest.rs":"09ac45d68470512f13a58f832c64d2a3dd85230b6454b3fd8fbecc6c1c735a7b","src/interest.rs":"e4369a1280867438bca12746f71288a03b4d5e180e156f4bc0335046012565f7","src/lib.rs":"80e69c16d0b84ae4b7434cd7cf43ade1c2f556bfa166bfb72a250b1eca8de075","src/ranker.rs":"e71414fe79ade26f3c79dceb5211af4f37984a9cded8c938dc1da8d8d28c2ad3","src/rs.rs":"3ba6ad925e62bbce1790598cb429328191393ec89f2ebc3d1fbf26b0db5de955","src/schema.rs":"38ea82679da2729a571aad936f96469e732ec1c104d7c21fd869842f7a5f30a3","src/url_hash.rs":"2e908316fb70923644d1990dbf470d69ce2f5e99b0c5c3d95ec691590be8ffa5","test-data":"1ef2cd092d59e7e126cd4a514af983d449ed9f9c98708702fd237464a76c2b5e"},"package":null}
+{"files":{"Cargo.toml":"fa569d53ba068f1626419e3910775ad6b5fce69f17a41a342640cba42a57f291","src/bin/generate-test-data.rs":"7cc80b56929091d02675b9dd9bf4c657a95cda502656cf2ec8d91f56d7a393c7","src/db.rs":"d9dd44501ee3b19c696d8830d3036f7bfe0e8ad7751d5a057f5d8295ebf0bd4f","src/error.rs":"3a1308e65440769d9435fc95528d4ef42994c84d88e1da04ba058491dea387c4","src/ingest.rs":"04ae6d4c65a46fa96364fc39018502de172a4393bf42bd3ede2865313e7977e5","src/interest.rs":"e4369a1280867438bca12746f71288a03b4d5e180e156f4bc0335046012565f7","src/lib.rs":"8f7408a4bebb882441b697cc16356a8d02342f57ebada515e289ce813e9f5e24","src/ranker.rs":"e71414fe79ade26f3c79dceb5211af4f37984a9cded8c938dc1da8d8d28c2ad3","src/rs.rs":"e897443bd4d8d308effeae55a955d237d22e823b5d5abfb271a25b5796ebd419","src/schema.rs":"38ea82679da2729a571aad936f96469e732ec1c104d7c21fd869842f7a5f30a3","src/url_hash.rs":"2e908316fb70923644d1990dbf470d69ce2f5e99b0c5c3d95ec691590be8ffa5","test-data":"1ef2cd092d59e7e126cd4a514af983d449ed9f9c98708702fd237464a76c2b5e"},"package":null}

third_party/rust/relevancy/src/ingest.rs

@@ -42,11 +42,8 @@ fn fetch_interest_data_inner<C: RelevancyRemoteSettingsClient>(
     let remote_settings_response = client.get_records()?;
     let mut result = vec![];
 
-    for record in remote_settings_response.records {
+    for record in remote_settings_response {
-        let attachment_data = match &record.attachment {
+        let attachment_data = client.get_attachment(&record)?;
-            None => return Err(Error::FetchInterestDataError),
-            Some(a) => client.get_attachment(&a.location)?,
-        };
         let interest = get_interest(&record)?;
         let urls = get_hash_urls(attachment_data)?;
         result.extend(std::iter::repeat(interest).zip(urls));
@@ -98,7 +95,6 @@ mod test {
     use std::{cell::RefCell, collections::HashMap};
 
     use anyhow::Context;
-    use remote_settings::RemoteSettingsResponse;
     use serde_json::json;
 
     use super::*;
@@ -160,20 +156,12 @@ mod test {
     }
 
     impl RelevancyRemoteSettingsClient for SnapshotSettingsClient {
-        fn get_records(&self) -> Result<RemoteSettingsResponse> {
+        fn get_records(&self) -> Result<Vec<RemoteSettingsRecord>> {
-            let records = self.snapshot.borrow().records.clone();
+            Ok(self.snapshot.borrow().records.clone())
-            let last_modified = records
-                .iter()
-                .map(|record: &RemoteSettingsRecord| record.last_modified)
-                .max()
-                .unwrap_or(0);
-            Ok(RemoteSettingsResponse {
-                records,
-                last_modified,
-            })
         }
 
-        fn get_attachment(&self, location: &str) -> Result<Vec<u8>> {
+        fn get_attachment(&self, record: &RemoteSettingsRecord) -> Result<Vec<u8>> {
+            let location = record.attachment.as_ref().unwrap().location.as_str();
             Ok(self
                 .snapshot
                 .borrow()
@@ -182,6 +170,8 @@ mod test {
                 .unwrap_or_else(|| unreachable!("Unexpected request for attachment `{}`", location))
                 .clone())
         }
+
+        fn close(&self) {}
     }
 
     #[test]

third_party/rust/relevancy/src/lib.rs

@@ -20,22 +20,25 @@ pub mod url_hash;
 
 use rand_distr::{Beta, Distribution};
 
+use std::{collections::HashMap, sync::Arc};
+
+use parking_lot::Mutex;
+use remote_settings::{RemoteSettingsClient, RemoteSettingsService};
+
 pub use db::RelevancyDb;
 pub use error::{ApiResult, Error, RelevancyApiError, Result};
 pub use interest::{Interest, InterestVector};
-use parking_lot::Mutex;
 pub use ranker::score;
 
 use error_support::handle_error;
 
 use db::BanditData;
-use std::collections::HashMap;
 
 uniffi::setup_scaffolding!();
 
 #[derive(uniffi::Object)]
 pub struct RelevancyStore {
-    inner: RelevancyStoreInner<remote_settings::RemoteSettings>,
+    inner: RelevancyStoreInner<Arc<RemoteSettingsClient>>,
 }
 
 /// Top-level API for the Relevancy component
@@ -46,11 +49,13 @@ impl RelevancyStore {
     ///
     /// This is non-blocking since databases and other resources are lazily opened.
     #[uniffi::constructor]
-    #[handle_error(Error)]
+    pub fn new(db_path: String, remote_settings: Arc<RemoteSettingsService>) -> Self {
-    pub fn new(db_path: String) -> ApiResult<Self> {
+        Self {
-        Ok(Self {
+            inner: RelevancyStoreInner::new(
-            inner: RelevancyStoreInner::new(db_path, rs::create_client()?),
+                db_path,
-        })
+                remote_settings.make_client(rs::REMOTE_SETTINGS_COLLECTION.to_string()),
+            ),
+        }
     }
 
     /// Close any open resources (for example databases)
@@ -159,7 +164,8 @@ impl<C: rs::RelevancyRemoteSettingsClient> RelevancyStoreInner<C> {
     ///
     /// Calling `close` will interrupt any in-progress queries on other threads.
     pub fn close(&self) {
-        self.db.close()
+        self.db.close();
+        self.client.close();
     }
 
     /// Interrupt any current database queries

third_party/rust/relevancy/src/rs.rs

@@ -4,9 +4,7 @@
  */
 
 use crate::{Error, Result};
-use remote_settings::{
+use remote_settings::{RemoteSettingsClient, RemoteSettingsRecord};
-    RemoteSettings, RemoteSettingsConfig, RemoteSettingsResponse, RemoteSettingsServer,
-};
 use serde::Deserialize;
 /// The Remote Settings collection name.
 pub(crate) const REMOTE_SETTINGS_COLLECTION: &str = "content-relevance";
@@ -16,45 +14,61 @@ pub(crate) const REMOTE_SETTINGS_COLLECTION: &str = "content-relevance";
 /// This trait lets tests use a mock client.
 pub(crate) trait RelevancyRemoteSettingsClient {
     /// Fetches records from the Suggest Remote Settings collection.
-    fn get_records(&self) -> Result<RemoteSettingsResponse>;
+    fn get_records(&self) -> Result<Vec<RemoteSettingsRecord>>;
 
     /// Fetches a record's attachment from the Suggest Remote Settings
     /// collection.
-    fn get_attachment(&self, location: &str) -> Result<Vec<u8>>;
+    fn get_attachment(&self, location: &RemoteSettingsRecord) -> Result<Vec<u8>>;
+
+    /// Close any open resources
+    fn close(&self);
 }
 
-impl RelevancyRemoteSettingsClient for remote_settings::RemoteSettings {
+impl RelevancyRemoteSettingsClient for RemoteSettingsClient {
-    fn get_records(&self) -> Result<RemoteSettingsResponse> {
+    fn get_records(&self) -> Result<Vec<RemoteSettingsRecord>> {
-        Ok(remote_settings::RemoteSettings::get_records(self)?)
+        self.sync()?;
+        Ok(self
+            .get_records(false)
+            .expect("RemoteSettingsClient::get_records() returned None after `sync()` called"))
     }
 
-    fn get_attachment(&self, location: &str) -> Result<Vec<u8>> {
+    fn get_attachment(&self, record: &RemoteSettingsRecord) -> Result<Vec<u8>> {
-        Ok(remote_settings::RemoteSettings::get_attachment(
+        Ok(self.get_attachment(record)?)
-            self, location,
+    }
-        )?)
+
+    fn close(&self) {
+        self.shutdown()
     }
 }
 
 impl<T: RelevancyRemoteSettingsClient> RelevancyRemoteSettingsClient for &T {
-    fn get_records(&self) -> Result<RemoteSettingsResponse> {
+    fn get_records(&self) -> Result<Vec<RemoteSettingsRecord>> {
         (*self).get_records()
     }
 
-    fn get_attachment(&self, location: &str) -> Result<Vec<u8>> {
+    fn get_attachment(&self, record: &RemoteSettingsRecord) -> Result<Vec<u8>> {
-        (*self).get_attachment(location)
+        (*self).get_attachment(record)
+    }
+
+    fn close(&self) {
+        (*self).close();
     }
 }
 
-pub fn create_client() -> Result<RemoteSettings> {
+impl<T: RelevancyRemoteSettingsClient> RelevancyRemoteSettingsClient for std::sync::Arc<T> {
-    Ok(RemoteSettings::new(RemoteSettingsConfig {
+    fn get_records(&self) -> Result<Vec<RemoteSettingsRecord>> {
-        collection_name: REMOTE_SETTINGS_COLLECTION.to_string(),
+        (**self).get_records()
-        server: Some(RemoteSettingsServer::Prod),
+    }
-        server_url: None,
+
-        bucket_name: None,
+    fn get_attachment(&self, record: &RemoteSettingsRecord) -> Result<Vec<u8>> {
-    })?)
+        (**self).get_attachment(record)
+    }
+
+    fn close(&self) {
+        (**self).close()
+    }
 }
 
-/// A record in the Relevancy Remote Settings collection.
 #[derive(Clone, Debug, Deserialize)]
 pub struct RelevancyRecord {
     #[allow(dead_code)]
@@ -115,12 +129,14 @@ pub mod test {
     pub struct NullRelavancyRemoteSettingsClient;
 
     impl RelevancyRemoteSettingsClient for NullRelavancyRemoteSettingsClient {
-        fn get_records(&self) -> Result<RemoteSettingsResponse> {
+        fn get_records(&self) -> Result<Vec<RemoteSettingsRecord>> {
             panic!("NullRelavancyRemoteSettingsClient::get_records was called")
         }
 
-        fn get_attachment(&self, _location: &str) -> Result<Vec<u8>> {
+        fn get_attachment(&self, _record: &RemoteSettingsRecord) -> Result<Vec<u8>> {
             panic!("NullRelavancyRemoteSettingsClient::get_records was called")
         }
+
+        fn close(&self) {}
     }
 }

third_party/rust/remote_settings/src/client.rs

@@ -2,7 +2,7 @@
  * 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 crate::config::RemoteSettingsConfig;
+use crate::config::{BaseUrl, RemoteSettingsConfig};
 use crate::error::{Error, Result};
 use crate::jexl_filter::JexlFilter;
 #[cfg(feature = "signatures")]
@@ -360,11 +360,7 @@ impl<C: ApiClient> RemoteSettingsClient<C> {
         Ok(())
     }
 
-    /// Close the client
+    pub fn shutdown(&self) {
-    ///
-    /// This is typically used during shutdown.  It closes the underlying SQLite connection used to
-    /// cache records.
-    pub fn close(&self) {
         self.inner.lock().storage.close();
     }
 
@@ -499,26 +495,21 @@ impl<C: ApiClient> RemoteSettingsClient<C> {
 
 impl RemoteSettingsClient<ViaductApiClient> {
     pub fn new(
-        server_url: Url,
+        server_url: BaseUrl,
         bucket_name: String,
         collection_name: String,
         context: Option<RemoteSettingsContext>,
         storage: Storage,
-    ) -> Result<Self> {
+    ) -> Self {
-        let api_client = ViaductApiClient::new(server_url, &bucket_name, &collection_name)?;
+        let api_client = ViaductApiClient::new(server_url, &bucket_name, &collection_name);
         let jexl_filter = JexlFilter::new(context);
 
-        Ok(Self::new_from_parts(
+        Self::new_from_parts(collection_name, storage, jexl_filter, api_client)
-            collection_name,
-            storage,
-            jexl_filter,
-            api_client,
-        ))
     }
 
-    pub fn update_config(&self, server_url: Url, bucket_name: String) -> Result<()> {
+    pub fn update_config(&self, server_url: BaseUrl, bucket_name: String) -> Result<()> {
         let mut inner = self.inner.lock();
-        inner.api_client = ViaductApiClient::new(server_url, &bucket_name, &self.collection_name)?;
+        inner.api_client = ViaductApiClient::new(server_url, &bucket_name, &self.collection_name);
         inner.storage.empty()
     }
 }
@@ -554,11 +545,11 @@ pub struct ViaductApiClient {
 }
 
 impl ViaductApiClient {
-    fn new(base_url: Url, bucket_name: &str, collection_name: &str) -> Result<Self> {
+    fn new(base_url: BaseUrl, bucket_name: &str, collection_name: &str) -> Self {
-        Ok(Self {
+        Self {
-            endpoints: RemoteSettingsEndpoints::new(&base_url, bucket_name, collection_name)?,
+            endpoints: RemoteSettingsEndpoints::new(&base_url, bucket_name, collection_name),
             remote_state: RemoteState::default(),
-        })
+        }
     }
 
     fn make_request(&mut self, url: Url) -> Result<Response> {
@@ -707,10 +698,10 @@ impl Client {
 
         let bucket_name = config.bucket_name.unwrap_or_else(|| String::from("main"));
         let endpoints = RemoteSettingsEndpoints::new(
-            &server.get_url()?,
+            &server.get_base_url()?,
             &bucket_name,
             &config.collection_name,
-        )?;
+        );
 
         Ok(Self {
             endpoints,
@@ -914,41 +905,31 @@ impl RemoteSettingsEndpoints {
     /// Construct a new RemoteSettingsEndpoints
     ///
     /// `base_url` should have the form `https://[domain]/v1` (no trailing slash).
-    fn new(base_url: &Url, bucket_name: &str, collection_name: &str) -> Result<Self> {
+    fn new(base_url: &BaseUrl, bucket_name: &str, collection_name: &str) -> Self {
         let mut root_url = base_url.clone();
         // Push the empty string to add the trailing slash.
-        Self::path_segments_mut(&mut root_url)?.push("");
+        root_url.path_segments_mut().push("");
 
         let mut collection_url = base_url.clone();
-        Self::path_segments_mut(&mut collection_url)?
+        collection_url
+            .path_segments_mut()
             .push("buckets")
             .push(bucket_name)
             .push("collections")
             .push(collection_name);
 
         let mut records_url = collection_url.clone();
-        Self::path_segments_mut(&mut records_url)?.push("records");
+        records_url.path_segments_mut().push("records");
 
         let mut changeset_url = collection_url.clone();
-        Self::path_segments_mut(&mut changeset_url)?.push("changeset");
+        changeset_url.path_segments_mut().push("changeset");
 
-        Ok(Self {
+        Self {
-            root_url,
+            root_url: root_url.into_inner(),
-            collection_url,
+            collection_url: collection_url.into_inner(),
-            records_url,
+            records_url: records_url.into_inner(),
-            changeset_url,
+            changeset_url: changeset_url.into_inner(),
-        })
+        }
-    }
-
-    /// Utility method for calling [Url::path_segments_mut]
-    ///
-    /// The issue we're working around is that path_segments_mut uses `()` as the error type, which
-    /// can't be converted into our `Error` type.
-    fn path_segments_mut(url: &mut Url) -> Result<url::PathSegmentsMut<'_>> {
-        url.path_segments_mut()
-            // path_segments_mut uses `()` as the error type, but the docs say that it only will
-            // error for cannot-be-a-base URLs.
-            .map_err(|_| Error::UrlParsingError(url::ParseError::RelativeUrlWithCannotBeABaseBase))
     }
 }
 
@@ -1920,11 +1901,10 @@ mod test_new_client {
     #[test]
     fn test_endpoints() {
         let endpoints = RemoteSettingsEndpoints::new(
-            &Url::parse("http://rs.example.com/v1").unwrap(),
+            &BaseUrl::parse("http://rs.example.com/v1").unwrap(),
             "main",
             "test-collection",
-        )
+        );
-        .unwrap();
         assert_eq!(endpoints.root_url.to_string(), "http://rs.example.com/v1/");
         assert_eq!(
             endpoints.collection_url.to_string(),
@@ -1982,7 +1962,7 @@ mod jexl_tests {
             ..Default::default()
         };
 
-        let mut storage = Storage::new(":memory:".into()).expect("Error creating storage");
+        let mut storage = Storage::new(":memory:".into());
         let _ = storage.insert_collection_content(
             "http://rs.example.com/v1/buckets/main/collections/test-collection",
             &records,
@@ -2040,7 +2020,7 @@ mod jexl_tests {
             ..Default::default()
         };
 
-        let mut storage = Storage::new(":memory:".into()).expect("Error creating storage");
+        let mut storage = Storage::new(":memory:".into());
         let _ = storage.insert_collection_content(
             "http://rs.example.com/v1/buckets/main/collections/test-collection",
             &records,
@@ -2221,7 +2201,7 @@ IKdcFKAt3fFrpyMhlfIKkLfmm0iDjmfmIXbDGBJw9SE=
             .expect_fetch_cert()
             .returning(move |_| Ok(certificate.clone().into_bytes()));
 
-        let storage = Storage::new(":memory:".into())?;
+        let storage = Storage::new(":memory:".into());
         let jexl_filter = JexlFilter::new(Some(RemoteSettingsContext::default()));
         let rs_client = RemoteSettingsClient::new_from_parts(
             collection_name.to_string(),

third_party/rust/remote_settings/src/config.rs

@@ -17,7 +17,7 @@ use crate::{ApiResult, Error, RemoteSettingsContext, Result};
 /// This is the version used in the new API, hence the `2` at the end.  The plan is to move
 /// consumers to the new API, remove the RemoteSettingsConfig struct, then remove the `2` from this
 /// name.
-#[derive(Debug, Clone, uniffi::Record)]
+#[derive(Debug, Default, Clone, uniffi::Record)]
 pub struct RemoteSettingsConfig2 {
     /// The Remote Settings server to use. Defaults to [RemoteSettingsServer::Prod],
     #[uniffi(default = None)]
@@ -63,16 +63,31 @@ impl RemoteSettingsServer {
         self.get_url()
     }
 
+    /// Get a BaseUrl for this server
+    pub fn get_base_url(&self) -> Result<BaseUrl> {
+        let base_url = BaseUrl::parse(self.raw_url())?;
+        // Custom URLs are weird and require a couple tricks for backwards compatibility.
+        // Normally we append `v1/` to match how this has historically worked.  However,
+        // don't do this for file:// schemes which normally don't make any sense, but it's
+        // what Nimbus uses to indicate they want to use the file-based client, rather than
+        // a remote-settings based one.
+        if base_url.url().scheme() != "file" {
+            Ok(base_url.join("v1"))
+        } else {
+            Ok(base_url)
+        }
+    }
+
     /// get_url() that never fails
     ///
     /// If the URL is invalid, we'll log a warning and fall back to the production URL
-    pub fn get_url_with_prod_fallback(&self) -> Url {
+    pub fn get_base_url_with_prod_fallback(&self) -> BaseUrl {
-        match self.get_url() {
+        match self.get_base_url() {
             Ok(url) => url,
             // The unwrap below will never fail, since prod is a hard-coded/valid URL.
             Err(_) => {
                 log::warn!("Invalid Custom URL: {}", self.raw_url());
-                Self::Prod.get_url().unwrap()
+                BaseUrl::parse(Self::Prod.raw_url()).unwrap()
             }
         }
     }
@@ -110,3 +125,44 @@ impl RemoteSettingsServer {
         })
     }
 }
+
+/// Url that's guaranteed safe to use as a base
+#[derive(Debug, Clone)]
+pub struct BaseUrl {
+    url: Url,
+}
+
+impl BaseUrl {
+    pub fn parse(url: &str) -> Result<Self> {
+        let url = Url::parse(url)?;
+        if url.cannot_be_a_base() {
+            Err(Error::UrlParsingError(
+                url::ParseError::RelativeUrlWithCannotBeABaseBase,
+            ))
+        } else {
+            Ok(Self { url })
+        }
+    }
+
+    pub fn url(&self) -> &Url {
+        &self.url
+    }
+
+    pub fn into_inner(self) -> Url {
+        self.url
+    }
+
+    pub fn join(&self, input: &str) -> BaseUrl {
+        Self {
+            // Unwrap is safe, because the join() docs say that it only will error for
+            // cannot-be-a-base URLs.
+            url: self.url.join(input).unwrap(),
+        }
+    }
+
+    pub fn path_segments_mut(&mut self) -> url::PathSegmentsMut<'_> {
+        // Unwrap is safe, because the path_segments_mut() docs say that it only will
+        // error for cannot-be-a-base URLs.
+        self.url.path_segments_mut().unwrap()
+    }
+}

third_party/rust/remote_settings/src/lib.rs

@@ -5,7 +5,6 @@
 use std::{collections::HashMap, fs::File, io::prelude::Write, sync::Arc};
 
 use error_support::{convert_log_report_error, handle_error};
-use url::Url;
 
 pub mod cache;
 pub mod client;
@@ -22,7 +21,7 @@ pub(crate) mod jexl_filter;
 mod macros;
 
 pub use client::{Attachment, RemoteSettingsRecord, RemoteSettingsResponse, RsJsonObject};
-pub use config::{RemoteSettingsConfig, RemoteSettingsConfig2, RemoteSettingsServer};
+pub use config::{BaseUrl, RemoteSettingsConfig, RemoteSettingsConfig2, RemoteSettingsServer};
 pub use context::RemoteSettingsContext;
 pub use error::{ApiResult, RemoteSettingsError, Result};
 
@@ -64,8 +63,7 @@ impl RemoteSettingsService {
     /// Create a new Remote Settings client
     ///
     /// This method performs no IO or network requests and is safe to run in a main thread that can't be blocked.
-    #[handle_error(Error)]
+    pub fn make_client(&self, collection_name: String) -> Arc<RemoteSettingsClient> {
-    pub fn make_client(&self, collection_name: String) -> ApiResult<Arc<RemoteSettingsClient>> {
         self.internal.make_client(collection_name)
     }
 
@@ -166,27 +164,32 @@ impl RemoteSettingsClient {
     pub fn sync(&self) -> ApiResult<()> {
         self.internal.sync()
     }
+
+    /// Shutdown the client, releasing the SQLite connection used to cache records.
+    pub fn shutdown(&self) {
+        self.internal.shutdown()
+    }
 }
 
 impl RemoteSettingsClient {
     /// Create a new client.  This is not exposed to foreign code, consumers need to call
     /// [RemoteSettingsService::make_client]
     fn new(
-        base_url: Url,
+        base_url: BaseUrl,
         bucket_name: String,
         collection_name: String,
         #[allow(unused)] context: Option<RemoteSettingsContext>,
         storage: Storage,
-    ) -> Result<Self> {
+    ) -> Self {
-        Ok(Self {
+        Self {
             internal: client::RemoteSettingsClient::new(
                 base_url,
                 bucket_name,
                 collection_name,
                 context,
                 storage,
-            )?,
+            ),
-        })
+        }
     }
 }
 

third_party/rust/remote_settings/src/service.rs

@@ -9,11 +9,10 @@ use std::{
 
 use camino::Utf8PathBuf;
 use parking_lot::Mutex;
-use url::Url;
 
 use crate::{
-    storage::Storage, RemoteSettingsClient, RemoteSettingsConfig2, RemoteSettingsContext,
+    config::BaseUrl, storage::Storage, RemoteSettingsClient, RemoteSettingsConfig2,
-    RemoteSettingsServer, Result,
+    RemoteSettingsContext, RemoteSettingsServer, Result,
 };
 
 /// Internal Remote settings service API
@@ -23,7 +22,7 @@ pub struct RemoteSettingsService {
 
 struct RemoteSettingsServiceInner {
     storage_dir: Utf8PathBuf,
-    base_url: Url,
+    base_url: BaseUrl,
     bucket_name: String,
     app_context: Option<RemoteSettingsContext>,
     /// Weakrefs for all clients that we've created.  Note: this stores the
@@ -43,7 +42,7 @@ impl RemoteSettingsService {
         let base_url = config
             .server
             .unwrap_or(RemoteSettingsServer::Prod)
-            .get_url_with_prod_fallback();
+            .get_base_url_with_prod_fallback();
         let bucket_name = config.bucket_name.unwrap_or_else(|| String::from("main"));
 
         Self {
@@ -57,13 +56,13 @@ impl RemoteSettingsService {
         }
     }
 
-    pub fn make_client(&self, collection_name: String) -> Result<Arc<RemoteSettingsClient>> {
+    pub fn make_client(&self, collection_name: String) -> Arc<RemoteSettingsClient> {
         let mut inner = self.inner.lock();
         // Allow using in-memory databases for testing of external crates.
         let storage = if inner.storage_dir == ":memory:" {
-            Storage::new(inner.storage_dir.clone())?
+            Storage::new(inner.storage_dir.clone())
         } else {
-            Storage::new(inner.storage_dir.join(format!("{collection_name}.sql")))?
+            Storage::new(inner.storage_dir.join(format!("{collection_name}.sql")))
         };
 
         let client = Arc::new(RemoteSettingsClient::new(
@@ -72,9 +71,9 @@ impl RemoteSettingsService {
             collection_name.clone(),
             inner.app_context.clone(),
             storage,
-        )?);
+        ));
         inner.clients.push(Arc::downgrade(&client));
-        Ok(client)
+        client
     }
 
     /// Sync collections for all active clients
@@ -102,7 +101,7 @@ impl RemoteSettingsService {
         let base_url = config
             .server
             .unwrap_or(RemoteSettingsServer::Prod)
-            .get_url()?;
+            .get_base_url()?;
         let bucket_name = config.bucket_name.unwrap_or_else(|| String::from("main"));
         let mut inner = self.inner.lock();
         for client in inner.active_clients() {

third_party/rust/remote_settings/src/storage.rs

@@ -32,11 +32,11 @@ pub struct Storage {
 }
 
 impl Storage {
-    pub fn new(path: Utf8PathBuf) -> Result<Self> {
+    pub fn new(path: Utf8PathBuf) -> Self {
-        Ok(Self {
+        Self {
             path,
             conn: ConnectionCell::Uninitialized,
-        })
+        }
     }
 
     fn transaction(&mut self) -> Result<Transaction<'_>> {
@@ -324,7 +324,7 @@ mod tests {
 
     #[test]
     fn test_storage_set_and_get_records() -> Result<()> {
-        let mut storage = Storage::new(":memory:".into())?;
+        let mut storage = Storage::new(":memory:".into());
 
         let collection_url = "https://example.com/api";
         let records = vec![
@@ -376,7 +376,7 @@ mod tests {
 
     #[test]
     fn test_storage_get_records_none() -> Result<()> {
-        let mut storage = Storage::new(":memory:".into())?;
+        let mut storage = Storage::new(":memory:".into());
 
         let collection_url = "https://example.com/api";
 
@@ -393,7 +393,7 @@ mod tests {
 
     #[test]
     fn test_storage_get_records_empty() -> Result<()> {
-        let mut storage = Storage::new(":memory:".into())?;
+        let mut storage = Storage::new(":memory:".into());
 
         let collection_url = "https://example.com/api";
 
@@ -418,7 +418,7 @@ mod tests {
 
     #[test]
     fn test_storage_set_and_get_attachment() -> Result<()> {
-        let mut storage = Storage::new(":memory:".into())?;
+        let mut storage = Storage::new(":memory:".into());
 
         let attachment = &[0x18, 0x64];
         let collection_url = "https://example.com/api";
@@ -444,7 +444,7 @@ mod tests {
 
     #[test]
     fn test_storage_set_and_replace_attachment() -> Result<()> {
-        let mut storage = Storage::new(":memory:".into())?;
+        let mut storage = Storage::new(":memory:".into());
 
         let collection_url = "https://example.com/api";
 
@@ -492,7 +492,7 @@ mod tests {
 
     #[test]
     fn test_storage_set_attachment_delete_others() -> Result<()> {
-        let mut storage = Storage::new(":memory:".into())?;
+        let mut storage = Storage::new(":memory:".into());
 
         let collection_url_1 = "https://example.com/api1";
         let collection_url_2 = "https://example.com/api2";
@@ -544,7 +544,7 @@ mod tests {
 
     #[test]
     fn test_storage_get_attachment_not_found() -> Result<()> {
-        let mut storage = Storage::new(":memory:".into())?;
+        let mut storage = Storage::new(":memory:".into());
 
         let collection_url = "https://example.com/api";
         let metadata = Attachment::default();
@@ -558,7 +558,7 @@ mod tests {
 
     #[test]
     fn test_storage_empty() -> Result<()> {
-        let mut storage = Storage::new(":memory:".into())?;
+        let mut storage = Storage::new(":memory:".into());
 
         let collection_url = "https://example.com/api";
         let attachment = &[0x18, 0x64];
@@ -626,7 +626,7 @@ mod tests {
 
     #[test]
     fn test_storage_collection_url_isolation() -> Result<()> {
-        let mut storage = Storage::new(":memory:".into())?;
+        let mut storage = Storage::new(":memory:".into());
 
         let collection_url1 = "https://example.com/api1";
         let collection_url2 = "https://example.com/api2";
@@ -695,7 +695,7 @@ mod tests {
 
     #[test]
     fn test_storage_insert_collection_content() -> Result<()> {
-        let mut storage = Storage::new(":memory:".into())?;
+        let mut storage = Storage::new(":memory:".into());
 
         let collection_url = "https://example.com/api";
         let initial_records = vec![RemoteSettingsRecord {
@@ -761,7 +761,7 @@ mod tests {
 
     #[test]
     fn test_storage_merge_records() -> Result<()> {
-        let mut storage = Storage::new(":memory:".into())?;
+        let mut storage = Storage::new(":memory:".into());
 
         let collection_url = "https://example.com/api";
 
@@ -872,7 +872,7 @@ mod tests {
     }
     #[test]
     fn test_storage_get_collection_metadata() -> Result<()> {
-        let mut storage = Storage::new(":memory:".into())?;
+        let mut storage = Storage::new(":memory:".into());
 
         let collection_url = "https://example.com/api";
         let initial_records = vec![RemoteSettingsRecord {

third_party/rust/search/.cargo-checksum.json

@@ -1 +1 @@
-{"files":{"Cargo.toml":"ac0ac2103375f1c3906436b53627f88515da74864dd3f86ebb2a18952ba72b30","README.md":"d59a6ad6232a86a7bd3632ca62c44ba8bd466615c5d47ce0d836b270bac5562c","android/build.gradle":"e3b617d653aa0221f2229bb16c2fd635003fe82d0274c4b9a6f2d8154851985a","android/proguard-rules.pro":"1cf8c57e8f79c250b0af9c1a5a4edad71a5c348a79ab70243b6bae086c150ad2","android/src/main/AndroidManifest.xml":"0a05039a6124be0296764c2b0f41e863b5538d75e6164dd9ae945b59d983c318","src/configuration_overrides_types.rs":"220a5e12ee3deb309a1571c5820ec5132c959f56667c4c48f997bbe2be0c7eeb","src/configuration_types.rs":"baea920438a87499791b33177c28b690356da24be13223f9113f40e43cb787d4","src/environment_matching.rs":"5a1ade9a900942c62e8740597528a34df6fb3fdb72c801a647a3386acd42fcc8","src/error.rs":"d3c1eda7a8da15446a321139d4d29dd9ceee99e916519690d5eb2d45ed628598","src/filter.rs":"2872eb2c965bdffdebf89936b3e7c80702c8d43e946da81ee093639ba8021f3b","src/lib.rs":"9c83780a74048fbbc7bbba5706067b9dc5db2ae25a0cc751687d2738903723b4","src/selector.rs":"c1f8353bf141fac430d7910d85ff181162d009cdcc57af7356eed7345b7df891","src/sort_helpers.rs":"12d41c34fc2ca5387edc248189335fb11702618b7253f8b486f0c84576084faa","src/types.rs":"2dc1339a5a49bc32dc9252d2fe1c179eb7b3d55f091d6ed2537262573e6d80db","uniffi.toml":"96f1cd569483ff59e3c73852f085a03889fa24a2ce20ff7a3003799a9f48a51e"},"package":null}
+{"files":{"Cargo.toml":"ac0ac2103375f1c3906436b53627f88515da74864dd3f86ebb2a18952ba72b30","README.md":"d59a6ad6232a86a7bd3632ca62c44ba8bd466615c5d47ce0d836b270bac5562c","android/build.gradle":"e3b617d653aa0221f2229bb16c2fd635003fe82d0274c4b9a6f2d8154851985a","android/proguard-rules.pro":"1cf8c57e8f79c250b0af9c1a5a4edad71a5c348a79ab70243b6bae086c150ad2","android/src/main/AndroidManifest.xml":"0a05039a6124be0296764c2b0f41e863b5538d75e6164dd9ae945b59d983c318","src/configuration_overrides_types.rs":"220a5e12ee3deb309a1571c5820ec5132c959f56667c4c48f997bbe2be0c7eeb","src/configuration_types.rs":"baea920438a87499791b33177c28b690356da24be13223f9113f40e43cb787d4","src/environment_matching.rs":"5a1ade9a900942c62e8740597528a34df6fb3fdb72c801a647a3386acd42fcc8","src/error.rs":"d3c1eda7a8da15446a321139d4d29dd9ceee99e916519690d5eb2d45ed628598","src/filter.rs":"2872eb2c965bdffdebf89936b3e7c80702c8d43e946da81ee093639ba8021f3b","src/lib.rs":"9c83780a74048fbbc7bbba5706067b9dc5db2ae25a0cc751687d2738903723b4","src/selector.rs":"9cdab3d61344cdb7715e51a46ea51e80dc668f22623a01be761450a1ac24082f","src/sort_helpers.rs":"12d41c34fc2ca5387edc248189335fb11702618b7253f8b486f0c84576084faa","src/types.rs":"2dc1339a5a49bc32dc9252d2fe1c179eb7b3d55f091d6ed2537262573e6d80db","uniffi.toml":"96f1cd569483ff59e3c73852f085a03889fa24a2ce20ff7a3003799a9f48a51e"},"package":null}

third_party/rust/search/src/selector.rs

@@ -47,20 +47,18 @@ impl SearchEngineSelector {
     ///                               `search-config-v2-overrides` to the selected
     ///                               engines. Should be false unless the application
     ///                               supports the click URL feature.
-    #[handle_error(Error)]
     pub fn use_remote_settings_server(
         self: Arc<Self>,
         service: &Arc<RemoteSettingsService>,
         apply_engine_overrides: bool,
-    ) -> SearchApiResult<()> {
+    ) {
         let mut inner = self.0.lock();
-        inner.search_config_client = Some(service.make_client("search-config-v2".to_string())?);
+        inner.search_config_client = Some(service.make_client("search-config-v2".to_string()));
 
         if apply_engine_overrides {
             inner.search_config_overrides_client =
-                Some(service.make_client("search-config-overrides-v2".to_string())?);
+                Some(service.make_client("search-config-overrides-v2".to_string()));
         }
-        Ok(())
     }
 
     /// Sets the search configuration from the given string. If the configuration
@@ -1893,14 +1891,7 @@ mod tests {
 
         let selector = Arc::new(SearchEngineSelector::new());
 
-        let settings_result =
+        Arc::clone(&selector).use_remote_settings_server(&service, should_apply_overrides);
-            Arc::clone(&selector).use_remote_settings_server(&service, should_apply_overrides);
-        assert!(
-            settings_result.is_ok(),
-            "Should have set the client successfully. {:?}",
-            settings_result
-        );
-
         let sync_result = Arc::clone(&service).sync();
         assert!(
             if expect_sync_successful {

third_party/rust/suggest/.cargo-checksum.json

@@ -1 +1 @@
-{"files":{"Cargo.toml":"922b2e4d85f325dbef99d5e439558a75dbfda82e1d263c2dd3bfadac9879df18","README.md":"5e28baf874b643d756228bdab345e287bf107d3182dfe6a18aafadcc4b9a3fc9","benches/benchmark_all.rs":"5909dfb1e62793afb1f2bc15b75914527a4d14fce6796307c04a309e45c0598c","metrics.yaml":"0540ab2271aeab7f07335c7ceec12acde942995f9dcb3c29070489aa61899d56","src/benchmarks/README.md":"ccee8dbddba8762d0453fa855bd6984137b224b8c019f3dd8e86a3c303f51d71","src/benchmarks/client.rs":"e5897d4e2eda06809fa6dc6db4e780b9ef266f613fb113aa6613b83f7005dd0b","src/benchmarks/geoname.rs":"00fab05cf9465cf8e22e143cde75a81885411001b240af00efda4071975d0563","src/benchmarks/ingest.rs":"1f3b5eca704c51bc8f972e7a3492a518516461e5834f97a5f7d1855a048ab16b","src/benchmarks/mod.rs":"24751c377f549ead6b6e1d46685c649f51303cc090f6374c93633f71dcf3cadf","src/benchmarks/query.rs":"d54946063e72cf98e7f46d94665c17c66af637774c2bb50cd5798dbe63d74f3c","src/bin/debug_ingestion_sizes.rs":"ce6e810be7b3fc19e826d75b622b82cfab5a1a99397a6d0833c2c4eebff2d364","src/config.rs":"0ca876e845841bb6429862c0904c82265003f53b55aea053fac60aed278586a7","src/db.rs":"04c04be4a71e1e671734147a0c153c7fb06254d7fe6aa016f64efd8a21826fe8","src/error.rs":"e2ef3ec0e0b2b8ecbb8f2f1717d4cb753af06913b8395d086b7643098ad100a7","src/fakespot.rs":"f501c9fe5296e7c130a9fcb532b861465717652cb5ef688230bc7a3b94df91b1","src/geoname.rs":"77376dbc7d06532a7797a93b863f150317df7f31d9200d375c8ea489ac8bee6f","src/lib.rs":"a4c0989a01a7c13184049c1f11bc7813cd3cbfb6354fcca1f5a7204e45a0dc9c","src/metrics.rs":"871f0d834efbbc9e26d61f66fa31f0021dcf41444746cd7c082f93ba9628e399","src/pocket.rs":"1316668840ec9b4ea886223921dc9d3b5a1731d1a5206c0b1089f2a6c45c1b7b","src/provider.rs":"cf00114a4293a4c9d956efffb8a6859f3568ea0e4868c6b63b8273daca69b0d5","src/query.rs":"66f229272c9245eb8ee0cab237071627aec599f145f64da8894bcaeb1ed7c6f9","src/rs.rs":"37cce2cb0068421f6b40e13f3bcb1f6212acee2f7117759cd095d381b25580f8","src/schema.rs":"56a4da91b703000dce1399467cd10b6b5c1ab32b33c9ed7b1c928b4536b48546","src/store.rs":"b9da68feba614d5df598bfb9facda115aa2aadda1c6f8374c340bada27311876","src/suggestion.rs":"bd4acd1d7f0bfd4ceebd52d44d4ea6ac639d32ef43819e217fbffaa9346b50f2","src/testing/client.rs":"47a32fd84c733001f11e8bfff94dc8c060b6b0780346dca5ddc7a5f5489c1d85","src/testing/data.rs":"5b1935946185f55be2383f2f979e966155825b1b9df7913d93eb50289052639c","src/testing/mod.rs":"34120abb160a913069c3f7df03c4f52815be3461dbbf08fb0fcc4251a517ba71","src/util.rs":"52c6ec405637afa2d1a89f29fbbb7dcc341546b6deb97d326c4490bbf8713cb0","src/weather.rs":"7cc9167dcdfca49d6ad91eba6fba4d5fd49f45052f25a7fe3ad6749d3e6783fb","src/yelp.rs":"0b9dfa698d9c3162d47c0103d1799838d444345f9d7f943eedc6bcc98fd8b57d","uniffi.toml":"8205e4679ac26d53e70af0f85c013fd27cda1119f4322aebf5f2b9403d45a611"},"package":null}
+{"files":{"Cargo.toml":"922b2e4d85f325dbef99d5e439558a75dbfda82e1d263c2dd3bfadac9879df18","README.md":"5e28baf874b643d756228bdab345e287bf107d3182dfe6a18aafadcc4b9a3fc9","benches/benchmark_all.rs":"5909dfb1e62793afb1f2bc15b75914527a4d14fce6796307c04a309e45c0598c","metrics.yaml":"0540ab2271aeab7f07335c7ceec12acde942995f9dcb3c29070489aa61899d56","src/benchmarks/README.md":"ccee8dbddba8762d0453fa855bd6984137b224b8c019f3dd8e86a3c303f51d71","src/benchmarks/client.rs":"e5897d4e2eda06809fa6dc6db4e780b9ef266f613fb113aa6613b83f7005dd0b","src/benchmarks/geoname.rs":"00fab05cf9465cf8e22e143cde75a81885411001b240af00efda4071975d0563","src/benchmarks/ingest.rs":"1f3b5eca704c51bc8f972e7a3492a518516461e5834f97a5f7d1855a048ab16b","src/benchmarks/mod.rs":"2c9a39b7a5144674d2475f4d7d69d77c4545f9aa5f123968cb32574e76f10b1a","src/benchmarks/query.rs":"d54946063e72cf98e7f46d94665c17c66af637774c2bb50cd5798dbe63d74f3c","src/bin/debug_ingestion_sizes.rs":"ce6e810be7b3fc19e826d75b622b82cfab5a1a99397a6d0833c2c4eebff2d364","src/config.rs":"0ca876e845841bb6429862c0904c82265003f53b55aea053fac60aed278586a7","src/db.rs":"04c04be4a71e1e671734147a0c153c7fb06254d7fe6aa016f64efd8a21826fe8","src/error.rs":"e2ef3ec0e0b2b8ecbb8f2f1717d4cb753af06913b8395d086b7643098ad100a7","src/fakespot.rs":"f501c9fe5296e7c130a9fcb532b861465717652cb5ef688230bc7a3b94df91b1","src/geoname.rs":"77376dbc7d06532a7797a93b863f150317df7f31d9200d375c8ea489ac8bee6f","src/lib.rs":"a4c0989a01a7c13184049c1f11bc7813cd3cbfb6354fcca1f5a7204e45a0dc9c","src/metrics.rs":"871f0d834efbbc9e26d61f66fa31f0021dcf41444746cd7c082f93ba9628e399","src/pocket.rs":"1316668840ec9b4ea886223921dc9d3b5a1731d1a5206c0b1089f2a6c45c1b7b","src/provider.rs":"e85d606e98a8ba37557072f91c6906b1a4d7c5586a9913bf3570ef25106b007f","src/query.rs":"66f229272c9245eb8ee0cab237071627aec599f145f64da8894bcaeb1ed7c6f9","src/rs.rs":"5d1501e2e6488310c11b14e312d6f2002b67ac7ce4055d6a91396a6336bbfbf6","src/schema.rs":"56a4da91b703000dce1399467cd10b6b5c1ab32b33c9ed7b1c928b4536b48546","src/store.rs":"0d9f11b622bf5f11653af78c69d74041969ae3296219719aec6f6c64348a2ee1","src/suggestion.rs":"bd4acd1d7f0bfd4ceebd52d44d4ea6ac639d32ef43819e217fbffaa9346b50f2","src/testing/client.rs":"47a32fd84c733001f11e8bfff94dc8c060b6b0780346dca5ddc7a5f5489c1d85","src/testing/data.rs":"5b1935946185f55be2383f2f979e966155825b1b9df7913d93eb50289052639c","src/testing/mod.rs":"34120abb160a913069c3f7df03c4f52815be3461dbbf08fb0fcc4251a517ba71","src/util.rs":"52c6ec405637afa2d1a89f29fbbb7dcc341546b6deb97d326c4490bbf8713cb0","src/weather.rs":"7cc9167dcdfca49d6ad91eba6fba4d5fd49f45052f25a7fe3ad6749d3e6783fb","src/yelp.rs":"0af54cdc96ad79a40a83687882561c3bbefdc45b6383aec380486c3b82df0690","uniffi.toml":"8205e4679ac26d53e70af0f85c013fd27cda1119f4322aebf5f2b9403d45a611"},"package":null}

third_party/rust/suggest/src/benchmarks/mod.rs

@@ -67,6 +67,14 @@ fn unique_db_filename() -> String {
     format!("db{}.sqlite", COUNTER.fetch_add(1, Ordering::Relaxed))
 }
 
+fn unique_remote_settings_dir() -> String {
+    static COUNTER: AtomicU32 = AtomicU32::new(0);
+    format!(
+        "remote-settings-{}",
+        COUNTER.fetch_add(1, Ordering::Relaxed)
+    )
+}
+
 // Create a "starter" store that will do an initial ingest, and then
 // initialize every returned store with a copy of its DB so that each one
 // doesn't need to reingest.
@@ -79,15 +87,17 @@ fn new_store() -> SuggestStore {
     let (starter_dir, starter_db_path) = starter.get_or_insert_with(|| {
         let temp_dir = tempfile::tempdir().unwrap();
         let db_path = temp_dir.path().join(unique_db_filename());
+        let remote_settings_dir = temp_dir.path().join(unique_remote_settings_dir());
         let rs_config = RemoteSettingsConfig2 {
             bucket_name: None,
             server: None,
             app_context: Some(RemoteSettingsContext::default()),
         };
-        let remote_settings_service =
+        let remote_settings_service = Arc::new(RemoteSettingsService::new(
-            Arc::new(RemoteSettingsService::new("".to_string(), rs_config));
+            remote_settings_dir.to_string_lossy().to_string(),
-        let store = SuggestStore::new(&db_path.to_string_lossy(), remote_settings_service)
+            rs_config,
-            .expect("Error building store");
+        ));
+        let store = SuggestStore::new(&db_path.to_string_lossy(), remote_settings_service);
         store
             .ingest(SuggestIngestionConstraints::all_providers())
             .expect("Error during ingestion");
@@ -104,7 +114,6 @@ fn new_store() -> SuggestStore {
     let remote_settings_service = Arc::new(RemoteSettingsService::new("".to_string(), rs_config));
     std::fs::copy(starter_db_path, &db_path).expect("Error copying starter DB file");
     SuggestStore::new(&db_path.to_string_lossy(), remote_settings_service)
-        .expect("Error building store")
 }
 
 /// Cleanup the temp directory created for SuggestStore instances used in the benchmarks.

third_party/rust/suggest/src/provider.rs

@@ -228,7 +228,7 @@ pub enum AmpMatchingStrategy {
     /// Disable keywords added via keyword expansion.
     /// This eliminates keywords that for terms related to the "real" keywords, for example
     /// misspellings like "underarmor" instead of "under armor"'.
-    NoKeywordExpansion,
+    NoKeywordExpansion = 1, // The desktop consumer assumes this starts at `1`
     /// Use FTS matching against the full keywords, joined together.
     FtsAgainstFullKeywords,
     /// Use FTS matching against the title field

third_party/rust/suggest/src/rs.rs

@@ -86,12 +86,12 @@ pub struct SuggestRemoteSettingsClient {
 }
 
 impl SuggestRemoteSettingsClient {
-    pub fn new(rs_service: &RemoteSettingsService) -> Result<Self> {
+    pub fn new(rs_service: &RemoteSettingsService) -> Self {
-        Ok(Self {
+        Self {
-            amp_client: rs_service.make_client(Collection::Amp.name().to_owned())?,
+            amp_client: rs_service.make_client(Collection::Amp.name().to_owned()),
-            other_client: rs_service.make_client(Collection::Other.name().to_owned())?,
+            other_client: rs_service.make_client(Collection::Other.name().to_owned()),
-            fakespot_client: rs_service.make_client(Collection::Fakespot.name().to_owned())?,
+            fakespot_client: rs_service.make_client(Collection::Fakespot.name().to_owned()),
-        })
+        }
     }
 
     fn client_for_collection(&self, collection: Collection) -> &RemoteSettingsClient {

third_party/rust/suggest/src/store.rs

@@ -122,7 +122,7 @@ impl SuggestStoreBuilder {
             inner: SuggestStoreInner::new(
                 data_path,
                 extensions_to_load,
-                SuggestRemoteSettingsClient::new(&rs_service)?,
+                SuggestRemoteSettingsClient::new(&rs_service),
             ),
         }))
     }
@@ -176,16 +176,12 @@ pub struct SuggestStore {
 #[uniffi::export]
 impl SuggestStore {
     /// Creates a Suggest store.
-    #[handle_error(Error)]
     #[uniffi::constructor()]
-    pub fn new(
+    pub fn new(path: &str, remote_settings_service: Arc<RemoteSettingsService>) -> Self {
-        path: &str,
+        let client = SuggestRemoteSettingsClient::new(&remote_settings_service);
-        remote_settings_service: Arc<RemoteSettingsService>,
+        Self {
-    ) -> SuggestApiResult<Self> {
-        let client = SuggestRemoteSettingsClient::new(&remote_settings_service)?;
-        Ok(Self {
             inner: SuggestStoreInner::new(path.to_owned(), vec![], client),
-        })
+        }
     }
 
     /// Queries the database for suggestions.
@@ -1939,9 +1935,21 @@ pub(crate) mod tests {
                 "https://www.yelp.com/search?find_desc=ramen+super+delivery&find_loc=tokyo"
             ),],
         );
+        assert_eq!(
+            store.fetch_suggestions(SuggestionQuery::yelp("ramen invalid_delivery")),
+            vec![ramen_suggestion(
+                "ramen invalid_delivery",
+                "https://www.yelp.com/search?find_desc=ramen&find_loc=invalid_delivery"
+            )
+            .has_location_sign(false),],
+        );
         assert_eq!(
             store.fetch_suggestions(SuggestionQuery::yelp("ramen invalid_delivery in tokyo")),
-            vec![],
+            vec![ramen_suggestion(
+                "ramen invalid_delivery in tokyo",
+                "https://www.yelp.com/search?find_desc=ramen&find_loc=invalid_delivery+in+tokyo"
+            )
+            .has_location_sign(false),],
         );
         assert_eq!(
             store.fetch_suggestions(SuggestionQuery::yelp("ramen in tokyo")),
@@ -1959,7 +1967,11 @@ pub(crate) mod tests {
         );
         assert_eq!(
             store.fetch_suggestions(SuggestionQuery::yelp("ramen invalid_in tokyo")),
-            vec![],
+            vec![ramen_suggestion(
+                "ramen invalid_in tokyo",
+                "https://www.yelp.com/search?find_desc=ramen&find_loc=invalid_in+tokyo"
+            )
+            .has_location_sign(false),],
         );
         assert_eq!(
             store.fetch_suggestions(SuggestionQuery::yelp("ramen in San Francisco")),
@@ -1979,21 +1991,22 @@ pub(crate) mod tests {
             store.fetch_suggestions(SuggestionQuery::yelp("ramen near by")),
             vec![ramen_suggestion(
                 "ramen near by",
-                "https://www.yelp.com/search?find_desc=ramen+near+by"
+                "https://www.yelp.com/search?find_desc=ramen"
-            )
+            )],
-            .has_location_sign(false),],
         );
         assert_eq!(
             store.fetch_suggestions(SuggestionQuery::yelp("ramen near me")),
             vec![ramen_suggestion(
                 "ramen near me",
-                "https://www.yelp.com/search?find_desc=ramen+near+me"
+                "https://www.yelp.com/search?find_desc=ramen"
-            )
+            )],
-            .has_location_sign(false),],
         );
         assert_eq!(
             store.fetch_suggestions(SuggestionQuery::yelp("ramen near by tokyo")),
-            vec![],
+            vec![ramen_suggestion(
+                "ramen near by tokyo",
+                "https://www.yelp.com/search?find_desc=ramen&find_loc=tokyo"
+            )],
         );
         assert_eq!(
             store.fetch_suggestions(SuggestionQuery::yelp("ramen")),
@@ -2081,6 +2094,15 @@ pub(crate) mod tests {
             .has_location_sign(false)
             .subject_exact_match(false)],
         );
+        assert_eq!(
+            store.fetch_suggestions(SuggestionQuery::yelp("spi")),
+            vec![ramen_suggestion(
+                "spicy ramen",
+                "https://www.yelp.com/search?find_desc=spicy+ramen"
+            )
+            .has_location_sign(false)
+            .subject_exact_match(false)],
+        );
         assert_eq!(
             store.fetch_suggestions(SuggestionQuery::yelp("BeSt             Ramen")),
             vec![ramen_suggestion(
@@ -2140,6 +2162,51 @@ pub(crate) mod tests {
             .has_location_sign(false)
             .subject_exact_match(false)],
         );
+        assert_eq!(
+            store.fetch_suggestions(SuggestionQuery::yelp("best sp")),
+            vec![ramen_suggestion(
+                "best spicy ramen",
+                "https://www.yelp.com/search?find_desc=best+spicy+ramen"
+            )
+            .has_location_sign(false)
+            .subject_exact_match(false)],
+        );
+        assert_eq!(
+            store.fetch_suggestions(SuggestionQuery::yelp("ramenabc")),
+            vec![],
+        );
+        assert_eq!(
+            store.fetch_suggestions(SuggestionQuery::yelp("ramenabc xyz")),
+            vec![],
+        );
+        assert_eq!(
+            store.fetch_suggestions(SuggestionQuery::yelp("best ramenabc")),
+            vec![],
+        );
+        assert_eq!(
+            store.fetch_suggestions(SuggestionQuery::yelp("bestabc ra")),
+            vec![],
+        );
+        assert_eq!(
+            store.fetch_suggestions(SuggestionQuery::yelp("bestabc ramen")),
+            vec![],
+        );
+        assert_eq!(
+            store.fetch_suggestions(SuggestionQuery::yelp("bestabc ramen xyz")),
+            vec![],
+        );
+        assert_eq!(
+            store.fetch_suggestions(SuggestionQuery::yelp("best spi ram")),
+            vec![],
+        );
+        assert_eq!(
+            store.fetch_suggestions(SuggestionQuery::yelp("bes ram")),
+            vec![],
+        );
+        assert_eq!(
+            store.fetch_suggestions(SuggestionQuery::yelp("bes ramen")),
+            vec![],
+        );
 
         Ok(())
     }

third_party/rust/suggest/src/yelp.rs

@@ -30,6 +30,12 @@ impl ToSql for Modifier {
     }
 }
 
+#[derive(Clone, Copy, Eq, PartialEq)]
+enum FindFrom {
+    First,
+    Last,
+}
+
 /// This module assumes like following query.
 /// "Yelp-modifier? Pre-modifier? Subject Post-modifier? (Location-modifier | Location-sign Location?)? Yelp-modifier?"
 /// For example, the query below is valid.
@@ -47,6 +53,11 @@ const MAX_QUERY_LENGTH: usize = 150;
 /// "keyword=:modifier" (please see is_modifier()), define this how many words we should check.
 const MAX_MODIFIER_WORDS_NUMBER: usize = 2;
 
+/// The max number of words consisting the location sign. To improve the SQL performance by matching
+/// with "keyword=:modifier" (please see is_location_sign()), define this how many words we should
+/// check.
+const MAX_LOCATION_SIGN_WORDS_NUMBER: usize = 2;
+
 /// At least this many characters must be typed for a subject to be matched.
 const SUBJECT_PREFIX_MATCH_THRESHOLD: usize = 2;
 
@@ -142,62 +153,57 @@ impl SuggestDao<'_> {
             return Ok(vec![]);
         }
 
-        let query_string = &query.keyword.trim();
+        let query_vec: Vec<_> = query.keyword.split_whitespace().collect();
-        if !query_string.contains(' ') {
+        let mut query_words: &[&str] = &query_vec;
-            let Some((subject, subject_exact_match)) = self.find_subject(query_string)? else {
+
-                return Ok(vec![]);
+        let pre_yelp_modifier_tuple =
-            };
+            self.find_modifier(query_words, Modifier::Yelp, FindFrom::First)?;
-            let (icon, icon_mimetype, score) = self.fetch_custom_details()?;
+        if let Some((_, rest)) = pre_yelp_modifier_tuple {
-            let builder = SuggestionBuilder {
+            query_words = rest;
-                subject: &subject,
-                subject_exact_match,
-                pre_modifier: None,
-                post_modifier: None,
-                location_sign: None,
-                location: None,
-                need_location: false,
-                icon,
-                icon_mimetype,
-                score,
-            };
-            return Ok(vec![builder.into()]);
         }
 
-        // Find the yelp keyword modifier and remove them from the query.
+        let pre_modifier_tuple = self.find_modifier(query_words, Modifier::Pre, FindFrom::First)?;
-        let (query_without_yelp_modifiers, _, _) =
+        if let Some((_, rest)) = pre_modifier_tuple {
-            self.find_modifiers(query_string, Modifier::Yelp, Modifier::Yelp)?;
+            query_words = rest;
-
-        // Find the location sign and the location.
-        let (query_without_location, location_sign, location, need_location) =
-            self.find_location(&query_without_yelp_modifiers)?;
-
-        if let (Some(_), false) = (&location, need_location) {
-            // The location sign does not need the specific location, but user is setting something.
-            return Ok(vec![]);
         }
 
-        if query_without_location.is_empty() {
+        let Some(subject_tuple) = self.find_subject(query_words)? else {
-            // No remained query.
             return Ok(vec![]);
+        };
+        query_words = subject_tuple.2;
+
+        let post_modifier_tuple =
+            self.find_modifier(query_words, Modifier::Post, FindFrom::First)?;
+        if let Some((_, rest)) = post_modifier_tuple {
+            query_words = rest;
         }
 
-        // Find the modifiers.
+        let location_sign_tuple = self.find_location_sign(query_words)?;
-        let (subject_candidate, pre_modifier, post_modifier) =
+        if let Some((_, rest)) = location_sign_tuple {
-            self.find_modifiers(&query_without_location, Modifier::Pre, Modifier::Post)?;
+            query_words = rest;
+        }
 
-        let Some((subject, subject_exact_match)) = self.find_subject(&subject_candidate)? else {
+        let post_yelp_modifier_tuple =
-            return Ok(vec![]);
+            self.find_modifier(query_words, Modifier::Yelp, FindFrom::Last)?;
+        if let Some((_, rest)) = post_yelp_modifier_tuple {
+            query_words = rest;
+        }
+
+        let location = if query_words.is_empty() {
+            None
+        } else {
+            Some(query_words.join(" "))
         };
 
         let (icon, icon_mimetype, score) = self.fetch_custom_details()?;
         let builder = SuggestionBuilder {
-            subject: &subject,
+            subject: &subject_tuple.0,
-            subject_exact_match,
+            subject_exact_match: subject_tuple.1,
-            pre_modifier,
+            pre_modifier: pre_modifier_tuple.map(|(words, _)| words.to_string()),
-            post_modifier,
+            post_modifier: post_modifier_tuple.map(|(words, _)| words.to_string()),
-            location_sign,
+            need_location: location_sign_tuple.is_some() || location.is_some(),
+            location_sign: location_sign_tuple.map(|(words, _)| words.to_string()),
             location,
-            need_location,
             icon,
             icon_mimetype,
             score,
@@ -205,6 +211,169 @@ impl SuggestDao<'_> {
         Ok(vec![builder.into()])
     }
 
+    /// Find the modifier for given query and modifier type.
+    /// Find from last word, if set FindFrom::Last to find_from.
+    /// It returns Option<tuple> as follows:
+    /// (
+    ///   String: The keyword in DB (but the case is inherited by query).
+    ///   &[&str]: Words after removed matching modifier.
+    /// )
+    fn find_modifier<'a>(
+        &self,
+        query_words: &'a [&'a str],
+        modifier_type: Modifier,
+        find_from: FindFrom,
+    ) -> Result<Option<(String, &'a [&'a str])>> {
+        if query_words.is_empty() {
+            return Ok(None);
+        }
+
+        for n in (1..=std::cmp::min(MAX_MODIFIER_WORDS_NUMBER, query_words.len())).rev() {
+            let Some((candidate_chunk, rest)) = (match find_from {
+                FindFrom::First => query_words.split_at_checked(n),
+                FindFrom::Last => query_words
+                    .split_at_checked(query_words.len() - n)
+                    .map(|(front, back)| (back, front)),
+            }) else {
+                continue;
+            };
+
+            let candidate = candidate_chunk.join(" ");
+
+            if self.conn.query_row_and_then_cachable(
+                "
+                SELECT EXISTS (
+                    SELECT 1 FROM yelp_modifiers WHERE type = :type AND keyword = :word LIMIT 1
+                )
+                ",
+                named_params! {
+                    ":type": modifier_type,
+                    ":word": candidate.to_lowercase(),
+                },
+                |row| row.get::<_, bool>(0),
+                true,
+            )? {
+                return Ok(Some((candidate, rest)));
+            }
+        }
+
+        Ok(None)
+    }
+
+    /// Find the subject for given query.
+    /// It returns Option<tuple> as follows:
+    /// (
+    ///   String: The keyword in DB (but the case is inherited by query).
+    ///   bool: Whether or not the keyword is exact match.
+    ///   &[&str]: Words after removed matching subject.
+    /// )
+    fn find_subject<'a>(
+        &self,
+        query_words: &'a [&'a str],
+    ) -> Result<Option<(String, bool, &'a [&'a str])>> {
+        if query_words.is_empty() {
+            return Ok(None);
+        }
+
+        let mut query_string = query_words.join(" ");
+
+        // This checks if keyword is a substring of the query.
+        if let Some(keyword_lowercase) = self.conn.try_query_one::<String, _>(
+            "SELECT keyword
+             FROM yelp_subjects
+             WHERE :query BETWEEN keyword AND keyword || ' ' || x'FFFF'
+             ORDER BY LENGTH(keyword) ASC, keyword ASC
+             LIMIT 1",
+            named_params! {
+                ":query": query_string.to_lowercase(),
+            },
+            true,
+        )? {
+            // Preserve the query as the user typed it including its case.
+            return Ok(query_string.get(0..keyword_lowercase.len()).map(|keyword| {
+                let count = keyword.split_whitespace().count();
+                (
+                    keyword.to_string(),
+                    true,
+                    query_words.get(count..).unwrap_or_default(),
+                )
+            }));
+        };
+
+        if query_string.len() < SUBJECT_PREFIX_MATCH_THRESHOLD {
+            return Ok(None);
+        }
+
+        // Oppositely, this checks if the query is a substring of keyword.
+        if let Some(keyword_lowercase) = self.conn.try_query_one::<String, _>(
+            "SELECT keyword
+             FROM yelp_subjects
+             WHERE keyword BETWEEN :query AND :query || x'FFFF'
+             ORDER BY LENGTH(keyword) ASC, keyword ASC
+             LIMIT 1",
+            named_params! {
+                ":query": query_string.to_lowercase(),
+            },
+            true,
+        )? {
+            // Preserve the query as the user typed it including its case.
+            return Ok(keyword_lowercase
+                .get(query_string.len()..)
+                .map(|keyword_rest| {
+                    query_string.push_str(keyword_rest);
+                    let count =
+                        std::cmp::min(query_words.len(), query_string.split_whitespace().count());
+                    (
+                        query_string,
+                        false,
+                        query_words.get(count..).unwrap_or_default(),
+                    )
+                }));
+        };
+
+        Ok(None)
+    }
+
+    /// Find the location sign for given query.
+    /// It returns Option<tuple> as follows:
+    /// (
+    ///   String: The keyword in DB (but the case is inherited by query).
+    ///   &[&str]: Words after removed matching location sign.
+    /// )
+    fn find_location_sign<'a>(
+        &self,
+        query_words: &'a [&'a str],
+    ) -> Result<Option<(String, &'a [&'a str])>> {
+        if query_words.is_empty() {
+            return Ok(None);
+        }
+
+        for n in (1..=std::cmp::min(MAX_LOCATION_SIGN_WORDS_NUMBER, query_words.len())).rev() {
+            let Some((candidate_chunk, rest)) = query_words.split_at_checked(n) else {
+                continue;
+            };
+
+            let candidate = candidate_chunk.join(" ");
+
+            if self.conn.query_row_and_then_cachable(
+                "
+                SELECT EXISTS (
+                    SELECT 1 FROM yelp_location_signs WHERE keyword = :word LIMIT 1
+                )
+                ",
+                named_params! {
+                    ":word": candidate.to_lowercase(),
+                },
+                |row| row.get::<_, bool>(0),
+                true,
+            )? {
+                return Ok(Some((candidate, rest)));
+            }
+        }
+
+        Ok(None)
+    }
+
     /// Fetch the custom details for Yelp suggestions.
     /// It returns the location tuple as follows:
     /// (
@@ -244,202 +413,6 @@ impl SuggestDao<'_> {
 
         Ok(result)
     }
-
-    /// Find the location information from the given query string.
-    /// It returns the location tuple as follows:
-    /// (
-    ///   String: Query string that is removed found location information.
-    ///   Option<String>: Location sign found in yelp_location_signs table. If not found, returns None.
-    ///   Option<String>: Specific location name after location sign. If not found, returns None.
-    ///   bool: Reflects need_location field in the table.
-    /// )
-    fn find_location(&self, query: &str) -> Result<(String, Option<String>, Option<String>, bool)> {
-        let query_with_spaces = format!(" {} ", query);
-        let mut results: Vec<(usize, usize, i8)> = self.conn.query_rows_and_then_cached(
-            "
-        SELECT
-          INSTR(:query, ' ' || keyword || ' ') AS sign_index,
-          LENGTH(keyword) AS sign_length,
-          need_location
-        FROM yelp_location_signs
-        WHERE
-          sign_index > 0
-        ORDER BY
-          sign_length DESC
-        LIMIT 1
-        ",
-            named_params! {
-                ":query": &query_with_spaces.to_lowercase(),
-            },
-            |row| -> Result<_> {
-                Ok((
-                    row.get::<_, usize>("sign_index")?,
-                    row.get::<_, usize>("sign_length")?,
-                    row.get::<_, i8>("need_location")?,
-                ))
-            },
-        )?;
-
-        let (sign_index, sign_length, need_location) = if let Some(res) = results.pop() {
-            res
-        } else {
-            return Ok((query.trim().to_string(), None, None, false));
-        };
-
-        let pre_location = query_with_spaces
-            .get(..sign_index)
-            .map(str::trim)
-            .map(str::to_string)
-            .unwrap_or_default();
-        let location_sign = query_with_spaces
-            .get(sign_index..sign_index + sign_length)
-            .map(str::trim)
-            .filter(|s| !s.is_empty())
-            .map(str::to_string);
-        let location = query_with_spaces
-            .get(sign_index + sign_length..)
-            .map(str::trim)
-            .filter(|s| !s.is_empty())
-            .map(str::to_string);
-
-        Ok((pre_location, location_sign, location, need_location == 1))
-    }
-
-    /// Find the pre/post modifier from the given query string.
-    /// It returns the modifiers tuple as follows:
-    /// (
-    ///   String: Query string that is removed found the modifiers.
-    ///   Option<String>: Pre-modifier found in the yelp_modifiers table. If not found, returns None.
-    ///   Option<String>: Post-modifier found in the yelp_modifiers table. If not found, returns None.
-    /// )
-    fn find_modifiers(
-        &self,
-        query: &str,
-        pre_modifier_type: Modifier,
-        post_modifier_type: Modifier,
-    ) -> Result<(String, Option<String>, Option<String>)> {
-        if !query.contains(' ') {
-            return Ok((query.to_string(), None, None));
-        }
-
-        let words: Vec<_> = query.split_whitespace().collect();
-
-        let mut pre_modifier = None;
-        for n in (1..=MAX_MODIFIER_WORDS_NUMBER).rev() {
-            let mut candidate_chunks = words.chunks(n);
-            let candidate = candidate_chunks.next().unwrap_or(&[""]).join(" ");
-            if self.is_modifier(&candidate, pre_modifier_type)? {
-                pre_modifier = Some(candidate);
-                break;
-            }
-        }
-
-        let mut post_modifier = None;
-        for n in (1..=MAX_MODIFIER_WORDS_NUMBER).rev() {
-            let mut candidate_chunks = words.rchunks(n);
-            let candidate = candidate_chunks.next().unwrap_or(&[""]).join(" ");
-            if self.is_modifier(&candidate, post_modifier_type)? {
-                post_modifier = Some(candidate);
-                break;
-            }
-        }
-
-        let mut without_modifiers = query;
-        if let Some(ref modifier) = pre_modifier {
-            without_modifiers = &without_modifiers[modifier.len()..];
-        }
-        if let Some(ref modifier) = post_modifier {
-            without_modifiers = &without_modifiers[..without_modifiers.len() - modifier.len()];
-        }
-
-        Ok((
-            without_modifiers.trim().to_string(),
-            pre_modifier,
-            post_modifier,
-        ))
-    }
-
-    /// Find the subject from the given string.
-    /// It returns the Option. If it is not none, it contains the tuple as follows:
-    /// (
-    ///   String: Subject.
-    ///   bool: Whether the subject matched exactly with the parameter.
-    /// )
-    fn find_subject(&self, candidate: &str) -> Result<Option<(String, bool)>> {
-        if candidate.is_empty() {
-            return Ok(None);
-        }
-
-        // If the length of subject candidate is less than
-        // SUBJECT_PREFIX_MATCH_THRESHOLD, should exact match.
-        if candidate.len() < SUBJECT_PREFIX_MATCH_THRESHOLD {
-            return Ok(if self.is_subject(candidate)? {
-                Some((candidate.to_string(), true))
-            } else {
-                None
-            });
-        }
-
-        // Otherwise, apply prefix-match.
-        Ok(
-            match self.conn.query_row_and_then_cachable(
-                "SELECT keyword
-                 FROM yelp_subjects
-                 WHERE keyword BETWEEN :candidate AND :candidate || x'FFFF'
-                 ORDER BY LENGTH(keyword) ASC, keyword ASC
-                 LIMIT 1",
-                named_params! {
-                    ":candidate": candidate.to_lowercase(),
-                },
-                |row| row.get::<_, String>(0),
-                true,
-            ) {
-                Ok(keyword) => {
-                    debug_assert!(candidate.len() <= keyword.len());
-                    Some((
-                        format!("{}{}", candidate, &keyword[candidate.len()..]),
-                        candidate.len() == keyword.len(),
-                    ))
-                }
-                Err(_) => None,
-            },
-        )
-    }
-
-    fn is_modifier(&self, word: &str, modifier_type: Modifier) -> Result<bool> {
-        let result = self.conn.query_row_and_then_cachable(
-            "
-        SELECT EXISTS (
-            SELECT 1 FROM yelp_modifiers WHERE type = :type AND keyword = :word LIMIT 1
-        )
-        ",
-            named_params! {
-                ":type": modifier_type,
-                ":word": word.to_lowercase(),
-            },
-            |row| row.get::<_, bool>(0),
-            true,
-        )?;
-
-        Ok(result)
-    }
-
-    fn is_subject(&self, word: &str) -> Result<bool> {
-        let result = self.conn.query_row_and_then_cachable(
-            "
-        SELECT EXISTS (
-            SELECT 1 FROM yelp_subjects WHERE keyword = :word LIMIT 1
-        )
-        ",
-            named_params! {
-                ":word": word.to_lowercase(),
-            },
-            |row| row.get::<_, bool>(0),
-            true,
-        )?;
-
-        Ok(result)
-    }
 }
 
 struct SuggestionBuilder<'a> {
@@ -509,3 +482,218 @@ impl<'a> From<SuggestionBuilder<'a>> for Suggestion {
         }
     }
 }
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    use crate::{store::tests::TestStore, testing::*, SuggestIngestionConstraints};
+
+    #[test]
+    fn yelp_functions() -> anyhow::Result<()> {
+        before_each();
+
+        let store = TestStore::new(
+            MockRemoteSettingsClient::default()
+                .with_record(SuggestionProvider::Yelp.record("data-4", json!([ramen_yelp()])))
+                .with_record(SuggestionProvider::Yelp.icon(yelp_favicon())),
+        );
+
+        store.ingest(SuggestIngestionConstraints {
+            providers: Some(vec![SuggestionProvider::Yelp]),
+            ..SuggestIngestionConstraints::all_providers()
+        });
+
+        store.read(|dao| {
+            type FindModifierTestCase<'a> =
+                (&'a str, Modifier, FindFrom, Option<(String, &'a [&'a str])>);
+            let find_modifer_tests: &[FindModifierTestCase] = &[
+                // Query, Modifier, FindFrom, Expected result.
+                ("", Modifier::Pre, FindFrom::First, None),
+                ("", Modifier::Post, FindFrom::First, None),
+                ("", Modifier::Yelp, FindFrom::First, None),
+                // Single word modifier.
+                ("b", Modifier::Pre, FindFrom::First, None),
+                ("be", Modifier::Pre, FindFrom::First, None),
+                ("bes", Modifier::Pre, FindFrom::First, None),
+                (
+                    "best",
+                    Modifier::Pre,
+                    FindFrom::First,
+                    Some(("best".to_string(), &[])),
+                ),
+                (
+                    "best ",
+                    Modifier::Pre,
+                    FindFrom::First,
+                    Some(("best".to_string(), &[])),
+                ),
+                (
+                    "best r",
+                    Modifier::Pre,
+                    FindFrom::First,
+                    Some(("best".to_string(), &["r"])),
+                ),
+                (
+                    "best ramen",
+                    Modifier::Pre,
+                    FindFrom::First,
+                    Some(("best".to_string(), &["ramen"])),
+                ),
+                (
+                    "best spicy ramen",
+                    Modifier::Pre,
+                    FindFrom::First,
+                    Some(("best".to_string(), &["spicy", "ramen"])),
+                ),
+                (
+                    "delivery",
+                    Modifier::Post,
+                    FindFrom::First,
+                    Some(("delivery".to_string(), &[])),
+                ),
+                (
+                    "yelp",
+                    Modifier::Yelp,
+                    FindFrom::First,
+                    Some(("yelp".to_string(), &[])),
+                ),
+                (
+                    "same_modifier",
+                    Modifier::Pre,
+                    FindFrom::First,
+                    Some(("same_modifier".to_string(), &[])),
+                ),
+                (
+                    "same_modifier",
+                    Modifier::Post,
+                    FindFrom::First,
+                    Some(("same_modifier".to_string(), &[])),
+                ),
+                ("same_modifier", Modifier::Yelp, FindFrom::First, None),
+                // Multiple word modifier.
+                ("super", Modifier::Pre, FindFrom::First, None),
+                ("super b", Modifier::Pre, FindFrom::First, None),
+                ("super be", Modifier::Pre, FindFrom::First, None),
+                ("super bes", Modifier::Pre, FindFrom::First, None),
+                (
+                    "super best",
+                    Modifier::Pre,
+                    FindFrom::First,
+                    Some(("super best".to_string(), &[])),
+                ),
+                (
+                    "super best ramen",
+                    Modifier::Pre,
+                    FindFrom::First,
+                    Some(("super best".to_string(), &["ramen"])),
+                ),
+                (
+                    "super delivery",
+                    Modifier::Post,
+                    FindFrom::First,
+                    Some(("super delivery".to_string(), &[])),
+                ),
+                (
+                    "yelp keyword",
+                    Modifier::Yelp,
+                    FindFrom::First,
+                    Some(("yelp keyword".to_string(), &[])),
+                ),
+                // Different modifier or findfrom.
+                ("best ramen", Modifier::Post, FindFrom::First, None),
+                ("best ramen", Modifier::Yelp, FindFrom::First, None),
+                ("best ramen", Modifier::Pre, FindFrom::Last, None),
+                (
+                    "ramen best",
+                    Modifier::Pre,
+                    FindFrom::Last,
+                    Some(("best".to_string(), &["ramen"])),
+                ),
+                // Keywords similar to modifire.
+                ("bestabc", Modifier::Post, FindFrom::First, None),
+                ("bestabc ramen", Modifier::Post, FindFrom::First, None),
+                // Keep chars case.
+                (
+                    "BeSt SpIcY rAmEn",
+                    Modifier::Pre,
+                    FindFrom::First,
+                    Some(("BeSt".to_string(), &["SpIcY", "rAmEn"])),
+                ),
+                (
+                    "SpIcY rAmEn DeLiVeRy",
+                    Modifier::Post,
+                    FindFrom::Last,
+                    Some(("DeLiVeRy".to_string(), &["SpIcY", "rAmEn"])),
+                ),
+            ];
+            for (query, modifier, findfrom, expected) in find_modifer_tests {
+                assert_eq!(
+                    dao.find_modifier(
+                        &query.split_whitespace().collect::<Vec<_>>(),
+                        *modifier,
+                        *findfrom
+                    )?,
+                    *expected
+                );
+            }
+
+            type FindSubjectTestCase<'a> = (&'a str, Option<(String, bool, &'a [&'a str])>);
+            let find_subject_tests: &[FindSubjectTestCase] = &[
+                // Query, Expected result.
+                ("", None),
+                ("r", None),
+                ("ra", Some(("rats".to_string(), false, &[]))),
+                ("ram", Some(("ramen".to_string(), false, &[]))),
+                ("rame", Some(("ramen".to_string(), false, &[]))),
+                ("ramen", Some(("ramen".to_string(), true, &[]))),
+                ("spi", Some(("spicy ramen".to_string(), false, &[]))),
+                ("spicy ra ", Some(("spicy ramen".to_string(), false, &[]))),
+                ("spicy ramen", Some(("spicy ramen".to_string(), true, &[]))),
+                (
+                    "spicy ramen gogo",
+                    Some(("spicy ramen".to_string(), true, &["gogo"])),
+                ),
+                (
+                    "SpIcY rAmEn GoGo",
+                    Some(("SpIcY rAmEn".to_string(), true, &["GoGo"])),
+                ),
+                ("ramenabc", None),
+                ("ramenabc xyz", None),
+                ("spicy ramenabc", None),
+                ("spicy ramenabc xyz", None),
+                ("ramen abc", Some(("ramen".to_string(), true, &["abc"]))),
+            ];
+            for (query, expected) in find_subject_tests {
+                assert_eq!(
+                    dao.find_subject(&query.split_whitespace().collect::<Vec<_>>())?,
+                    *expected
+                );
+            }
+
+            type FindLocationSignTestCase<'a> = (&'a str, Option<(String, &'a [&'a str])>);
+            let find_location_sign_tests: &[FindLocationSignTestCase] = &[
+                // Query, Expected result.
+                ("", None),
+                ("n", None),
+                ("ne", None),
+                ("nea", None),
+                ("near", Some(("near".to_string(), &[]))),
+                ("near ", Some(("near".to_string(), &[]))),
+                ("near b", Some(("near".to_string(), &["b"]))),
+                ("near by", Some(("near by".to_string(), &[]))),
+                ("near by a", Some(("near by".to_string(), &["a"]))),
+            ];
+            for (query, expected) in find_location_sign_tests {
+                assert_eq!(
+                    dao.find_location_sign(&query.split_whitespace().collect::<Vec<_>>())?,
+                    *expected
+                );
+            }
+
+            Ok(())
+        })?;
+
+        Ok(())
+    }
+}

toolkit/components/uniffi-bindgen-gecko-js/components/generated/RustRelevancy.sys.mjs

@@ -438,9 +438,9 @@ export class RelevancyStore {
      * This is non-blocking since databases and other resources are lazily opened.
      * @returns {RelevancyStore}
      */
-    static init(dbPath) {
+    static init(dbPath,remoteSettings) {
         const liftResult = (result) => FfiConverterTypeRelevancyStore.lift(result);
-        const liftError = (data) => FfiConverterTypeRelevancyApiError.lift(data);
+        const liftError = null;
         const functionCall = () => {
             try {
                 FfiConverterString.checkType(dbPath)
@@ -450,9 +450,18 @@ export class RelevancyStore {
                 }
                 throw e;
             }
+            try {
+                FfiConverterTypeRemoteSettingsService.checkType(remoteSettings)
+            } catch (e) {
+                if (e instanceof UniFFITypeError) {
+                    e.addItemDescriptionPart("remoteSettings");
+                }
+                throw e;
+            }
             return UniFFIScaffolding.callSync(
                 12, // relevancy:uniffi_relevancy_fn_constructor_relevancystore_new
                 FfiConverterString.lower(dbPath),
+                FfiConverterTypeRemoteSettingsService.lower(remoteSettings),
             )
         }
         return handleRustResult(functionCall(), liftResult, liftError);}
@@ -1948,7 +1957,13 @@ export class FfiConverterSequenceTypeInterest extends FfiConverterArrayBuffer {
     }
 }
 
+import {
+  FfiConverterTypeRemoteSettingsService,
+  RemoteSettingsService,
+} from "resource://gre/modules/RustRemoteSettings.sys.mjs";
 
+// Export the FFIConverter object to make external types work.
+export { FfiConverterTypeRemoteSettingsService, RemoteSettingsService };
 
 
 

toolkit/components/uniffi-bindgen-gecko-js/components/generated/RustRemoteSettings.sys.mjs

@@ -607,6 +607,25 @@ export class RemoteSettingsClient {
         this[uniffiObjectPtr] = opts[constructUniffiObject];
     }
 
+    /**
+     * close
+     */
+    close() {
+        const liftResult = (result) => undefined;
+        const liftError = null;
+        const functionCall = () => {
+            return UniFFIScaffolding.callAsyncWrapper(
+                17, // remote_settings:uniffi_remote_settings_fn_method_remotesettingsclient_close
+                FfiConverterTypeRemoteSettingsClient.lower(this),
+            )
+        }
+        try {
+            return functionCall().then((result) => handleRustResult(result, liftResult, liftError));
+        }  catch (error) {
+            return Promise.reject(error)
+        }
+    }
+
     /**
      * Collection this client is for
      * @returns {string}
@@ -616,7 +635,7 @@ export class RemoteSettingsClient {
         const liftError = null;
         const functionCall = () => {
             return UniFFIScaffolding.callAsyncWrapper(
-                17, // remote_settings:uniffi_remote_settings_fn_method_remotesettingsclient_collection_name
+                18, // remote_settings:uniffi_remote_settings_fn_method_remotesettingsclient_collection_name
                 FfiConverterTypeRemoteSettingsClient.lower(this),
             )
         }
@@ -652,7 +671,7 @@ export class RemoteSettingsClient {
                 throw e;
             }
             return UniFFIScaffolding.callAsyncWrapper(
-                18, // remote_settings:uniffi_remote_settings_fn_method_remotesettingsclient_get_attachment
+                19, // remote_settings:uniffi_remote_settings_fn_method_remotesettingsclient_get_attachment
                 FfiConverterTypeRemoteSettingsClient.lower(this),
                 FfiConverterTypeRemoteSettingsRecord.lower(record),
             )
@@ -696,7 +715,7 @@ export class RemoteSettingsClient {
                 throw e;
             }
             return UniFFIScaffolding.callAsyncWrapper(
-                19, // remote_settings:uniffi_remote_settings_fn_method_remotesettingsclient_get_records
+                20, // remote_settings:uniffi_remote_settings_fn_method_remotesettingsclient_get_records
                 FfiConverterTypeRemoteSettingsClient.lower(this),
                 FfiConverterBool.lower(syncIfEmpty),
             )
@@ -728,7 +747,7 @@ export class RemoteSettingsClient {
                 throw e;
             }
             return UniFFIScaffolding.callAsyncWrapper(
-                20, // remote_settings:uniffi_remote_settings_fn_method_remotesettingsclient_get_records_map
+                21, // remote_settings:uniffi_remote_settings_fn_method_remotesettingsclient_get_records_map
                 FfiConverterTypeRemoteSettingsClient.lower(this),
                 FfiConverterBool.lower(syncIfEmpty),
             )
@@ -748,7 +767,7 @@ export class RemoteSettingsClient {
         const liftError = (data) => FfiConverterTypeRemoteSettingsError.lift(data);
         const functionCall = () => {
             return UniFFIScaffolding.callAsyncWrapper(
-                21, // remote_settings:uniffi_remote_settings_fn_method_remotesettingsclient_sync
+                22, // remote_settings:uniffi_remote_settings_fn_method_remotesettingsclient_sync
                 FfiConverterTypeRemoteSettingsClient.lower(this),
             )
         }
@@ -843,7 +862,7 @@ export class RemoteSettingsService {
                 throw e;
             }
             return UniFFIScaffolding.callSync(
-                25, // remote_settings:uniffi_remote_settings_fn_constructor_remotesettingsservice_new
+                26, // remote_settings:uniffi_remote_settings_fn_constructor_remotesettingsservice_new
                 FfiConverterString.lower(storageDir),
                 FfiConverterTypeRemoteSettingsConfig2.lower(config),
             )
@@ -858,7 +877,7 @@ export class RemoteSettingsService {
      */
     makeClient(collectionName) {
         const liftResult = (result) => FfiConverterTypeRemoteSettingsClient.lift(result);
-        const liftError = (data) => FfiConverterTypeRemoteSettingsError.lift(data);
+        const liftError = null;
         const functionCall = () => {
             try {
                 FfiConverterString.checkType(collectionName)
@@ -869,7 +888,7 @@ export class RemoteSettingsService {
                 throw e;
             }
             return UniFFIScaffolding.callAsyncWrapper(
-                22, // remote_settings:uniffi_remote_settings_fn_method_remotesettingsservice_make_client
+                23, // remote_settings:uniffi_remote_settings_fn_method_remotesettingsservice_make_client
                 FfiConverterTypeRemoteSettingsService.lower(this),
                 FfiConverterString.lower(collectionName),
             )
@@ -890,7 +909,7 @@ export class RemoteSettingsService {
         const liftError = (data) => FfiConverterTypeRemoteSettingsError.lift(data);
         const functionCall = () => {
             return UniFFIScaffolding.callAsyncWrapper(
-                23, // remote_settings:uniffi_remote_settings_fn_method_remotesettingsservice_sync
+                24, // remote_settings:uniffi_remote_settings_fn_method_remotesettingsservice_sync
                 FfiConverterTypeRemoteSettingsService.lower(this),
             )
         }
@@ -923,7 +942,7 @@ export class RemoteSettingsService {
                 throw e;
             }
             return UniFFIScaffolding.callAsyncWrapper(
-                24, // remote_settings:uniffi_remote_settings_fn_method_remotesettingsservice_update_config
+                25, // remote_settings:uniffi_remote_settings_fn_method_remotesettingsservice_update_config
                 FfiConverterTypeRemoteSettingsService.lower(this),
                 FfiConverterTypeRemoteSettingsConfig2.lower(config),
             )

toolkit/components/uniffi-bindgen-gecko-js/components/generated/RustSearch.sys.mjs

@@ -396,7 +396,7 @@ export class SearchEngineSelector {
         const liftError = null;
         const functionCall = () => {
             return UniFFIScaffolding.callSync(
-                31, // search:uniffi_search_fn_constructor_searchengineselector_new
+                32, // search:uniffi_search_fn_constructor_searchengineselector_new
             )
         }
         return handleRustResult(functionCall(), liftResult, liftError);}
@@ -411,7 +411,7 @@ export class SearchEngineSelector {
         const liftError = null;
         const functionCall = () => {
             return UniFFIScaffolding.callSync(
-                26, // search:uniffi_search_fn_method_searchengineselector_clear_search_config
+                27, // search:uniffi_search_fn_method_searchengineselector_clear_search_config
                 FfiConverterTypeSearchEngineSelector.lower(this),
             )
         }
@@ -437,7 +437,7 @@ export class SearchEngineSelector {
                 throw e;
             }
             return UniFFIScaffolding.callSync(
-                27, // search:uniffi_search_fn_method_searchengineselector_filter_engine_configuration
+                28, // search:uniffi_search_fn_method_searchengineselector_filter_engine_configuration
                 FfiConverterTypeSearchEngineSelector.lower(this),
                 FfiConverterTypeSearchUserEnvironment.lower(userEnvironment),
             )
@@ -461,7 +461,7 @@ export class SearchEngineSelector {
                 throw e;
             }
             return UniFFIScaffolding.callSync(
-                28, // search:uniffi_search_fn_method_searchengineselector_set_config_overrides
+                29, // search:uniffi_search_fn_method_searchengineselector_set_config_overrides
                 FfiConverterTypeSearchEngineSelector.lower(this),
                 FfiConverterString.lower(overrides),
             )
@@ -489,7 +489,7 @@ export class SearchEngineSelector {
                 throw e;
             }
             return UniFFIScaffolding.callSync(
-                29, // search:uniffi_search_fn_method_searchengineselector_set_search_config
+                30, // search:uniffi_search_fn_method_searchengineselector_set_search_config
                 FfiConverterTypeSearchEngineSelector.lower(this),
                 FfiConverterString.lower(configuration),
             )
@@ -511,7 +511,7 @@ export class SearchEngineSelector {
      */
     useRemoteSettingsServer(service,applyEngineOverrides) {
         const liftResult = (result) => undefined;
-        const liftError = (data) => FfiConverterTypeSearchApiError.lift(data);
+        const liftError = null;
         const functionCall = () => {
             try {
                 FfiConverterTypeRemoteSettingsService.checkType(service)
@@ -530,7 +530,7 @@ export class SearchEngineSelector {
                 throw e;
             }
             return UniFFIScaffolding.callAsyncWrapper(
-                30, // search:uniffi_search_fn_method_searchengineselector_use_remote_settings_server
+                31, // search:uniffi_search_fn_method_searchengineselector_use_remote_settings_server
                 FfiConverterTypeSearchEngineSelector.lower(this),
                 FfiConverterTypeRemoteSettingsService.lower(service),
                 FfiConverterBool.lower(applyEngineOverrides),

toolkit/components/uniffi-bindgen-gecko-js/components/generated/RustSuggest.sys.mjs

@@ -532,7 +532,7 @@ export class SuggestStore {
      */
     static init(path,remoteSettingsService) {
         const liftResult = (result) => FfiConverterTypeSuggestStore.lift(result);
-        const liftError = (data) => FfiConverterTypeSuggestApiError.lift(data);
+        const liftError = null;
         const functionCall = () => {
             try {
                 FfiConverterString.checkType(path)
@@ -551,7 +551,7 @@ export class SuggestStore {
                 throw e;
             }
             return UniFFIScaffolding.callSync(
-                48, // suggest:uniffi_suggest_fn_constructor_suggeststore_new
+                49, // suggest:uniffi_suggest_fn_constructor_suggeststore_new
                 FfiConverterString.lower(path),
                 FfiConverterTypeRemoteSettingsService.lower(remoteSettingsService),
             )
@@ -567,7 +567,7 @@ export class SuggestStore {
         const liftError = (data) => FfiConverterTypeSuggestApiError.lift(data);
         const functionCall = () => {
             return UniFFIScaffolding.callAsyncWrapper(
-                33, // suggest:uniffi_suggest_fn_method_suggeststore_any_dismissed_suggestions
+                34, // suggest:uniffi_suggest_fn_method_suggeststore_any_dismissed_suggestions
                 FfiConverterTypeSuggestStore.lower(this),
             )
         }
@@ -586,7 +586,7 @@ export class SuggestStore {
         const liftError = (data) => FfiConverterTypeSuggestApiError.lift(data);
         const functionCall = () => {
             return UniFFIScaffolding.callAsyncWrapper(
-                34, // suggest:uniffi_suggest_fn_method_suggeststore_clear
+                35, // suggest:uniffi_suggest_fn_method_suggeststore_clear
                 FfiConverterTypeSuggestStore.lower(this),
             )
         }
@@ -605,7 +605,7 @@ export class SuggestStore {
         const liftError = (data) => FfiConverterTypeSuggestApiError.lift(data);
         const functionCall = () => {
             return UniFFIScaffolding.callAsyncWrapper(
-                35, // suggest:uniffi_suggest_fn_method_suggeststore_clear_dismissed_suggestions
+                36, // suggest:uniffi_suggest_fn_method_suggeststore_clear_dismissed_suggestions
                 FfiConverterTypeSuggestStore.lower(this),
             )
         }
@@ -638,7 +638,7 @@ export class SuggestStore {
                 throw e;
             }
             return UniFFIScaffolding.callAsyncWrapper(
-                36, // suggest:uniffi_suggest_fn_method_suggeststore_dismiss_by_key
+                37, // suggest:uniffi_suggest_fn_method_suggeststore_dismiss_by_key
                 FfiConverterTypeSuggestStore.lower(this),
                 FfiConverterString.lower(key),
             )
@@ -668,7 +668,7 @@ export class SuggestStore {
                 throw e;
             }
             return UniFFIScaffolding.callAsyncWrapper(
-                37, // suggest:uniffi_suggest_fn_method_suggeststore_dismiss_by_suggestion
+                38, // suggest:uniffi_suggest_fn_method_suggeststore_dismiss_by_suggestion
                 FfiConverterTypeSuggestStore.lower(this),
                 FfiConverterTypeSuggestion.lower(suggestion),
             )
@@ -701,7 +701,7 @@ export class SuggestStore {
                 throw e;
             }
             return UniFFIScaffolding.callAsyncWrapper(
-                38, // suggest:uniffi_suggest_fn_method_suggeststore_dismiss_suggestion
+                39, // suggest:uniffi_suggest_fn_method_suggeststore_dismiss_suggestion
                 FfiConverterTypeSuggestStore.lower(this),
                 FfiConverterString.lower(suggestionUrl),
             )
@@ -776,7 +776,7 @@ export class SuggestStore {
                 throw e;
             }
             return UniFFIScaffolding.callAsyncWrapper(
-                39, // suggest:uniffi_suggest_fn_method_suggeststore_fetch_geonames
+                40, // suggest:uniffi_suggest_fn_method_suggeststore_fetch_geonames
                 FfiConverterTypeSuggestStore.lower(this),
                 FfiConverterString.lower(query),
                 FfiConverterBool.lower(matchNamePrefix),
@@ -800,7 +800,7 @@ export class SuggestStore {
         const liftError = (data) => FfiConverterTypeSuggestApiError.lift(data);
         const functionCall = () => {
             return UniFFIScaffolding.callAsyncWrapper(
-                40, // suggest:uniffi_suggest_fn_method_suggeststore_fetch_global_config
+                41, // suggest:uniffi_suggest_fn_method_suggeststore_fetch_global_config
                 FfiConverterTypeSuggestStore.lower(this),
             )
         }
@@ -828,7 +828,7 @@ export class SuggestStore {
                 throw e;
             }
             return UniFFIScaffolding.callAsyncWrapper(
-                41, // suggest:uniffi_suggest_fn_method_suggeststore_fetch_provider_config
+                42, // suggest:uniffi_suggest_fn_method_suggeststore_fetch_provider_config
                 FfiConverterTypeSuggestStore.lower(this),
                 FfiConverterTypeSuggestionProvider.lower(provider),
             )
@@ -857,7 +857,7 @@ export class SuggestStore {
                 throw e;
             }
             return UniFFIScaffolding.callAsyncWrapper(
-                42, // suggest:uniffi_suggest_fn_method_suggeststore_ingest
+                43, // suggest:uniffi_suggest_fn_method_suggeststore_ingest
                 FfiConverterTypeSuggestStore.lower(this),
                 FfiConverterTypeSuggestIngestionConstraints.lower(constraints),
             )
@@ -889,7 +889,7 @@ export class SuggestStore {
                 throw e;
             }
             return UniFFIScaffolding.callSync(
-                43, // suggest:uniffi_suggest_fn_method_suggeststore_interrupt
+                44, // suggest:uniffi_suggest_fn_method_suggeststore_interrupt
                 FfiConverterTypeSuggestStore.lower(this),
                 FfiConverterOptionalTypeInterruptKind.lower(kind),
             )
@@ -919,7 +919,7 @@ export class SuggestStore {
                 throw e;
             }
             return UniFFIScaffolding.callAsyncWrapper(
-                44, // suggest:uniffi_suggest_fn_method_suggeststore_is_dismissed_by_key
+                45, // suggest:uniffi_suggest_fn_method_suggeststore_is_dismissed_by_key
                 FfiConverterTypeSuggestStore.lower(this),
                 FfiConverterString.lower(key),
             )
@@ -952,7 +952,7 @@ export class SuggestStore {
                 throw e;
             }
             return UniFFIScaffolding.callAsyncWrapper(
-                45, // suggest:uniffi_suggest_fn_method_suggeststore_is_dismissed_by_suggestion
+                46, // suggest:uniffi_suggest_fn_method_suggeststore_is_dismissed_by_suggestion
                 FfiConverterTypeSuggestStore.lower(this),
                 FfiConverterTypeSuggestion.lower(suggestion),
             )
@@ -981,7 +981,7 @@ export class SuggestStore {
                 throw e;
             }
             return UniFFIScaffolding.callAsyncWrapper(
-                46, // suggest:uniffi_suggest_fn_method_suggeststore_query
+                47, // suggest:uniffi_suggest_fn_method_suggeststore_query
                 FfiConverterTypeSuggestStore.lower(this),
                 FfiConverterTypeSuggestionQuery.lower(query),
             )
@@ -1010,7 +1010,7 @@ export class SuggestStore {
                 throw e;
             }
             return UniFFIScaffolding.callAsyncWrapper(
-                47, // suggest:uniffi_suggest_fn_method_suggeststore_query_with_metrics
+                48, // suggest:uniffi_suggest_fn_method_suggeststore_query_with_metrics
                 FfiConverterTypeSuggestStore.lower(this),
                 FfiConverterTypeSuggestionQuery.lower(query),
             )
@@ -1081,7 +1081,7 @@ export class SuggestStoreBuilder {
         const liftError = null;
         const functionCall = () => {
             return UniFFIScaffolding.callSync(
-                56, // suggest:uniffi_suggest_fn_constructor_suggeststorebuilder_new
+                57, // suggest:uniffi_suggest_fn_constructor_suggeststorebuilder_new
             )
         }
         return handleRustResult(functionCall(), liftResult, liftError);}
@@ -1095,7 +1095,7 @@ export class SuggestStoreBuilder {
         const liftError = (data) => FfiConverterTypeSuggestApiError.lift(data);
         const functionCall = () => {
             return UniFFIScaffolding.callSync(
-                49, // suggest:uniffi_suggest_fn_method_suggeststorebuilder_build
+                50, // suggest:uniffi_suggest_fn_method_suggeststorebuilder_build
                 FfiConverterTypeSuggestStoreBuilder.lower(this),
             )
         }
@@ -1119,7 +1119,7 @@ export class SuggestStoreBuilder {
                 throw e;
             }
             return UniFFIScaffolding.callAsyncWrapper(
-                50, // suggest:uniffi_suggest_fn_method_suggeststorebuilder_cache_path
+                51, // suggest:uniffi_suggest_fn_method_suggeststorebuilder_cache_path
                 FfiConverterTypeSuggestStoreBuilder.lower(this),
                 FfiConverterString.lower(path),
             )
@@ -1148,7 +1148,7 @@ export class SuggestStoreBuilder {
                 throw e;
             }
             return UniFFIScaffolding.callSync(
-                51, // suggest:uniffi_suggest_fn_method_suggeststorebuilder_data_path
+                52, // suggest:uniffi_suggest_fn_method_suggeststorebuilder_data_path
                 FfiConverterTypeSuggestStoreBuilder.lower(this),
                 FfiConverterString.lower(path),
             )
@@ -1185,7 +1185,7 @@ export class SuggestStoreBuilder {
                 throw e;
             }
             return UniFFIScaffolding.callSync(
-                52, // suggest:uniffi_suggest_fn_method_suggeststorebuilder_load_extension
+                53, // suggest:uniffi_suggest_fn_method_suggeststorebuilder_load_extension
                 FfiConverterTypeSuggestStoreBuilder.lower(this),
                 FfiConverterString.lower(library),
                 FfiConverterOptionalstring.lower(entryPoint),
@@ -1211,7 +1211,7 @@ export class SuggestStoreBuilder {
                 throw e;
             }
             return UniFFIScaffolding.callSync(
-                53, // suggest:uniffi_suggest_fn_method_suggeststorebuilder_remote_settings_bucket_name
+                54, // suggest:uniffi_suggest_fn_method_suggeststorebuilder_remote_settings_bucket_name
                 FfiConverterTypeSuggestStoreBuilder.lower(this),
                 FfiConverterString.lower(bucketName),
             )
@@ -1236,7 +1236,7 @@ export class SuggestStoreBuilder {
                 throw e;
             }
             return UniFFIScaffolding.callSync(
-                54, // suggest:uniffi_suggest_fn_method_suggeststorebuilder_remote_settings_server
+                55, // suggest:uniffi_suggest_fn_method_suggeststorebuilder_remote_settings_server
                 FfiConverterTypeSuggestStoreBuilder.lower(this),
                 FfiConverterTypeRemoteSettingsServer.lower(server),
             )
@@ -1261,7 +1261,7 @@ export class SuggestStoreBuilder {
                 throw e;
             }
             return UniFFIScaffolding.callSync(
-                55, // suggest:uniffi_suggest_fn_method_suggeststorebuilder_remote_settings_service
+                56, // suggest:uniffi_suggest_fn_method_suggeststorebuilder_remote_settings_service
                 FfiConverterTypeSuggestStoreBuilder.lower(this),
                 FfiConverterTypeRemoteSettingsService.lower(rsService),
             )
@@ -4305,7 +4305,7 @@ export function rawSuggestionUrlMatches(rawUrl,cookedUrl) {
                 throw e;
             }
             return UniFFIScaffolding.callSync(
-                32, // suggest:uniffi_suggest_fn_func_raw_suggestion_url_matches
+                33, // suggest:uniffi_suggest_fn_func_raw_suggestion_url_matches
                 FfiConverterString.lower(rawUrl),
                 FfiConverterString.lower(cookedUrl),
             )

toolkit/components/uniffi-bindgen-gecko-js/components/generated/RustTabs.sys.mjs

@@ -448,7 +448,7 @@ export class RemoteCommandStore {
                 throw e;
             }
             return UniFFIScaffolding.callAsyncWrapper(
-                57, // tabs:uniffi_tabs_fn_method_remotecommandstore_add_remote_command
+                58, // tabs:uniffi_tabs_fn_method_remotecommandstore_add_remote_command
                 FfiConverterTypeRemoteCommandStore.lower(this),
                 FfiConverterString.lower(deviceId),
                 FfiConverterTypeRemoteCommand.lower(command),
@@ -494,7 +494,7 @@ export class RemoteCommandStore {
                 throw e;
             }
             return UniFFIScaffolding.callAsyncWrapper(
-                58, // tabs:uniffi_tabs_fn_method_remotecommandstore_add_remote_command_at
+                59, // tabs:uniffi_tabs_fn_method_remotecommandstore_add_remote_command_at
                 FfiConverterTypeRemoteCommandStore.lower(this),
                 FfiConverterString.lower(deviceId),
                 FfiConverterTypeRemoteCommand.lower(command),
@@ -517,7 +517,7 @@ export class RemoteCommandStore {
         const liftError = (data) => FfiConverterTypeTabsApiError.lift(data);
         const functionCall = () => {
             return UniFFIScaffolding.callAsyncWrapper(
-                59, // tabs:uniffi_tabs_fn_method_remotecommandstore_get_unsent_commands
+                60, // tabs:uniffi_tabs_fn_method_remotecommandstore_get_unsent_commands
                 FfiConverterTypeRemoteCommandStore.lower(this),
             )
         }
@@ -554,7 +554,7 @@ export class RemoteCommandStore {
                 throw e;
             }
             return UniFFIScaffolding.callAsyncWrapper(
-                60, // tabs:uniffi_tabs_fn_method_remotecommandstore_remove_remote_command
+                61, // tabs:uniffi_tabs_fn_method_remotecommandstore_remove_remote_command
                 FfiConverterTypeRemoteCommandStore.lower(this),
                 FfiConverterString.lower(deviceId),
                 FfiConverterTypeRemoteCommand.lower(command),
@@ -584,7 +584,7 @@ export class RemoteCommandStore {
                 throw e;
             }
             return UniFFIScaffolding.callAsyncWrapper(
-                61, // tabs:uniffi_tabs_fn_method_remotecommandstore_set_pending_command_sent
+                62, // tabs:uniffi_tabs_fn_method_remotecommandstore_set_pending_command_sent
                 FfiConverterTypeRemoteCommandStore.lower(this),
                 FfiConverterTypePendingCommand.lower(command),
             )
@@ -655,7 +655,7 @@ export class TabsBridgedEngine {
         const liftError = (data) => FfiConverterTypeTabsApiError.lift(data);
         const functionCall = () => {
             return UniFFIScaffolding.callAsyncWrapper(
-                62, // tabs:uniffi_tabs_fn_method_tabsbridgedengine_apply
+                63, // tabs:uniffi_tabs_fn_method_tabsbridgedengine_apply
                 FfiConverterTypeTabsBridgedEngine.lower(this),
             )
         }
@@ -683,7 +683,7 @@ export class TabsBridgedEngine {
                 throw e;
             }
             return UniFFIScaffolding.callAsyncWrapper(
-                63, // tabs:uniffi_tabs_fn_method_tabsbridgedengine_ensure_current_sync_id
+                64, // tabs:uniffi_tabs_fn_method_tabsbridgedengine_ensure_current_sync_id
                 FfiConverterTypeTabsBridgedEngine.lower(this),
                 FfiConverterString.lower(newSyncId),
             )
@@ -704,7 +704,7 @@ export class TabsBridgedEngine {
         const liftError = (data) => FfiConverterTypeTabsApiError.lift(data);
         const functionCall = () => {
             return UniFFIScaffolding.callAsyncWrapper(
-                64, // tabs:uniffi_tabs_fn_method_tabsbridgedengine_last_sync
+                65, // tabs:uniffi_tabs_fn_method_tabsbridgedengine_last_sync
                 FfiConverterTypeTabsBridgedEngine.lower(this),
             )
         }
@@ -731,7 +731,7 @@ export class TabsBridgedEngine {
                 throw e;
             }
             return UniFFIScaffolding.callAsyncWrapper(
-                65, // tabs:uniffi_tabs_fn_method_tabsbridgedengine_prepare_for_sync
+                66, // tabs:uniffi_tabs_fn_method_tabsbridgedengine_prepare_for_sync
                 FfiConverterTypeTabsBridgedEngine.lower(this),
                 FfiConverterString.lower(clientData),
             )
@@ -751,7 +751,7 @@ export class TabsBridgedEngine {
         const liftError = (data) => FfiConverterTypeTabsApiError.lift(data);
         const functionCall = () => {
             return UniFFIScaffolding.callAsyncWrapper(
-                66, // tabs:uniffi_tabs_fn_method_tabsbridgedengine_reset
+                67, // tabs:uniffi_tabs_fn_method_tabsbridgedengine_reset
                 FfiConverterTypeTabsBridgedEngine.lower(this),
             )
         }
@@ -771,7 +771,7 @@ export class TabsBridgedEngine {
         const liftError = (data) => FfiConverterTypeTabsApiError.lift(data);
         const functionCall = () => {
             return UniFFIScaffolding.callAsyncWrapper(
-                67, // tabs:uniffi_tabs_fn_method_tabsbridgedengine_reset_sync_id
+                68, // tabs:uniffi_tabs_fn_method_tabsbridgedengine_reset_sync_id
                 FfiConverterTypeTabsBridgedEngine.lower(this),
             )
         }
@@ -798,7 +798,7 @@ export class TabsBridgedEngine {
                 throw e;
             }
             return UniFFIScaffolding.callAsyncWrapper(
-                68, // tabs:uniffi_tabs_fn_method_tabsbridgedengine_set_last_sync
+                69, // tabs:uniffi_tabs_fn_method_tabsbridgedengine_set_last_sync
                 FfiConverterTypeTabsBridgedEngine.lower(this),
                 FfiConverterI64.lower(lastSync),
             )
@@ -834,7 +834,7 @@ export class TabsBridgedEngine {
                 throw e;
             }
             return UniFFIScaffolding.callAsyncWrapper(
-                69, // tabs:uniffi_tabs_fn_method_tabsbridgedengine_set_uploaded
+                70, // tabs:uniffi_tabs_fn_method_tabsbridgedengine_set_uploaded
                 FfiConverterTypeTabsBridgedEngine.lower(this),
                 FfiConverterI64.lower(newTimestamp),
                 FfiConverterSequenceTypeTabsGuid.lower(uploadedIds),
@@ -863,7 +863,7 @@ export class TabsBridgedEngine {
                 throw e;
             }
             return UniFFIScaffolding.callAsyncWrapper(
-                70, // tabs:uniffi_tabs_fn_method_tabsbridgedengine_store_incoming
+                71, // tabs:uniffi_tabs_fn_method_tabsbridgedengine_store_incoming
                 FfiConverterTypeTabsBridgedEngine.lower(this),
                 FfiConverterSequencestring.lower(incomingEnvelopesAsJson),
             )
@@ -883,7 +883,7 @@ export class TabsBridgedEngine {
         const liftError = (data) => FfiConverterTypeTabsApiError.lift(data);
         const functionCall = () => {
             return UniFFIScaffolding.callAsyncWrapper(
-                71, // tabs:uniffi_tabs_fn_method_tabsbridgedengine_sync_finished
+                72, // tabs:uniffi_tabs_fn_method_tabsbridgedengine_sync_finished
                 FfiConverterTypeTabsBridgedEngine.lower(this),
             )
         }
@@ -903,7 +903,7 @@ export class TabsBridgedEngine {
         const liftError = (data) => FfiConverterTypeTabsApiError.lift(data);
         const functionCall = () => {
             return UniFFIScaffolding.callAsyncWrapper(
-                72, // tabs:uniffi_tabs_fn_method_tabsbridgedengine_sync_id
+                73, // tabs:uniffi_tabs_fn_method_tabsbridgedengine_sync_id
                 FfiConverterTypeTabsBridgedEngine.lower(this),
             )
         }
@@ -922,7 +922,7 @@ export class TabsBridgedEngine {
         const liftError = (data) => FfiConverterTypeTabsApiError.lift(data);
         const functionCall = () => {
             return UniFFIScaffolding.callAsyncWrapper(
-                73, // tabs:uniffi_tabs_fn_method_tabsbridgedengine_sync_started
+                74, // tabs:uniffi_tabs_fn_method_tabsbridgedengine_sync_started
                 FfiConverterTypeTabsBridgedEngine.lower(this),
             )
         }
@@ -941,7 +941,7 @@ export class TabsBridgedEngine {
         const liftError = (data) => FfiConverterTypeTabsApiError.lift(data);
         const functionCall = () => {
             return UniFFIScaffolding.callAsyncWrapper(
-                74, // tabs:uniffi_tabs_fn_method_tabsbridgedengine_wipe
+                75, // tabs:uniffi_tabs_fn_method_tabsbridgedengine_wipe
                 FfiConverterTypeTabsBridgedEngine.lower(this),
             )
         }
@@ -1016,7 +1016,7 @@ export class TabsStore {
                 throw e;
             }
             return UniFFIScaffolding.callAsyncWrapper(
-                81, // tabs:uniffi_tabs_fn_constructor_tabsstore_new
+                82, // tabs:uniffi_tabs_fn_constructor_tabsstore_new
                 FfiConverterString.lower(path),
             )
         }
@@ -1035,7 +1035,7 @@ export class TabsStore {
         const liftError = null;
         const functionCall = () => {
             return UniFFIScaffolding.callAsyncWrapper(
-                75, // tabs:uniffi_tabs_fn_method_tabsstore_bridged_engine
+                76, // tabs:uniffi_tabs_fn_method_tabsstore_bridged_engine
                 FfiConverterTypeTabsStore.lower(this),
             )
         }
@@ -1054,7 +1054,7 @@ export class TabsStore {
         const liftError = null;
         const functionCall = () => {
             return UniFFIScaffolding.callAsyncWrapper(
-                76, // tabs:uniffi_tabs_fn_method_tabsstore_close_connection
+                77, // tabs:uniffi_tabs_fn_method_tabsstore_close_connection
                 FfiConverterTypeTabsStore.lower(this),
             )
         }
@@ -1074,7 +1074,7 @@ export class TabsStore {
         const liftError = null;
         const functionCall = () => {
             return UniFFIScaffolding.callAsyncWrapper(
-                77, // tabs:uniffi_tabs_fn_method_tabsstore_get_all
+                78, // tabs:uniffi_tabs_fn_method_tabsstore_get_all
                 FfiConverterTypeTabsStore.lower(this),
             )
         }
@@ -1094,7 +1094,7 @@ export class TabsStore {
         const liftError = null;
         const functionCall = () => {
             return UniFFIScaffolding.callAsyncWrapper(
-                78, // tabs:uniffi_tabs_fn_method_tabsstore_new_remote_command_store
+                79, // tabs:uniffi_tabs_fn_method_tabsstore_new_remote_command_store
                 FfiConverterTypeTabsStore.lower(this),
             )
         }
@@ -1113,7 +1113,7 @@ export class TabsStore {
         const liftError = null;
         const functionCall = () => {
             return UniFFIScaffolding.callAsyncWrapper(
-                79, // tabs:uniffi_tabs_fn_method_tabsstore_register_with_sync_manager
+                80, // tabs:uniffi_tabs_fn_method_tabsstore_register_with_sync_manager
                 FfiConverterTypeTabsStore.lower(this),
             )
         }
@@ -1140,7 +1140,7 @@ export class TabsStore {
                 throw e;
             }
             return UniFFIScaffolding.callAsyncWrapper(
-                80, // tabs:uniffi_tabs_fn_method_tabsstore_set_local_tabs
+                81, // tabs:uniffi_tabs_fn_method_tabsstore_set_local_tabs
                 FfiConverterTypeTabsStore.lower(this),
                 FfiConverterSequenceTypeRemoteTabRecord.lower(remoteTabs),
             )

toolkit/components/uniffi-bindgen-gecko-js/components/generated/RustWebextstorage.sys.mjs

@@ -417,7 +417,7 @@ export class WebExtStorageBridgedEngine {
         const liftError = (data) => FfiConverterTypeWebExtStorageApiError.lift(data);
         const functionCall = () => {
             return UniFFIScaffolding.callAsyncWrapper(
-                82, // webextstorage:uniffi_webext_storage_fn_method_webextstoragebridgedengine_apply
+                83, // webextstorage:uniffi_webext_storage_fn_method_webextstoragebridgedengine_apply
                 FfiConverterTypeWebExtStorageBridgedEngine.lower(this),
             )
         }
@@ -445,7 +445,7 @@ export class WebExtStorageBridgedEngine {
                 throw e;
             }
             return UniFFIScaffolding.callAsyncWrapper(
-                83, // webextstorage:uniffi_webext_storage_fn_method_webextstoragebridgedengine_ensure_current_sync_id
+                84, // webextstorage:uniffi_webext_storage_fn_method_webextstoragebridgedengine_ensure_current_sync_id
                 FfiConverterTypeWebExtStorageBridgedEngine.lower(this),
                 FfiConverterString.lower(newSyncId),
             )
@@ -466,7 +466,7 @@ export class WebExtStorageBridgedEngine {
         const liftError = (data) => FfiConverterTypeWebExtStorageApiError.lift(data);
         const functionCall = () => {
             return UniFFIScaffolding.callAsyncWrapper(
-                84, // webextstorage:uniffi_webext_storage_fn_method_webextstoragebridgedengine_last_sync
+                85, // webextstorage:uniffi_webext_storage_fn_method_webextstoragebridgedengine_last_sync
                 FfiConverterTypeWebExtStorageBridgedEngine.lower(this),
             )
         }
@@ -493,7 +493,7 @@ export class WebExtStorageBridgedEngine {
                 throw e;
             }
             return UniFFIScaffolding.callAsyncWrapper(
-                85, // webextstorage:uniffi_webext_storage_fn_method_webextstoragebridgedengine_prepare_for_sync
+                86, // webextstorage:uniffi_webext_storage_fn_method_webextstoragebridgedengine_prepare_for_sync
                 FfiConverterTypeWebExtStorageBridgedEngine.lower(this),
                 FfiConverterString.lower(clientData),
             )
@@ -513,7 +513,7 @@ export class WebExtStorageBridgedEngine {
         const liftError = (data) => FfiConverterTypeWebExtStorageApiError.lift(data);
         const functionCall = () => {
             return UniFFIScaffolding.callAsyncWrapper(
-                86, // webextstorage:uniffi_webext_storage_fn_method_webextstoragebridgedengine_reset
+                87, // webextstorage:uniffi_webext_storage_fn_method_webextstoragebridgedengine_reset
                 FfiConverterTypeWebExtStorageBridgedEngine.lower(this),
             )
         }
@@ -533,7 +533,7 @@ export class WebExtStorageBridgedEngine {
         const liftError = (data) => FfiConverterTypeWebExtStorageApiError.lift(data);
         const functionCall = () => {
             return UniFFIScaffolding.callAsyncWrapper(
-                87, // webextstorage:uniffi_webext_storage_fn_method_webextstoragebridgedengine_reset_sync_id
+                88, // webextstorage:uniffi_webext_storage_fn_method_webextstoragebridgedengine_reset_sync_id
                 FfiConverterTypeWebExtStorageBridgedEngine.lower(this),
             )
         }
@@ -560,7 +560,7 @@ export class WebExtStorageBridgedEngine {
                 throw e;
             }
             return UniFFIScaffolding.callAsyncWrapper(
-                88, // webextstorage:uniffi_webext_storage_fn_method_webextstoragebridgedengine_set_last_sync
+                89, // webextstorage:uniffi_webext_storage_fn_method_webextstoragebridgedengine_set_last_sync
                 FfiConverterTypeWebExtStorageBridgedEngine.lower(this),
                 FfiConverterI64.lower(lastSync),
             )
@@ -596,7 +596,7 @@ export class WebExtStorageBridgedEngine {
                 throw e;
             }
             return UniFFIScaffolding.callAsyncWrapper(
-                89, // webextstorage:uniffi_webext_storage_fn_method_webextstoragebridgedengine_set_uploaded
+                90, // webextstorage:uniffi_webext_storage_fn_method_webextstoragebridgedengine_set_uploaded
                 FfiConverterTypeWebExtStorageBridgedEngine.lower(this),
                 FfiConverterI64.lower(serverModifiedMillis),
                 FfiConverterSequenceTypeGuid.lower(guids),
@@ -625,7 +625,7 @@ export class WebExtStorageBridgedEngine {
                 throw e;
             }
             return UniFFIScaffolding.callAsyncWrapper(
-                90, // webextstorage:uniffi_webext_storage_fn_method_webextstoragebridgedengine_store_incoming
+                91, // webextstorage:uniffi_webext_storage_fn_method_webextstoragebridgedengine_store_incoming
                 FfiConverterTypeWebExtStorageBridgedEngine.lower(this),
                 FfiConverterSequencestring.lower(incoming),
             )
@@ -645,7 +645,7 @@ export class WebExtStorageBridgedEngine {
         const liftError = (data) => FfiConverterTypeWebExtStorageApiError.lift(data);
         const functionCall = () => {
             return UniFFIScaffolding.callAsyncWrapper(
-                91, // webextstorage:uniffi_webext_storage_fn_method_webextstoragebridgedengine_sync_finished
+                92, // webextstorage:uniffi_webext_storage_fn_method_webextstoragebridgedengine_sync_finished
                 FfiConverterTypeWebExtStorageBridgedEngine.lower(this),
             )
         }
@@ -665,7 +665,7 @@ export class WebExtStorageBridgedEngine {
         const liftError = (data) => FfiConverterTypeWebExtStorageApiError.lift(data);
         const functionCall = () => {
             return UniFFIScaffolding.callAsyncWrapper(
-                92, // webextstorage:uniffi_webext_storage_fn_method_webextstoragebridgedengine_sync_id
+                93, // webextstorage:uniffi_webext_storage_fn_method_webextstoragebridgedengine_sync_id
                 FfiConverterTypeWebExtStorageBridgedEngine.lower(this),
             )
         }
@@ -684,7 +684,7 @@ export class WebExtStorageBridgedEngine {
         const liftError = (data) => FfiConverterTypeWebExtStorageApiError.lift(data);
         const functionCall = () => {
             return UniFFIScaffolding.callAsyncWrapper(
-                93, // webextstorage:uniffi_webext_storage_fn_method_webextstoragebridgedengine_sync_started
+                94, // webextstorage:uniffi_webext_storage_fn_method_webextstoragebridgedengine_sync_started
                 FfiConverterTypeWebExtStorageBridgedEngine.lower(this),
             )
         }
@@ -703,7 +703,7 @@ export class WebExtStorageBridgedEngine {
         const liftError = (data) => FfiConverterTypeWebExtStorageApiError.lift(data);
         const functionCall = () => {
             return UniFFIScaffolding.callAsyncWrapper(
-                94, // webextstorage:uniffi_webext_storage_fn_method_webextstoragebridgedengine_wipe
+                95, // webextstorage:uniffi_webext_storage_fn_method_webextstoragebridgedengine_wipe
                 FfiConverterTypeWebExtStorageBridgedEngine.lower(this),
             )
         }
@@ -778,7 +778,7 @@ export class WebExtStorageStore {
                 throw e;
             }
             return UniFFIScaffolding.callAsyncWrapper(
-                103, // webextstorage:uniffi_webext_storage_fn_constructor_webextstoragestore_new
+                104, // webextstorage:uniffi_webext_storage_fn_constructor_webextstoragestore_new
                 FfiConverterString.lower(path),
             )
         }
@@ -797,7 +797,7 @@ export class WebExtStorageStore {
         const liftError = null;
         const functionCall = () => {
             return UniFFIScaffolding.callAsyncWrapper(
-                95, // webextstorage:uniffi_webext_storage_fn_method_webextstoragestore_bridged_engine
+                96, // webextstorage:uniffi_webext_storage_fn_method_webextstoragestore_bridged_engine
                 FfiConverterTypeWebExtStorageStore.lower(this),
             )
         }
@@ -825,7 +825,7 @@ export class WebExtStorageStore {
                 throw e;
             }
             return UniFFIScaffolding.callAsyncWrapper(
-                96, // webextstorage:uniffi_webext_storage_fn_method_webextstoragestore_clear
+                97, // webextstorage:uniffi_webext_storage_fn_method_webextstoragestore_clear
                 FfiConverterTypeWebExtStorageStore.lower(this),
                 FfiConverterString.lower(extId),
             )
@@ -845,7 +845,7 @@ export class WebExtStorageStore {
         const liftError = (data) => FfiConverterTypeWebExtStorageApiError.lift(data);
         const functionCall = () => {
             return UniFFIScaffolding.callAsyncWrapper(
-                97, // webextstorage:uniffi_webext_storage_fn_method_webextstoragestore_close
+                98, // webextstorage:uniffi_webext_storage_fn_method_webextstoragestore_close
                 FfiConverterTypeWebExtStorageStore.lower(this),
             )
         }
@@ -881,7 +881,7 @@ export class WebExtStorageStore {
                 throw e;
             }
             return UniFFIScaffolding.callAsyncWrapper(
-                98, // webextstorage:uniffi_webext_storage_fn_method_webextstoragestore_get
+                99, // webextstorage:uniffi_webext_storage_fn_method_webextstoragestore_get
                 FfiConverterTypeWebExtStorageStore.lower(this),
                 FfiConverterString.lower(extId),
                 FfiConverterTypeJsonValue.lower(keys),
@@ -919,7 +919,7 @@ export class WebExtStorageStore {
                 throw e;
             }
             return UniFFIScaffolding.callAsyncWrapper(
-                99, // webextstorage:uniffi_webext_storage_fn_method_webextstoragestore_get_bytes_in_use
+                100, // webextstorage:uniffi_webext_storage_fn_method_webextstoragestore_get_bytes_in_use
                 FfiConverterTypeWebExtStorageStore.lower(this),
                 FfiConverterString.lower(extId),
                 FfiConverterTypeJsonValue.lower(keys),
@@ -941,7 +941,7 @@ export class WebExtStorageStore {
         const liftError = (data) => FfiConverterTypeWebExtStorageApiError.lift(data);
         const functionCall = () => {
             return UniFFIScaffolding.callAsyncWrapper(
-                100, // webextstorage:uniffi_webext_storage_fn_method_webextstoragestore_get_synced_changes
+                101, // webextstorage:uniffi_webext_storage_fn_method_webextstoragestore_get_synced_changes
                 FfiConverterTypeWebExtStorageStore.lower(this),
             )
         }
@@ -977,7 +977,7 @@ export class WebExtStorageStore {
                 throw e;
             }
             return UniFFIScaffolding.callAsyncWrapper(
-                101, // webextstorage:uniffi_webext_storage_fn_method_webextstoragestore_remove
+                102, // webextstorage:uniffi_webext_storage_fn_method_webextstoragestore_remove
                 FfiConverterTypeWebExtStorageStore.lower(this),
                 FfiConverterString.lower(extId),
                 FfiConverterTypeJsonValue.lower(keys),
@@ -1015,7 +1015,7 @@ export class WebExtStorageStore {
                 throw e;
             }
             return UniFFIScaffolding.callAsyncWrapper(
-                102, // webextstorage:uniffi_webext_storage_fn_method_webextstoragestore_set
+                103, // webextstorage:uniffi_webext_storage_fn_method_webextstoragestore_set
                 FfiConverterTypeWebExtStorageStore.lower(this),
                 FfiConverterString.lower(extId),
                 FfiConverterTypeJsonValue.lower(val),

toolkit/components/uniffi-bindgen-gecko-js/fixtures/generated/RustArithmetic.sys.mjs

@@ -431,7 +431,7 @@ export function add(a,b) {
                 throw e;
             }
             return UniFFIScaffolding.callAsyncWrapper(
-                104, // arithmetic:uniffi_arithmetical_fn_func_add
+                105, // arithmetic:uniffi_arithmetical_fn_func_add
                 FfiConverterU64.lower(a),
                 FfiConverterU64.lower(b),
             )
@@ -469,7 +469,7 @@ export function div(dividend,divisor) {
                 throw e;
             }
             return UniFFIScaffolding.callAsyncWrapper(
-                105, // arithmetic:uniffi_arithmetical_fn_func_div
+                106, // arithmetic:uniffi_arithmetical_fn_func_div
                 FfiConverterU64.lower(dividend),
                 FfiConverterU64.lower(divisor),
             )
@@ -507,7 +507,7 @@ export function equal(a,b) {
                 throw e;
             }
             return UniFFIScaffolding.callAsyncWrapper(
-                106, // arithmetic:uniffi_arithmetical_fn_func_equal
+                107, // arithmetic:uniffi_arithmetical_fn_func_equal
                 FfiConverterU64.lower(a),
                 FfiConverterU64.lower(b),
             )
@@ -545,7 +545,7 @@ export function sub(a,b) {
                 throw e;
             }
             return UniFFIScaffolding.callAsyncWrapper(
-                107, // arithmetic:uniffi_arithmetical_fn_func_sub
+                108, // arithmetic:uniffi_arithmetical_fn_func_sub
                 FfiConverterU64.lower(a),
                 FfiConverterU64.lower(b),
             )

toolkit/components/uniffi-bindgen-gecko-js/fixtures/generated/RustCustomTypes.sys.mjs

@@ -513,7 +513,7 @@ export function getCustomTypesDemo(demo) {
                 throw e;
             }
             return UniFFIScaffolding.callAsyncWrapper(
-                108, // custom_types:uniffi_uniffi_custom_types_fn_func_get_custom_types_demo
+                109, // custom_types:uniffi_uniffi_custom_types_fn_func_get_custom_types_demo
                 FfiConverterOptionalTypeCustomTypesDemo.lower(demo),
             )
         }

toolkit/components/uniffi-bindgen-gecko-js/fixtures/generated/RustExternalTypes.sys.mjs

@@ -431,7 +431,7 @@ export function gradient(value) {
                 throw e;
             }
             return UniFFIScaffolding.callAsyncWrapper(
-                109, // external_types:uniffi_uniffi_fixture_external_types_fn_func_gradient
+                110, // external_types:uniffi_uniffi_fixture_external_types_fn_func_gradient
                 FfiConverterOptionalTypeLine.lower(value),
             )
         }
@@ -468,7 +468,7 @@ export function intersection(ln1,ln2) {
                 throw e;
             }
             return UniFFIScaffolding.callAsyncWrapper(
-                110, // external_types:uniffi_uniffi_fixture_external_types_fn_func_intersection
+                111, // external_types:uniffi_uniffi_fixture_external_types_fn_func_intersection
                 FfiConverterTypeLine.lower(ln1),
                 FfiConverterTypeLine.lower(ln2),
             )
@@ -497,7 +497,7 @@ export function moveSpriteToOrigin(sprite) {
                 throw e;
             }
             return UniFFIScaffolding.callAsyncWrapper(
-                111, // external_types:uniffi_uniffi_fixture_external_types_fn_func_move_sprite_to_origin
+                112, // external_types:uniffi_uniffi_fixture_external_types_fn_func_move_sprite_to_origin
                 FfiConverterTypeSprite.lower(sprite),
             )
         }

toolkit/components/uniffi-bindgen-gecko-js/fixtures/generated/RustFixtureCallbacks.sys.mjs

@@ -737,7 +737,7 @@ export function callLogRepeat(logger,message,count,exclude) {
                 throw e;
             }
             return UniFFIScaffolding.callAsyncWrapper(
-                112, // fixture_callbacks:uniffi_uniffi_fixture_callbacks_fn_func_call_log_repeat
+                113, // fixture_callbacks:uniffi_uniffi_fixture_callbacks_fn_func_call_log_repeat
                 FfiConverterTypeLogger.lower(logger),
                 FfiConverterString.lower(message),
                 FfiConverterU32.lower(count),
@@ -776,7 +776,7 @@ export function logEvenNumbers(logger,items) {
                 throw e;
             }
             return UniFFIScaffolding.callAsyncWrapper(
-                113, // fixture_callbacks:uniffi_uniffi_fixture_callbacks_fn_func_log_even_numbers
+                114, // fixture_callbacks:uniffi_uniffi_fixture_callbacks_fn_func_log_even_numbers
                 FfiConverterTypeLogger.lower(logger),
                 FfiConverterSequencei32.lower(items),
             )
@@ -813,7 +813,7 @@ export function logEvenNumbersMainThread(logger,items) {
                 throw e;
             }
             return UniFFIScaffolding.callSync(
-                114, // fixture_callbacks:uniffi_uniffi_fixture_callbacks_fn_func_log_even_numbers_main_thread
+                115, // fixture_callbacks:uniffi_uniffi_fixture_callbacks_fn_func_log_even_numbers_main_thread
                 FfiConverterTypeLogger.lower(logger),
                 FfiConverterSequencei32.lower(items),
             )

toolkit/components/uniffi-bindgen-gecko-js/fixtures/generated/RustFutures.sys.mjs

@@ -662,7 +662,7 @@ export class FutureTester {
         const liftError = null;
         const functionCall = () => {
             return UniFFIScaffolding.callSync(
-                135, // futures:uniffi_uniffi_fixture_futures_fn_constructor_futuretester_init
+                136, // futures:uniffi_uniffi_fixture_futures_fn_constructor_futuretester_init
             )
         }
         return handleRustResult(functionCall(), liftResult, liftError);}
@@ -687,7 +687,7 @@ export class FutureTester {
                 throw e;
             }
             return UniFFIScaffolding.callSync(
-                132, // futures:uniffi_uniffi_fixture_futures_fn_method_futuretester_complete_futures
+                133, // futures:uniffi_uniffi_fixture_futures_fn_method_futuretester_complete_futures
                 FfiConverterTypeFutureTester.lower(this),
                 FfiConverterU8.lower(value),
             )
@@ -704,7 +704,7 @@ export class FutureTester {
         const liftError = null;
         const functionCall = () => {
             return UniFFIScaffolding.callAsync(
-                133, // futures:uniffi_uniffi_fixture_futures_fn_method_futuretester_make_future
+                134, // futures:uniffi_uniffi_fixture_futures_fn_method_futuretester_make_future
                 FfiConverterTypeFutureTester.lower(this),
             )
         }
@@ -724,7 +724,7 @@ export class FutureTester {
         const liftError = null;
         const functionCall = () => {
             return UniFFIScaffolding.callSync(
-                134, // futures:uniffi_uniffi_fixture_futures_fn_method_futuretester_wake_futures
+                135, // futures:uniffi_uniffi_fixture_futures_fn_method_futuretester_wake_futures
                 FfiConverterTypeFutureTester.lower(this),
             )
         }
@@ -787,7 +787,7 @@ export class RustTask {
         const liftError = null;
         const functionCall = () => {
             return UniFFIScaffolding.callSync(
-                136, // futures:uniffi_uniffi_fixture_futures_fn_method_rusttask_run
+                137, // futures:uniffi_uniffi_fixture_futures_fn_method_rusttask_run
                 FfiConverterTypeRustTask.lower(this),
             )
         }
@@ -858,7 +858,7 @@ export class Traveller {
                 throw e;
             }
             return UniFFIScaffolding.callSync(
-                138, // futures:uniffi_uniffi_fixture_futures_fn_constructor_traveller_new
+                139, // futures:uniffi_uniffi_fixture_futures_fn_constructor_traveller_new
                 FfiConverterString.lower(name),
             )
         }
@@ -873,7 +873,7 @@ export class Traveller {
         const liftError = null;
         const functionCall = () => {
             return UniFFIScaffolding.callSync(
-                137, // futures:uniffi_uniffi_fixture_futures_fn_method_traveller_name
+                138, // futures:uniffi_uniffi_fixture_futures_fn_method_traveller_name
                 FfiConverterTypeTraveller.lower(this),
             )
         }
@@ -950,7 +950,7 @@ export class WorkerQueue {
                 throw e;
             }
             return UniFFIScaffolding.callSync(
-                139, // futures:uniffi_uniffi_fixture_futures_fn_method_workerqueue_add_task
+                140, // futures:uniffi_uniffi_fixture_futures_fn_method_workerqueue_add_task
                 FfiConverterTypeWorkerQueue.lower(this),
                 FfiConverterTypeRustTask.lower(task),
             )
@@ -1104,7 +1104,7 @@ export function expensiveComputation() {
         const liftError = null;
         const functionCall = () => {
             return UniFFIScaffolding.callAsync(
-                115, // futures:uniffi_uniffi_fixture_futures_fn_func_expensive_computation
+                116, // futures:uniffi_uniffi_fixture_futures_fn_func_expensive_computation
             )
         }
         try {
@@ -1127,7 +1127,7 @@ export function initializeGeckoGlobalWorkerQueue() {
         const liftError = null;
         const functionCall = () => {
             return UniFFIScaffolding.callSync(
-                116, // futures:uniffi_uniffi_fixture_futures_fn_func_initialize_gecko_global_worker_queue
+                117, // futures:uniffi_uniffi_fixture_futures_fn_func_initialize_gecko_global_worker_queue
             )
         }
         return handleRustResult(functionCall(), liftResult, liftError);
@@ -1151,7 +1151,7 @@ export function initializeGlobalWorkerQueue(workerQueue) {
                 throw e;
             }
             return UniFFIScaffolding.callSync(
-                117, // futures:uniffi_uniffi_fixture_futures_fn_func_initialize_global_worker_queue
+                118, // futures:uniffi_uniffi_fixture_futures_fn_func_initialize_global_worker_queue
                 FfiConverterTypeWorkerQueue.lower(workerQueue),
             )
         }
@@ -1176,7 +1176,7 @@ export function roundtripF32(v) {
                 throw e;
             }
             return UniFFIScaffolding.callAsync(
-                118, // futures:uniffi_uniffi_fixture_futures_fn_func_roundtrip_f32
+                119, // futures:uniffi_uniffi_fixture_futures_fn_func_roundtrip_f32
                 FfiConverterF32.lower(v),
             )
         }
@@ -1205,7 +1205,7 @@ export function roundtripF64(v) {
                 throw e;
             }
             return UniFFIScaffolding.callAsync(
-                119, // futures:uniffi_uniffi_fixture_futures_fn_func_roundtrip_f64
+                120, // futures:uniffi_uniffi_fixture_futures_fn_func_roundtrip_f64
                 FfiConverterF64.lower(v),
             )
         }
@@ -1234,7 +1234,7 @@ export function roundtripI16(v) {
                 throw e;
             }
             return UniFFIScaffolding.callAsync(
-                120, // futures:uniffi_uniffi_fixture_futures_fn_func_roundtrip_i16
+                121, // futures:uniffi_uniffi_fixture_futures_fn_func_roundtrip_i16
                 FfiConverterI16.lower(v),
             )
         }
@@ -1263,7 +1263,7 @@ export function roundtripI32(v) {
                 throw e;
             }
             return UniFFIScaffolding.callAsync(
-                121, // futures:uniffi_uniffi_fixture_futures_fn_func_roundtrip_i32
+                122, // futures:uniffi_uniffi_fixture_futures_fn_func_roundtrip_i32
                 FfiConverterI32.lower(v),
             )
         }
@@ -1292,7 +1292,7 @@ export function roundtripI64(v) {
                 throw e;
             }
             return UniFFIScaffolding.callAsync(
-                122, // futures:uniffi_uniffi_fixture_futures_fn_func_roundtrip_i64
+                123, // futures:uniffi_uniffi_fixture_futures_fn_func_roundtrip_i64
                 FfiConverterI64.lower(v),
             )
         }
@@ -1321,7 +1321,7 @@ export function roundtripI8(v) {
                 throw e;
             }
             return UniFFIScaffolding.callAsync(
-                123, // futures:uniffi_uniffi_fixture_futures_fn_func_roundtrip_i8
+                124, // futures:uniffi_uniffi_fixture_futures_fn_func_roundtrip_i8
                 FfiConverterI8.lower(v),
             )
         }
@@ -1350,7 +1350,7 @@ export function roundtripMap(v) {
                 throw e;
             }
             return UniFFIScaffolding.callAsync(
-                124, // futures:uniffi_uniffi_fixture_futures_fn_func_roundtrip_map
+                125, // futures:uniffi_uniffi_fixture_futures_fn_func_roundtrip_map
                 FfiConverterMapStringString.lower(v),
             )
         }
@@ -1379,7 +1379,7 @@ export function roundtripObj(v) {
                 throw e;
             }
             return UniFFIScaffolding.callAsync(
-                125, // futures:uniffi_uniffi_fixture_futures_fn_func_roundtrip_obj
+                126, // futures:uniffi_uniffi_fixture_futures_fn_func_roundtrip_obj
                 FfiConverterTypeTraveller.lower(v),
             )
         }
@@ -1408,7 +1408,7 @@ export function roundtripString(v) {
                 throw e;
             }
             return UniFFIScaffolding.callAsync(
-                126, // futures:uniffi_uniffi_fixture_futures_fn_func_roundtrip_string
+                127, // futures:uniffi_uniffi_fixture_futures_fn_func_roundtrip_string
                 FfiConverterString.lower(v),
             )
         }
@@ -1437,7 +1437,7 @@ export function roundtripU16(v) {
                 throw e;
             }
             return UniFFIScaffolding.callAsync(
-                127, // futures:uniffi_uniffi_fixture_futures_fn_func_roundtrip_u16
+                128, // futures:uniffi_uniffi_fixture_futures_fn_func_roundtrip_u16
                 FfiConverterU16.lower(v),
             )
         }
@@ -1466,7 +1466,7 @@ export function roundtripU32(v) {
                 throw e;
             }
             return UniFFIScaffolding.callAsync(
-                128, // futures:uniffi_uniffi_fixture_futures_fn_func_roundtrip_u32
+                129, // futures:uniffi_uniffi_fixture_futures_fn_func_roundtrip_u32
                 FfiConverterU32.lower(v),
             )
         }
@@ -1495,7 +1495,7 @@ export function roundtripU64(v) {
                 throw e;
             }
             return UniFFIScaffolding.callAsync(
-                129, // futures:uniffi_uniffi_fixture_futures_fn_func_roundtrip_u64
+                130, // futures:uniffi_uniffi_fixture_futures_fn_func_roundtrip_u64
                 FfiConverterU64.lower(v),
             )
         }
@@ -1524,7 +1524,7 @@ export function roundtripU8(v) {
                 throw e;
             }
             return UniFFIScaffolding.callAsync(
-                130, // futures:uniffi_uniffi_fixture_futures_fn_func_roundtrip_u8
+                131, // futures:uniffi_uniffi_fixture_futures_fn_func_roundtrip_u8
                 FfiConverterU8.lower(v),
             )
         }
@@ -1553,7 +1553,7 @@ export function roundtripVec(v) {
                 throw e;
             }
             return UniFFIScaffolding.callAsync(
-                131, // futures:uniffi_uniffi_fixture_futures_fn_func_roundtrip_vec
+                132, // futures:uniffi_uniffi_fixture_futures_fn_func_roundtrip_vec
                 FfiConverterSequenceu32.lower(v),
             )
         }

toolkit/components/uniffi-bindgen-gecko-js/fixtures/generated/RustGeometry.sys.mjs

@@ -542,7 +542,7 @@ export function gradient(ln) {
                 throw e;
             }
             return UniFFIScaffolding.callAsyncWrapper(
-                140, // geometry:uniffi_uniffi_geometry_fn_func_gradient
+                141, // geometry:uniffi_uniffi_geometry_fn_func_gradient
                 FfiConverterTypeLine.lower(ln),
             )
         }
@@ -579,7 +579,7 @@ export function intersection(ln1,ln2) {
                 throw e;
             }
             return UniFFIScaffolding.callAsyncWrapper(
-                141, // geometry:uniffi_uniffi_geometry_fn_func_intersection
+                142, // geometry:uniffi_uniffi_geometry_fn_func_intersection
                 FfiConverterTypeLine.lower(ln1),
                 FfiConverterTypeLine.lower(ln2),
             )

toolkit/components/uniffi-bindgen-gecko-js/fixtures/generated/RustRefcounts.sys.mjs

@@ -371,7 +371,7 @@ export class SingletonObject {
         const liftError = null;
         const functionCall = () => {
             return UniFFIScaffolding.callSync(
-                144, // refcounts:uniffi_uniffi_fixture_refcounts_fn_method_singletonobject_method
+                145, // refcounts:uniffi_uniffi_fixture_refcounts_fn_method_singletonobject_method
                 FfiConverterTypeSingletonObject.lower(this),
             )
         }
@@ -423,7 +423,7 @@ export function getJsRefcount() {
         const liftError = null;
         const functionCall = () => {
             return UniFFIScaffolding.callSync(
-                142, // refcounts:uniffi_uniffi_fixture_refcounts_fn_func_get_js_refcount
+                143, // refcounts:uniffi_uniffi_fixture_refcounts_fn_func_get_js_refcount
             )
         }
         return handleRustResult(functionCall(), liftResult, liftError);
@@ -439,7 +439,7 @@ export function getSingleton() {
         const liftError = null;
         const functionCall = () => {
             return UniFFIScaffolding.callSync(
-                143, // refcounts:uniffi_uniffi_fixture_refcounts_fn_func_get_singleton
+                144, // refcounts:uniffi_uniffi_fixture_refcounts_fn_func_get_singleton
             )
         }
         return handleRustResult(functionCall(), liftResult, liftError);

toolkit/components/uniffi-bindgen-gecko-js/fixtures/generated/RustRondpoint.sys.mjs

@@ -665,7 +665,7 @@ export class Optionneur {
         const liftError = null;
         const functionCall = () => {
             return UniFFIScaffolding.callAsyncWrapper(
-                175, // rondpoint:uniffi_uniffi_rondpoint_fn_constructor_optionneur_new
+                176, // rondpoint:uniffi_uniffi_rondpoint_fn_constructor_optionneur_new
             )
         }
         try {
@@ -691,7 +691,7 @@ export class Optionneur {
                 throw e;
             }
             return UniFFIScaffolding.callAsyncWrapper(
-                150, // rondpoint:uniffi_uniffi_rondpoint_fn_method_optionneur_sinon_boolean
+                151, // rondpoint:uniffi_uniffi_rondpoint_fn_method_optionneur_sinon_boolean
                 FfiConverterTypeOptionneur.lower(this),
                 FfiConverterBool.lower(value),
             )
@@ -720,7 +720,7 @@ export class Optionneur {
                 throw e;
             }
             return UniFFIScaffolding.callAsyncWrapper(
-                151, // rondpoint:uniffi_uniffi_rondpoint_fn_method_optionneur_sinon_enum
+                152, // rondpoint:uniffi_uniffi_rondpoint_fn_method_optionneur_sinon_enum
                 FfiConverterTypeOptionneur.lower(this),
                 FfiConverterTypeEnumeration.lower(value),
             )
@@ -749,7 +749,7 @@ export class Optionneur {
                 throw e;
             }
             return UniFFIScaffolding.callAsyncWrapper(
-                152, // rondpoint:uniffi_uniffi_rondpoint_fn_method_optionneur_sinon_f32
+                153, // rondpoint:uniffi_uniffi_rondpoint_fn_method_optionneur_sinon_f32
                 FfiConverterTypeOptionneur.lower(this),
                 FfiConverterF32.lower(value),
             )
@@ -778,7 +778,7 @@ export class Optionneur {
                 throw e;
             }
             return UniFFIScaffolding.callAsyncWrapper(
-                153, // rondpoint:uniffi_uniffi_rondpoint_fn_method_optionneur_sinon_f64
+                154, // rondpoint:uniffi_uniffi_rondpoint_fn_method_optionneur_sinon_f64
                 FfiConverterTypeOptionneur.lower(this),
                 FfiConverterF64.lower(value),
             )
@@ -807,7 +807,7 @@ export class Optionneur {
                 throw e;
             }
             return UniFFIScaffolding.callAsyncWrapper(
-                154, // rondpoint:uniffi_uniffi_rondpoint_fn_method_optionneur_sinon_i16_dec
+                155, // rondpoint:uniffi_uniffi_rondpoint_fn_method_optionneur_sinon_i16_dec
                 FfiConverterTypeOptionneur.lower(this),
                 FfiConverterI16.lower(value),
             )
@@ -836,7 +836,7 @@ export class Optionneur {
                 throw e;
             }
             return UniFFIScaffolding.callAsyncWrapper(
-                155, // rondpoint:uniffi_uniffi_rondpoint_fn_method_optionneur_sinon_i16_hex
+                156, // rondpoint:uniffi_uniffi_rondpoint_fn_method_optionneur_sinon_i16_hex
                 FfiConverterTypeOptionneur.lower(this),
                 FfiConverterI16.lower(value),
             )
@@ -865,7 +865,7 @@ export class Optionneur {
                 throw e;
             }
             return UniFFIScaffolding.callAsyncWrapper(
-                156, // rondpoint:uniffi_uniffi_rondpoint_fn_method_optionneur_sinon_i32_dec
+                157, // rondpoint:uniffi_uniffi_rondpoint_fn_method_optionneur_sinon_i32_dec
                 FfiConverterTypeOptionneur.lower(this),
                 FfiConverterI32.lower(value),
             )
@@ -894,7 +894,7 @@ export class Optionneur {
                 throw e;
             }
             return UniFFIScaffolding.callAsyncWrapper(
-                157, // rondpoint:uniffi_uniffi_rondpoint_fn_method_optionneur_sinon_i32_hex
+                158, // rondpoint:uniffi_uniffi_rondpoint_fn_method_optionneur_sinon_i32_hex
                 FfiConverterTypeOptionneur.lower(this),
                 FfiConverterI32.lower(value),
             )
@@ -923,7 +923,7 @@ export class Optionneur {
                 throw e;
             }
             return UniFFIScaffolding.callAsyncWrapper(
-                158, // rondpoint:uniffi_uniffi_rondpoint_fn_method_optionneur_sinon_i64_dec
+                159, // rondpoint:uniffi_uniffi_rondpoint_fn_method_optionneur_sinon_i64_dec
                 FfiConverterTypeOptionneur.lower(this),
                 FfiConverterI64.lower(value),
             )
@@ -952,7 +952,7 @@ export class Optionneur {
                 throw e;
             }
             return UniFFIScaffolding.callAsyncWrapper(
-                159, // rondpoint:uniffi_uniffi_rondpoint_fn_method_optionneur_sinon_i64_hex
+                160, // rondpoint:uniffi_uniffi_rondpoint_fn_method_optionneur_sinon_i64_hex
                 FfiConverterTypeOptionneur.lower(this),
                 FfiConverterI64.lower(value),
             )
@@ -981,7 +981,7 @@ export class Optionneur {
                 throw e;
             }
             return UniFFIScaffolding.callAsyncWrapper(
-                160, // rondpoint:uniffi_uniffi_rondpoint_fn_method_optionneur_sinon_i8_dec
+                161, // rondpoint:uniffi_uniffi_rondpoint_fn_method_optionneur_sinon_i8_dec
                 FfiConverterTypeOptionneur.lower(this),
                 FfiConverterI8.lower(value),
             )
@@ -1010,7 +1010,7 @@ export class Optionneur {
                 throw e;
             }
             return UniFFIScaffolding.callAsyncWrapper(
-                161, // rondpoint:uniffi_uniffi_rondpoint_fn_method_optionneur_sinon_i8_hex
+                162, // rondpoint:uniffi_uniffi_rondpoint_fn_method_optionneur_sinon_i8_hex
                 FfiConverterTypeOptionneur.lower(this),
                 FfiConverterI8.lower(value),
             )
@@ -1039,7 +1039,7 @@ export class Optionneur {
                 throw e;
             }
             return UniFFIScaffolding.callAsyncWrapper(
-                162, // rondpoint:uniffi_uniffi_rondpoint_fn_method_optionneur_sinon_null
+                163, // rondpoint:uniffi_uniffi_rondpoint_fn_method_optionneur_sinon_null
                 FfiConverterTypeOptionneur.lower(this),
                 FfiConverterOptionalstring.lower(value),
             )
@@ -1068,7 +1068,7 @@ export class Optionneur {
                 throw e;
             }
             return UniFFIScaffolding.callAsyncWrapper(
-                163, // rondpoint:uniffi_uniffi_rondpoint_fn_method_optionneur_sinon_sequence
+                164, // rondpoint:uniffi_uniffi_rondpoint_fn_method_optionneur_sinon_sequence
                 FfiConverterTypeOptionneur.lower(this),
                 FfiConverterSequencestring.lower(value),
             )
@@ -1097,7 +1097,7 @@ export class Optionneur {
                 throw e;
             }
             return UniFFIScaffolding.callAsyncWrapper(
-                164, // rondpoint:uniffi_uniffi_rondpoint_fn_method_optionneur_sinon_string
+                165, // rondpoint:uniffi_uniffi_rondpoint_fn_method_optionneur_sinon_string
                 FfiConverterTypeOptionneur.lower(this),
                 FfiConverterString.lower(value),
             )
@@ -1126,7 +1126,7 @@ export class Optionneur {
                 throw e;
             }
             return UniFFIScaffolding.callAsyncWrapper(
-                165, // rondpoint:uniffi_uniffi_rondpoint_fn_method_optionneur_sinon_u16_dec
+                166, // rondpoint:uniffi_uniffi_rondpoint_fn_method_optionneur_sinon_u16_dec
                 FfiConverterTypeOptionneur.lower(this),
                 FfiConverterU16.lower(value),
             )
@@ -1155,7 +1155,7 @@ export class Optionneur {
                 throw e;
             }
             return UniFFIScaffolding.callAsyncWrapper(
-                166, // rondpoint:uniffi_uniffi_rondpoint_fn_method_optionneur_sinon_u16_hex
+                167, // rondpoint:uniffi_uniffi_rondpoint_fn_method_optionneur_sinon_u16_hex
                 FfiConverterTypeOptionneur.lower(this),
                 FfiConverterU16.lower(value),
             )
@@ -1184,7 +1184,7 @@ export class Optionneur {
                 throw e;
             }
             return UniFFIScaffolding.callAsyncWrapper(
-                167, // rondpoint:uniffi_uniffi_rondpoint_fn_method_optionneur_sinon_u32_dec
+                168, // rondpoint:uniffi_uniffi_rondpoint_fn_method_optionneur_sinon_u32_dec
                 FfiConverterTypeOptionneur.lower(this),
                 FfiConverterU32.lower(value),
             )
@@ -1213,7 +1213,7 @@ export class Optionneur {
                 throw e;
             }
             return UniFFIScaffolding.callAsyncWrapper(
-                168, // rondpoint:uniffi_uniffi_rondpoint_fn_method_optionneur_sinon_u32_hex
+                169, // rondpoint:uniffi_uniffi_rondpoint_fn_method_optionneur_sinon_u32_hex
                 FfiConverterTypeOptionneur.lower(this),
                 FfiConverterU32.lower(value),
             )
@@ -1242,7 +1242,7 @@ export class Optionneur {
                 throw e;
             }
             return UniFFIScaffolding.callAsyncWrapper(
-                169, // rondpoint:uniffi_uniffi_rondpoint_fn_method_optionneur_sinon_u32_oct
+                170, // rondpoint:uniffi_uniffi_rondpoint_fn_method_optionneur_sinon_u32_oct
                 FfiConverterTypeOptionneur.lower(this),
                 FfiConverterU32.lower(value),
             )
@@ -1271,7 +1271,7 @@ export class Optionneur {
                 throw e;
             }
             return UniFFIScaffolding.callAsyncWrapper(
-                170, // rondpoint:uniffi_uniffi_rondpoint_fn_method_optionneur_sinon_u64_dec
+                171, // rondpoint:uniffi_uniffi_rondpoint_fn_method_optionneur_sinon_u64_dec
                 FfiConverterTypeOptionneur.lower(this),
                 FfiConverterU64.lower(value),
             )
@@ -1300,7 +1300,7 @@ export class Optionneur {
                 throw e;
             }
             return UniFFIScaffolding.callAsyncWrapper(
-                171, // rondpoint:uniffi_uniffi_rondpoint_fn_method_optionneur_sinon_u64_hex
+                172, // rondpoint:uniffi_uniffi_rondpoint_fn_method_optionneur_sinon_u64_hex
                 FfiConverterTypeOptionneur.lower(this),
                 FfiConverterU64.lower(value),
             )
@@ -1329,7 +1329,7 @@ export class Optionneur {
                 throw e;
             }
             return UniFFIScaffolding.callAsyncWrapper(
-                172, // rondpoint:uniffi_uniffi_rondpoint_fn_method_optionneur_sinon_u8_dec
+                173, // rondpoint:uniffi_uniffi_rondpoint_fn_method_optionneur_sinon_u8_dec
                 FfiConverterTypeOptionneur.lower(this),
                 FfiConverterU8.lower(value),
             )
@@ -1358,7 +1358,7 @@ export class Optionneur {
                 throw e;
             }
             return UniFFIScaffolding.callAsyncWrapper(
-                173, // rondpoint:uniffi_uniffi_rondpoint_fn_method_optionneur_sinon_u8_hex
+                174, // rondpoint:uniffi_uniffi_rondpoint_fn_method_optionneur_sinon_u8_hex
                 FfiConverterTypeOptionneur.lower(this),
                 FfiConverterU8.lower(value),
             )
@@ -1387,7 +1387,7 @@ export class Optionneur {
                 throw e;
             }
             return UniFFIScaffolding.callAsyncWrapper(
-                174, // rondpoint:uniffi_uniffi_rondpoint_fn_method_optionneur_sinon_zero
+                175, // rondpoint:uniffi_uniffi_rondpoint_fn_method_optionneur_sinon_zero
                 FfiConverterTypeOptionneur.lower(this),
                 FfiConverterOptionali32.lower(value),
             )
@@ -1455,7 +1455,7 @@ export class Retourneur {
         const liftError = null;
         const functionCall = () => {
             return UniFFIScaffolding.callAsyncWrapper(
-                191, // rondpoint:uniffi_uniffi_rondpoint_fn_constructor_retourneur_new
+                192, // rondpoint:uniffi_uniffi_rondpoint_fn_constructor_retourneur_new
             )
         }
         try {
@@ -1481,7 +1481,7 @@ export class Retourneur {
                 throw e;
             }
             return UniFFIScaffolding.callAsyncWrapper(
-                176, // rondpoint:uniffi_uniffi_rondpoint_fn_method_retourneur_identique_boolean
+                177, // rondpoint:uniffi_uniffi_rondpoint_fn_method_retourneur_identique_boolean
                 FfiConverterTypeRetourneur.lower(this),
                 FfiConverterBool.lower(value),
             )
@@ -1510,7 +1510,7 @@ export class Retourneur {
                 throw e;
             }
             return UniFFIScaffolding.callAsyncWrapper(
-                177, // rondpoint:uniffi_uniffi_rondpoint_fn_method_retourneur_identique_double
+                178, // rondpoint:uniffi_uniffi_rondpoint_fn_method_retourneur_identique_double
                 FfiConverterTypeRetourneur.lower(this),
                 FfiConverterF64.lower(value),
             )
@@ -1539,7 +1539,7 @@ export class Retourneur {
                 throw e;
             }
             return UniFFIScaffolding.callAsyncWrapper(
-                178, // rondpoint:uniffi_uniffi_rondpoint_fn_method_retourneur_identique_float
+                179, // rondpoint:uniffi_uniffi_rondpoint_fn_method_retourneur_identique_float
                 FfiConverterTypeRetourneur.lower(this),
                 FfiConverterF32.lower(value),
             )
@@ -1568,7 +1568,7 @@ export class Retourneur {
                 throw e;
             }
             return UniFFIScaffolding.callAsyncWrapper(
-                179, // rondpoint:uniffi_uniffi_rondpoint_fn_method_retourneur_identique_i16
+                180, // rondpoint:uniffi_uniffi_rondpoint_fn_method_retourneur_identique_i16
                 FfiConverterTypeRetourneur.lower(this),
                 FfiConverterI16.lower(value),
             )
@@ -1597,7 +1597,7 @@ export class Retourneur {
                 throw e;
             }
             return UniFFIScaffolding.callAsyncWrapper(
-                180, // rondpoint:uniffi_uniffi_rondpoint_fn_method_retourneur_identique_i32
+                181, // rondpoint:uniffi_uniffi_rondpoint_fn_method_retourneur_identique_i32
                 FfiConverterTypeRetourneur.lower(this),
                 FfiConverterI32.lower(value),
             )
@@ -1626,7 +1626,7 @@ export class Retourneur {
                 throw e;
             }
             return UniFFIScaffolding.callAsyncWrapper(
-                181, // rondpoint:uniffi_uniffi_rondpoint_fn_method_retourneur_identique_i64
+                182, // rondpoint:uniffi_uniffi_rondpoint_fn_method_retourneur_identique_i64
                 FfiConverterTypeRetourneur.lower(this),
                 FfiConverterI64.lower(value),
             )
@@ -1655,7 +1655,7 @@ export class Retourneur {
                 throw e;
             }
             return UniFFIScaffolding.callAsyncWrapper(
-                182, // rondpoint:uniffi_uniffi_rondpoint_fn_method_retourneur_identique_i8
+                183, // rondpoint:uniffi_uniffi_rondpoint_fn_method_retourneur_identique_i8
                 FfiConverterTypeRetourneur.lower(this),
                 FfiConverterI8.lower(value),
             )
@@ -1684,7 +1684,7 @@ export class Retourneur {
                 throw e;
             }
             return UniFFIScaffolding.callAsyncWrapper(
-                183, // rondpoint:uniffi_uniffi_rondpoint_fn_method_retourneur_identique_nombres
+                184, // rondpoint:uniffi_uniffi_rondpoint_fn_method_retourneur_identique_nombres
                 FfiConverterTypeRetourneur.lower(this),
                 FfiConverterTypeDictionnaireNombres.lower(value),
             )
@@ -1713,7 +1713,7 @@ export class Retourneur {
                 throw e;
             }
             return UniFFIScaffolding.callAsyncWrapper(
-                184, // rondpoint:uniffi_uniffi_rondpoint_fn_method_retourneur_identique_nombres_signes
+                185, // rondpoint:uniffi_uniffi_rondpoint_fn_method_retourneur_identique_nombres_signes
                 FfiConverterTypeRetourneur.lower(this),
                 FfiConverterTypeDictionnaireNombresSignes.lower(value),
             )
@@ -1742,7 +1742,7 @@ export class Retourneur {
                 throw e;
             }
             return UniFFIScaffolding.callAsyncWrapper(
-                185, // rondpoint:uniffi_uniffi_rondpoint_fn_method_retourneur_identique_optionneur_dictionnaire
+                186, // rondpoint:uniffi_uniffi_rondpoint_fn_method_retourneur_identique_optionneur_dictionnaire
                 FfiConverterTypeRetourneur.lower(this),
                 FfiConverterTypeOptionneurDictionnaire.lower(value),
             )
@@ -1771,7 +1771,7 @@ export class Retourneur {
                 throw e;
             }
             return UniFFIScaffolding.callAsyncWrapper(
-                186, // rondpoint:uniffi_uniffi_rondpoint_fn_method_retourneur_identique_string
+                187, // rondpoint:uniffi_uniffi_rondpoint_fn_method_retourneur_identique_string
                 FfiConverterTypeRetourneur.lower(this),
                 FfiConverterString.lower(value),
             )
@@ -1800,7 +1800,7 @@ export class Retourneur {
                 throw e;
             }
             return UniFFIScaffolding.callAsyncWrapper(
-                187, // rondpoint:uniffi_uniffi_rondpoint_fn_method_retourneur_identique_u16
+                188, // rondpoint:uniffi_uniffi_rondpoint_fn_method_retourneur_identique_u16
                 FfiConverterTypeRetourneur.lower(this),
                 FfiConverterU16.lower(value),
             )
@@ -1829,7 +1829,7 @@ export class Retourneur {
                 throw e;
             }
             return UniFFIScaffolding.callAsyncWrapper(
-                188, // rondpoint:uniffi_uniffi_rondpoint_fn_method_retourneur_identique_u32
+                189, // rondpoint:uniffi_uniffi_rondpoint_fn_method_retourneur_identique_u32
                 FfiConverterTypeRetourneur.lower(this),
                 FfiConverterU32.lower(value),
             )
@@ -1858,7 +1858,7 @@ export class Retourneur {
                 throw e;
             }
             return UniFFIScaffolding.callAsyncWrapper(
-                189, // rondpoint:uniffi_uniffi_rondpoint_fn_method_retourneur_identique_u64
+                190, // rondpoint:uniffi_uniffi_rondpoint_fn_method_retourneur_identique_u64
                 FfiConverterTypeRetourneur.lower(this),
                 FfiConverterU64.lower(value),
             )
@@ -1887,7 +1887,7 @@ export class Retourneur {
                 throw e;
             }
             return UniFFIScaffolding.callAsyncWrapper(
-                190, // rondpoint:uniffi_uniffi_rondpoint_fn_method_retourneur_identique_u8
+                191, // rondpoint:uniffi_uniffi_rondpoint_fn_method_retourneur_identique_u8
                 FfiConverterTypeRetourneur.lower(this),
                 FfiConverterU8.lower(value),
             )
@@ -1955,7 +1955,7 @@ export class Stringifier {
         const liftError = null;
         const functionCall = () => {
             return UniFFIScaffolding.callAsyncWrapper(
-                204, // rondpoint:uniffi_uniffi_rondpoint_fn_constructor_stringifier_new
+                205, // rondpoint:uniffi_uniffi_rondpoint_fn_constructor_stringifier_new
             )
         }
         try {
@@ -1981,7 +1981,7 @@ export class Stringifier {
                 throw e;
             }
             return UniFFIScaffolding.callAsyncWrapper(
-                192, // rondpoint:uniffi_uniffi_rondpoint_fn_method_stringifier_to_string_boolean
+                193, // rondpoint:uniffi_uniffi_rondpoint_fn_method_stringifier_to_string_boolean
                 FfiConverterTypeStringifier.lower(this),
                 FfiConverterBool.lower(value),
             )
@@ -2010,7 +2010,7 @@ export class Stringifier {
                 throw e;
             }
             return UniFFIScaffolding.callAsyncWrapper(
-                193, // rondpoint:uniffi_uniffi_rondpoint_fn_method_stringifier_to_string_double
+                194, // rondpoint:uniffi_uniffi_rondpoint_fn_method_stringifier_to_string_double
                 FfiConverterTypeStringifier.lower(this),
                 FfiConverterF64.lower(value),
             )
@@ -2039,7 +2039,7 @@ export class Stringifier {
                 throw e;
             }
             return UniFFIScaffolding.callAsyncWrapper(
-                194, // rondpoint:uniffi_uniffi_rondpoint_fn_method_stringifier_to_string_float
+                195, // rondpoint:uniffi_uniffi_rondpoint_fn_method_stringifier_to_string_float
                 FfiConverterTypeStringifier.lower(this),
                 FfiConverterF32.lower(value),
             )
@@ -2068,7 +2068,7 @@ export class Stringifier {
                 throw e;
             }
             return UniFFIScaffolding.callAsyncWrapper(
-                195, // rondpoint:uniffi_uniffi_rondpoint_fn_method_stringifier_to_string_i16
+                196, // rondpoint:uniffi_uniffi_rondpoint_fn_method_stringifier_to_string_i16
                 FfiConverterTypeStringifier.lower(this),
                 FfiConverterI16.lower(value),
             )
@@ -2097,7 +2097,7 @@ export class Stringifier {
                 throw e;
             }
             return UniFFIScaffolding.callAsyncWrapper(
-                196, // rondpoint:uniffi_uniffi_rondpoint_fn_method_stringifier_to_string_i32
+                197, // rondpoint:uniffi_uniffi_rondpoint_fn_method_stringifier_to_string_i32
                 FfiConverterTypeStringifier.lower(this),
                 FfiConverterI32.lower(value),
             )
@@ -2126,7 +2126,7 @@ export class Stringifier {
                 throw e;
             }
             return UniFFIScaffolding.callAsyncWrapper(
-                197, // rondpoint:uniffi_uniffi_rondpoint_fn_method_stringifier_to_string_i64
+                198, // rondpoint:uniffi_uniffi_rondpoint_fn_method_stringifier_to_string_i64
                 FfiConverterTypeStringifier.lower(this),
                 FfiConverterI64.lower(value),
             )
@@ -2155,7 +2155,7 @@ export class Stringifier {
                 throw e;
             }
             return UniFFIScaffolding.callAsyncWrapper(
-                198, // rondpoint:uniffi_uniffi_rondpoint_fn_method_stringifier_to_string_i8
+                199, // rondpoint:uniffi_uniffi_rondpoint_fn_method_stringifier_to_string_i8
                 FfiConverterTypeStringifier.lower(this),
                 FfiConverterI8.lower(value),
             )
@@ -2184,7 +2184,7 @@ export class Stringifier {
                 throw e;
             }
             return UniFFIScaffolding.callAsyncWrapper(
-                199, // rondpoint:uniffi_uniffi_rondpoint_fn_method_stringifier_to_string_u16
+                200, // rondpoint:uniffi_uniffi_rondpoint_fn_method_stringifier_to_string_u16
                 FfiConverterTypeStringifier.lower(this),
                 FfiConverterU16.lower(value),
             )
@@ -2213,7 +2213,7 @@ export class Stringifier {
                 throw e;
             }
             return UniFFIScaffolding.callAsyncWrapper(
-                200, // rondpoint:uniffi_uniffi_rondpoint_fn_method_stringifier_to_string_u32
+                201, // rondpoint:uniffi_uniffi_rondpoint_fn_method_stringifier_to_string_u32
                 FfiConverterTypeStringifier.lower(this),
                 FfiConverterU32.lower(value),
             )
@@ -2242,7 +2242,7 @@ export class Stringifier {
                 throw e;
             }
             return UniFFIScaffolding.callAsyncWrapper(
-                201, // rondpoint:uniffi_uniffi_rondpoint_fn_method_stringifier_to_string_u64
+                202, // rondpoint:uniffi_uniffi_rondpoint_fn_method_stringifier_to_string_u64
                 FfiConverterTypeStringifier.lower(this),
                 FfiConverterU64.lower(value),
             )
@@ -2271,7 +2271,7 @@ export class Stringifier {
                 throw e;
             }
             return UniFFIScaffolding.callAsyncWrapper(
-                202, // rondpoint:uniffi_uniffi_rondpoint_fn_method_stringifier_to_string_u8
+                203, // rondpoint:uniffi_uniffi_rondpoint_fn_method_stringifier_to_string_u8
                 FfiConverterTypeStringifier.lower(this),
                 FfiConverterU8.lower(value),
             )
@@ -2300,7 +2300,7 @@ export class Stringifier {
                 throw e;
             }
             return UniFFIScaffolding.callAsyncWrapper(
-                203, // rondpoint:uniffi_uniffi_rondpoint_fn_method_stringifier_well_known_string
+                204, // rondpoint:uniffi_uniffi_rondpoint_fn_method_stringifier_well_known_string
                 FfiConverterTypeStringifier.lower(this),
                 FfiConverterString.lower(value),
             )
@@ -3677,7 +3677,7 @@ export function copieCarte(c) {
                 throw e;
             }
             return UniFFIScaffolding.callAsyncWrapper(
-                145, // rondpoint:uniffi_uniffi_rondpoint_fn_func_copie_carte
+                146, // rondpoint:uniffi_uniffi_rondpoint_fn_func_copie_carte
                 FfiConverterMapStringTypeEnumerationAvecDonnees.lower(c),
             )
         }
@@ -3706,7 +3706,7 @@ export function copieDictionnaire(d) {
                 throw e;
             }
             return UniFFIScaffolding.callAsyncWrapper(
-                146, // rondpoint:uniffi_uniffi_rondpoint_fn_func_copie_dictionnaire
+                147, // rondpoint:uniffi_uniffi_rondpoint_fn_func_copie_dictionnaire
                 FfiConverterTypeDictionnaire.lower(d),
             )
         }
@@ -3735,7 +3735,7 @@ export function copieEnumeration(e) {
                 throw e;
             }
             return UniFFIScaffolding.callAsyncWrapper(
-                147, // rondpoint:uniffi_uniffi_rondpoint_fn_func_copie_enumeration
+                148, // rondpoint:uniffi_uniffi_rondpoint_fn_func_copie_enumeration
                 FfiConverterTypeEnumeration.lower(e),
             )
         }
@@ -3764,7 +3764,7 @@ export function copieEnumerations(e) {
                 throw e;
             }
             return UniFFIScaffolding.callAsyncWrapper(
-                148, // rondpoint:uniffi_uniffi_rondpoint_fn_func_copie_enumerations
+                149, // rondpoint:uniffi_uniffi_rondpoint_fn_func_copie_enumerations
                 FfiConverterSequenceTypeEnumeration.lower(e),
             )
         }
@@ -3793,7 +3793,7 @@ export function switcheroo(b) {
                 throw e;
             }
             return UniFFIScaffolding.callAsyncWrapper(
-                149, // rondpoint:uniffi_uniffi_rondpoint_fn_func_switcheroo
+                150, // rondpoint:uniffi_uniffi_rondpoint_fn_func_switcheroo
                 FfiConverterBool.lower(b),
             )
         }

toolkit/components/uniffi-bindgen-gecko-js/fixtures/generated/RustSprites.sys.mjs

@@ -370,7 +370,7 @@ export class Sprite {
                 throw e;
             }
             return UniFFIScaffolding.callAsyncWrapper(
-                209, // sprites:uniffi_uniffi_sprites_fn_constructor_sprite_new
+                210, // sprites:uniffi_uniffi_sprites_fn_constructor_sprite_new
                 FfiConverterOptionalTypePoint.lower(initialPosition),
             )
         }
@@ -404,7 +404,7 @@ export class Sprite {
                 throw e;
             }
             return UniFFIScaffolding.callAsyncWrapper(
-                210, // sprites:uniffi_uniffi_sprites_fn_constructor_sprite_new_relative_to
+                211, // sprites:uniffi_uniffi_sprites_fn_constructor_sprite_new_relative_to
                 FfiConverterTypePoint.lower(reference),
                 FfiConverterTypeVector.lower(direction),
             )
@@ -424,7 +424,7 @@ export class Sprite {
         const liftError = null;
         const functionCall = () => {
             return UniFFIScaffolding.callAsyncWrapper(
-                206, // sprites:uniffi_uniffi_sprites_fn_method_sprite_get_position
+                207, // sprites:uniffi_uniffi_sprites_fn_method_sprite_get_position
                 FfiConverterTypeSprite.lower(this),
             )
         }
@@ -451,7 +451,7 @@ export class Sprite {
                 throw e;
             }
             return UniFFIScaffolding.callAsyncWrapper(
-                207, // sprites:uniffi_uniffi_sprites_fn_method_sprite_move_by
+                208, // sprites:uniffi_uniffi_sprites_fn_method_sprite_move_by
                 FfiConverterTypeSprite.lower(this),
                 FfiConverterTypeVector.lower(direction),
             )
@@ -479,7 +479,7 @@ export class Sprite {
                 throw e;
             }
             return UniFFIScaffolding.callAsyncWrapper(
-                208, // sprites:uniffi_uniffi_sprites_fn_method_sprite_move_to
+                209, // sprites:uniffi_uniffi_sprites_fn_method_sprite_move_to
                 FfiConverterTypeSprite.lower(this),
                 FfiConverterTypePoint.lower(position),
             )
@@ -755,7 +755,7 @@ export function translate(p,v) {
                 throw e;
             }
             return UniFFIScaffolding.callAsyncWrapper(
-                205, // sprites:uniffi_uniffi_sprites_fn_func_translate
+                206, // sprites:uniffi_uniffi_sprites_fn_func_translate
                 FfiConverterTypePoint.lower(p),
                 FfiConverterTypeVector.lower(v),
             )

toolkit/components/uniffi-bindgen-gecko-js/fixtures/generated/RustTodolist.sys.mjs

@@ -343,7 +343,7 @@ export class TodoList {
         const liftError = null;
         const functionCall = () => {
             return UniFFIScaffolding.callAsyncWrapper(
-                225, // todolist:uniffi_uniffi_todolist_fn_constructor_todolist_new
+                226, // todolist:uniffi_uniffi_todolist_fn_constructor_todolist_new
             )
         }
         try {
@@ -368,7 +368,7 @@ export class TodoList {
                 throw e;
             }
             return UniFFIScaffolding.callAsyncWrapper(
-                214, // todolist:uniffi_uniffi_todolist_fn_method_todolist_add_entries
+                215, // todolist:uniffi_uniffi_todolist_fn_method_todolist_add_entries
                 FfiConverterTypeTodoList.lower(this),
                 FfiConverterSequenceTypeTodoEntry.lower(entries),
             )
@@ -396,7 +396,7 @@ export class TodoList {
                 throw e;
             }
             return UniFFIScaffolding.callAsyncWrapper(
-                215, // todolist:uniffi_uniffi_todolist_fn_method_todolist_add_entry
+                216, // todolist:uniffi_uniffi_todolist_fn_method_todolist_add_entry
                 FfiConverterTypeTodoList.lower(this),
                 FfiConverterTypeTodoEntry.lower(entry),
             )
@@ -424,7 +424,7 @@ export class TodoList {
                 throw e;
             }
             return UniFFIScaffolding.callAsyncWrapper(
-                216, // todolist:uniffi_uniffi_todolist_fn_method_todolist_add_item
+                217, // todolist:uniffi_uniffi_todolist_fn_method_todolist_add_item
                 FfiConverterTypeTodoList.lower(this),
                 FfiConverterString.lower(todo),
             )
@@ -452,7 +452,7 @@ export class TodoList {
                 throw e;
             }
             return UniFFIScaffolding.callAsyncWrapper(
-                217, // todolist:uniffi_uniffi_todolist_fn_method_todolist_add_items
+                218, // todolist:uniffi_uniffi_todolist_fn_method_todolist_add_items
                 FfiConverterTypeTodoList.lower(this),
                 FfiConverterSequencestring.lower(items),
             )
@@ -480,7 +480,7 @@ export class TodoList {
                 throw e;
             }
             return UniFFIScaffolding.callAsyncWrapper(
-                218, // todolist:uniffi_uniffi_todolist_fn_method_todolist_clear_item
+                219, // todolist:uniffi_uniffi_todolist_fn_method_todolist_clear_item
                 FfiConverterTypeTodoList.lower(this),
                 FfiConverterString.lower(todo),
             )
@@ -501,7 +501,7 @@ export class TodoList {
         const liftError = null;
         const functionCall = () => {
             return UniFFIScaffolding.callAsyncWrapper(
-                219, // todolist:uniffi_uniffi_todolist_fn_method_todolist_get_entries
+                220, // todolist:uniffi_uniffi_todolist_fn_method_todolist_get_entries
                 FfiConverterTypeTodoList.lower(this),
             )
         }
@@ -521,7 +521,7 @@ export class TodoList {
         const liftError = (data) => FfiConverterTypeTodoError.lift(data);
         const functionCall = () => {
             return UniFFIScaffolding.callAsyncWrapper(
-                220, // todolist:uniffi_uniffi_todolist_fn_method_todolist_get_first
+                221, // todolist:uniffi_uniffi_todolist_fn_method_todolist_get_first
                 FfiConverterTypeTodoList.lower(this),
             )
         }
@@ -541,7 +541,7 @@ export class TodoList {
         const liftError = null;
         const functionCall = () => {
             return UniFFIScaffolding.callAsyncWrapper(
-                221, // todolist:uniffi_uniffi_todolist_fn_method_todolist_get_items
+                222, // todolist:uniffi_uniffi_todolist_fn_method_todolist_get_items
                 FfiConverterTypeTodoList.lower(this),
             )
         }
@@ -561,7 +561,7 @@ export class TodoList {
         const liftError = (data) => FfiConverterTypeTodoError.lift(data);
         const functionCall = () => {
             return UniFFIScaffolding.callAsyncWrapper(
-                222, // todolist:uniffi_uniffi_todolist_fn_method_todolist_get_last
+                223, // todolist:uniffi_uniffi_todolist_fn_method_todolist_get_last
                 FfiConverterTypeTodoList.lower(this),
             )
         }
@@ -581,7 +581,7 @@ export class TodoList {
         const liftError = (data) => FfiConverterTypeTodoError.lift(data);
         const functionCall = () => {
             return UniFFIScaffolding.callAsyncWrapper(
-                223, // todolist:uniffi_uniffi_todolist_fn_method_todolist_get_last_entry
+                224, // todolist:uniffi_uniffi_todolist_fn_method_todolist_get_last_entry
                 FfiConverterTypeTodoList.lower(this),
             )
         }
@@ -600,7 +600,7 @@ export class TodoList {
         const liftError = null;
         const functionCall = () => {
             return UniFFIScaffolding.callAsyncWrapper(
-                224, // todolist:uniffi_uniffi_todolist_fn_method_todolist_make_default
+                225, // todolist:uniffi_uniffi_todolist_fn_method_todolist_make_default
                 FfiConverterTypeTodoList.lower(this),
             )
         }
@@ -992,7 +992,7 @@ export function createEntryWith(todo) {
                 throw e;
             }
             return UniFFIScaffolding.callAsyncWrapper(
-                211, // todolist:uniffi_uniffi_todolist_fn_func_create_entry_with
+                212, // todolist:uniffi_uniffi_todolist_fn_func_create_entry_with
                 FfiConverterString.lower(todo),
             )
         }
@@ -1013,7 +1013,7 @@ export function getDefaultList() {
         const liftError = null;
         const functionCall = () => {
             return UniFFIScaffolding.callAsyncWrapper(
-                212, // todolist:uniffi_uniffi_todolist_fn_func_get_default_list
+                213, // todolist:uniffi_uniffi_todolist_fn_func_get_default_list
             )
         }
         try {
@@ -1040,7 +1040,7 @@ export function setDefaultList(list) {
                 throw e;
             }
             return UniFFIScaffolding.callAsyncWrapper(
-                213, // todolist:uniffi_uniffi_todolist_fn_func_set_default_list
+                214, // todolist:uniffi_uniffi_todolist_fn_func_set_default_list
                 FfiConverterTypeTodoList.lower(list),
             )
         }

toolkit/components/uniffi-bindgen-gecko-js/fixtures/generated/RustUniffiTraitInterfaces.sys.mjs

@@ -388,7 +388,7 @@ export class Calc {
                 throw e;
             }
             return UniFFIScaffolding.callSync(
-                228, // uniffi_trait_interfaces:uniffi_uniffi_trait_interfaces_fn_method_calc_add
+                229, // uniffi_trait_interfaces:uniffi_uniffi_trait_interfaces_fn_method_calc_add
                 FfiConverterTypeCalc.lower(this),
                 FfiConverterU32.lower(a),
                 FfiConverterU32.lower(b),
@@ -442,7 +442,7 @@ export function makeBuggyCalculator() {
         const liftError = null;
         const functionCall = () => {
             return UniFFIScaffolding.callSync(
-                226, // uniffi_trait_interfaces:uniffi_uniffi_trait_interfaces_fn_func_make_buggy_calculator
+                227, // uniffi_trait_interfaces:uniffi_uniffi_trait_interfaces_fn_func_make_buggy_calculator
             )
         }
         return handleRustResult(functionCall(), liftResult, liftError);
@@ -458,7 +458,7 @@ export function makeCalculator() {
         const liftError = null;
         const functionCall = () => {
             return UniFFIScaffolding.callSync(
-                227, // uniffi_trait_interfaces:uniffi_uniffi_trait_interfaces_fn_func_make_calculator
+                228, // uniffi_trait_interfaces:uniffi_uniffi_trait_interfaces_fn_func_make_calculator
             )
         }
         return handleRustResult(functionCall(), liftResult, liftError);

toolkit/components/uniffi-js/GeneratedScaffolding.cpp

@@ -178,7 +178,7 @@ extern "C" {
   uint32_t ffi_error_support_uniffi_contract_version();
   void* uniffi_relevancy_fn_clone_relevancystore(void*, RustCallStatus*);
   void uniffi_relevancy_fn_free_relevancystore(void*, RustCallStatus*);
-  void* uniffi_relevancy_fn_constructor_relevancystore_new(RustBuffer, RustCallStatus*);
+  void* uniffi_relevancy_fn_constructor_relevancystore_new(RustBuffer, void*, RustCallStatus*);
   void uniffi_relevancy_fn_method_relevancystore_bandit_init(void*, RustBuffer, RustBuffer, RustCallStatus*);
   RustBuffer uniffi_relevancy_fn_method_relevancystore_bandit_select(void*, RustBuffer, RustBuffer, RustCallStatus*);
   void uniffi_relevancy_fn_method_relevancystore_bandit_update(void*, RustBuffer, RustBuffer, int8_t, RustCallStatus*);
@@ -265,6 +265,7 @@ extern "C" {
   RustBuffer uniffi_remote_settings_fn_method_remotesettings_get_records_since(void*, uint64_t, RustCallStatus*);
   void* uniffi_remote_settings_fn_clone_remotesettingsclient(void*, RustCallStatus*);
   void uniffi_remote_settings_fn_free_remotesettingsclient(void*, RustCallStatus*);
+  void uniffi_remote_settings_fn_method_remotesettingsclient_close(void*, RustCallStatus*);
   RustBuffer uniffi_remote_settings_fn_method_remotesettingsclient_collection_name(void*, RustCallStatus*);
   RustBuffer uniffi_remote_settings_fn_method_remotesettingsclient_get_attachment(void*, RustBuffer, RustCallStatus*);
   RustBuffer uniffi_remote_settings_fn_method_remotesettingsclient_get_records(void*, int8_t, RustCallStatus*);
@@ -335,6 +336,7 @@ extern "C" {
   uint16_t uniffi_remote_settings_checksum_method_remotesettings_download_attachment_to_path();
   uint16_t uniffi_remote_settings_checksum_method_remotesettings_get_records();
   uint16_t uniffi_remote_settings_checksum_method_remotesettings_get_records_since();
+  uint16_t uniffi_remote_settings_checksum_method_remotesettingsclient_close();
   uint16_t uniffi_remote_settings_checksum_method_remotesettingsclient_collection_name();
   uint16_t uniffi_remote_settings_checksum_method_remotesettingsclient_get_attachment();
   uint16_t uniffi_remote_settings_checksum_method_remotesettingsclient_get_records();
@@ -4216,6 +4218,7 @@ class ScaffoldingCallHandlerUniffiRelevancyFnConstructorRelevancystoreNew : publ
 private:
   // LowerRustArgs stores the resulting arguments in these fields
   FfiValueRustBuffer mDbPath{};
+  FfiValueObjectHandleRemoteSettingsRemoteSettingsService mRemoteSettings{};
 
   // MakeRustCall stores the result of the call in these fields
   FfiValueObjectHandleRelevancyRelevancyStore mUniffiReturnValue{};
@@ -4226,12 +4229,17 @@ public:
     if (aError.Failed()) {
       return;
     }
+    mRemoteSettings.Lower(aArgs[1], aError);
+    if (aError.Failed()) {
+      return;
+    }
   }
 
   void MakeRustCall(RustCallStatus* aOutStatus) override {
     mUniffiReturnValue = FfiValueObjectHandleRelevancyRelevancyStore::FromRust(
       uniffi_relevancy_fn_constructor_relevancystore_new(
         mDbPath.IntoRust(),
+        mRemoteSettings.IntoRust(),
         aOutStatus
       )
     );
@@ -4387,6 +4395,31 @@ public:
     );
   }
 };
+class ScaffoldingCallHandlerUniffiRemoteSettingsFnMethodRemotesettingsclientClose : public UniffiSyncCallHandler {
+private:
+  // LowerRustArgs stores the resulting arguments in these fields
+  FfiValueObjectHandleRemoteSettingsRemoteSettingsClient mPtr{};
+
+  // MakeRustCall stores the result of the call in these fields
+
+public:
+  void LowerRustArgs(const dom::Sequence<dom::OwningUniFFIScaffoldingValue>& aArgs, ErrorResult& aError) override {
+    mPtr.Lower(aArgs[0], aError);
+    if (aError.Failed()) {
+      return;
+    }
+  }
+
+  void MakeRustCall(RustCallStatus* aOutStatus) override {
+    uniffi_remote_settings_fn_method_remotesettingsclient_close(
+      mPtr.IntoRust(),
+      aOutStatus
+    );
+  }
+
+  virtual void LiftSuccessfulCallResult(JSContext* aCx, dom::Optional<dom::OwningUniFFIScaffoldingValue>& aDest, ErrorResult& aError) override {
+  }
+};
 class ScaffoldingCallHandlerUniffiRemoteSettingsFnMethodRemotesettingsclientCollectionName : public UniffiSyncCallHandler {
 private:
   // LowerRustArgs stores the resulting arguments in these fields
@@ -11870,593 +11903,596 @@ UniquePtr<UniffiSyncCallHandler> GetSyncCallHandler(uint64_t aId) {
       return MakeUnique<ScaffoldingCallHandlerUniffiRemoteSettingsFnConstructorRemotesettingsNew>();
     }
     case 17: {
-      return MakeUnique<ScaffoldingCallHandlerUniffiRemoteSettingsFnMethodRemotesettingsclientCollectionName>();
+      return MakeUnique<ScaffoldingCallHandlerUniffiRemoteSettingsFnMethodRemotesettingsclientClose>();
     }
     case 18: {
-      return MakeUnique<ScaffoldingCallHandlerUniffiRemoteSettingsFnMethodRemotesettingsclientGetAttachment>();
+      return MakeUnique<ScaffoldingCallHandlerUniffiRemoteSettingsFnMethodRemotesettingsclientCollectionName>();
     }
     case 19: {
-      return MakeUnique<ScaffoldingCallHandlerUniffiRemoteSettingsFnMethodRemotesettingsclientGetRecords>();
+      return MakeUnique<ScaffoldingCallHandlerUniffiRemoteSettingsFnMethodRemotesettingsclientGetAttachment>();
     }
     case 20: {
-      return MakeUnique<ScaffoldingCallHandlerUniffiRemoteSettingsFnMethodRemotesettingsclientGetRecordsMap>();
+      return MakeUnique<ScaffoldingCallHandlerUniffiRemoteSettingsFnMethodRemotesettingsclientGetRecords>();
     }
     case 21: {
-      return MakeUnique<ScaffoldingCallHandlerUniffiRemoteSettingsFnMethodRemotesettingsclientSync>();
+      return MakeUnique<ScaffoldingCallHandlerUniffiRemoteSettingsFnMethodRemotesettingsclientGetRecordsMap>();
     }
     case 22: {
-      return MakeUnique<ScaffoldingCallHandlerUniffiRemoteSettingsFnMethodRemotesettingsserviceMakeClient>();
+      return MakeUnique<ScaffoldingCallHandlerUniffiRemoteSettingsFnMethodRemotesettingsclientSync>();
     }
     case 23: {
-      return MakeUnique<ScaffoldingCallHandlerUniffiRemoteSettingsFnMethodRemotesettingsserviceSync>();
+      return MakeUnique<ScaffoldingCallHandlerUniffiRemoteSettingsFnMethodRemotesettingsserviceMakeClient>();
     }
     case 24: {
-      return MakeUnique<ScaffoldingCallHandlerUniffiRemoteSettingsFnMethodRemotesettingsserviceUpdateConfig>();
+      return MakeUnique<ScaffoldingCallHandlerUniffiRemoteSettingsFnMethodRemotesettingsserviceSync>();
     }
     case 25: {
-      return MakeUnique<ScaffoldingCallHandlerUniffiRemoteSettingsFnConstructorRemotesettingsserviceNew>();
+      return MakeUnique<ScaffoldingCallHandlerUniffiRemoteSettingsFnMethodRemotesettingsserviceUpdateConfig>();
     }
     case 26: {
-      return MakeUnique<ScaffoldingCallHandlerUniffiSearchFnMethodSearchengineselectorClearSearchConfig>();
+      return MakeUnique<ScaffoldingCallHandlerUniffiRemoteSettingsFnConstructorRemotesettingsserviceNew>();
     }
     case 27: {
-      return MakeUnique<ScaffoldingCallHandlerUniffiSearchFnMethodSearchengineselectorFilterEngineConfiguration>();
+      return MakeUnique<ScaffoldingCallHandlerUniffiSearchFnMethodSearchengineselectorClearSearchConfig>();
     }
     case 28: {
-      return MakeUnique<ScaffoldingCallHandlerUniffiSearchFnMethodSearchengineselectorSetConfigOverrides>();
+      return MakeUnique<ScaffoldingCallHandlerUniffiSearchFnMethodSearchengineselectorFilterEngineConfiguration>();
     }
     case 29: {
-      return MakeUnique<ScaffoldingCallHandlerUniffiSearchFnMethodSearchengineselectorSetSearchConfig>();
+      return MakeUnique<ScaffoldingCallHandlerUniffiSearchFnMethodSearchengineselectorSetConfigOverrides>();
     }
     case 30: {
-      return MakeUnique<ScaffoldingCallHandlerUniffiSearchFnMethodSearchengineselectorUseRemoteSettingsServer>();
+      return MakeUnique<ScaffoldingCallHandlerUniffiSearchFnMethodSearchengineselectorSetSearchConfig>();
     }
     case 31: {
-      return MakeUnique<ScaffoldingCallHandlerUniffiSearchFnConstructorSearchengineselectorNew>();
+      return MakeUnique<ScaffoldingCallHandlerUniffiSearchFnMethodSearchengineselectorUseRemoteSettingsServer>();
     }
     case 32: {
-      return MakeUnique<ScaffoldingCallHandlerUniffiSuggestFnFuncRawSuggestionUrlMatches>();
+      return MakeUnique<ScaffoldingCallHandlerUniffiSearchFnConstructorSearchengineselectorNew>();
     }
     case 33: {
-      return MakeUnique<ScaffoldingCallHandlerUniffiSuggestFnMethodSuggeststoreAnyDismissedSuggestions>();
+      return MakeUnique<ScaffoldingCallHandlerUniffiSuggestFnFuncRawSuggestionUrlMatches>();
     }
     case 34: {
-      return MakeUnique<ScaffoldingCallHandlerUniffiSuggestFnMethodSuggeststoreClear>();
+      return MakeUnique<ScaffoldingCallHandlerUniffiSuggestFnMethodSuggeststoreAnyDismissedSuggestions>();
     }
     case 35: {
-      return MakeUnique<ScaffoldingCallHandlerUniffiSuggestFnMethodSuggeststoreClearDismissedSuggestions>();
+      return MakeUnique<ScaffoldingCallHandlerUniffiSuggestFnMethodSuggeststoreClear>();
     }
     case 36: {
-      return MakeUnique<ScaffoldingCallHandlerUniffiSuggestFnMethodSuggeststoreDismissByKey>();
+      return MakeUnique<ScaffoldingCallHandlerUniffiSuggestFnMethodSuggeststoreClearDismissedSuggestions>();
     }
     case 37: {
-      return MakeUnique<ScaffoldingCallHandlerUniffiSuggestFnMethodSuggeststoreDismissBySuggestion>();
+      return MakeUnique<ScaffoldingCallHandlerUniffiSuggestFnMethodSuggeststoreDismissByKey>();
     }
     case 38: {
-      return MakeUnique<ScaffoldingCallHandlerUniffiSuggestFnMethodSuggeststoreDismissSuggestion>();
+      return MakeUnique<ScaffoldingCallHandlerUniffiSuggestFnMethodSuggeststoreDismissBySuggestion>();
     }
     case 39: {
-      return MakeUnique<ScaffoldingCallHandlerUniffiSuggestFnMethodSuggeststoreFetchGeonames>();
+      return MakeUnique<ScaffoldingCallHandlerUniffiSuggestFnMethodSuggeststoreDismissSuggestion>();
     }
     case 40: {
-      return MakeUnique<ScaffoldingCallHandlerUniffiSuggestFnMethodSuggeststoreFetchGlobalConfig>();
+      return MakeUnique<ScaffoldingCallHandlerUniffiSuggestFnMethodSuggeststoreFetchGeonames>();
     }
     case 41: {
-      return MakeUnique<ScaffoldingCallHandlerUniffiSuggestFnMethodSuggeststoreFetchProviderConfig>();
+      return MakeUnique<ScaffoldingCallHandlerUniffiSuggestFnMethodSuggeststoreFetchGlobalConfig>();
     }
     case 42: {
-      return MakeUnique<ScaffoldingCallHandlerUniffiSuggestFnMethodSuggeststoreIngest>();
+      return MakeUnique<ScaffoldingCallHandlerUniffiSuggestFnMethodSuggeststoreFetchProviderConfig>();
     }
     case 43: {
-      return MakeUnique<ScaffoldingCallHandlerUniffiSuggestFnMethodSuggeststoreInterrupt>();
+      return MakeUnique<ScaffoldingCallHandlerUniffiSuggestFnMethodSuggeststoreIngest>();
     }
     case 44: {
-      return MakeUnique<ScaffoldingCallHandlerUniffiSuggestFnMethodSuggeststoreIsDismissedByKey>();
+      return MakeUnique<ScaffoldingCallHandlerUniffiSuggestFnMethodSuggeststoreInterrupt>();
     }
     case 45: {
-      return MakeUnique<ScaffoldingCallHandlerUniffiSuggestFnMethodSuggeststoreIsDismissedBySuggestion>();
+      return MakeUnique<ScaffoldingCallHandlerUniffiSuggestFnMethodSuggeststoreIsDismissedByKey>();
     }
     case 46: {
-      return MakeUnique<ScaffoldingCallHandlerUniffiSuggestFnMethodSuggeststoreQuery>();
+      return MakeUnique<ScaffoldingCallHandlerUniffiSuggestFnMethodSuggeststoreIsDismissedBySuggestion>();
     }
     case 47: {
-      return MakeUnique<ScaffoldingCallHandlerUniffiSuggestFnMethodSuggeststoreQueryWithMetrics>();
+      return MakeUnique<ScaffoldingCallHandlerUniffiSuggestFnMethodSuggeststoreQuery>();
     }
     case 48: {
-      return MakeUnique<ScaffoldingCallHandlerUniffiSuggestFnConstructorSuggeststoreNew>();
+      return MakeUnique<ScaffoldingCallHandlerUniffiSuggestFnMethodSuggeststoreQueryWithMetrics>();
     }
     case 49: {
-      return MakeUnique<ScaffoldingCallHandlerUniffiSuggestFnMethodSuggeststorebuilderBuild>();
+      return MakeUnique<ScaffoldingCallHandlerUniffiSuggestFnConstructorSuggeststoreNew>();
     }
     case 50: {
-      return MakeUnique<ScaffoldingCallHandlerUniffiSuggestFnMethodSuggeststorebuilderCachePath>();
+      return MakeUnique<ScaffoldingCallHandlerUniffiSuggestFnMethodSuggeststorebuilderBuild>();
     }
     case 51: {
-      return MakeUnique<ScaffoldingCallHandlerUniffiSuggestFnMethodSuggeststorebuilderDataPath>();
+      return MakeUnique<ScaffoldingCallHandlerUniffiSuggestFnMethodSuggeststorebuilderCachePath>();
     }
     case 52: {
-      return MakeUnique<ScaffoldingCallHandlerUniffiSuggestFnMethodSuggeststorebuilderLoadExtension>();
+      return MakeUnique<ScaffoldingCallHandlerUniffiSuggestFnMethodSuggeststorebuilderDataPath>();
     }
     case 53: {
-      return MakeUnique<ScaffoldingCallHandlerUniffiSuggestFnMethodSuggeststorebuilderRemoteSettingsBucketName>();
+      return MakeUnique<ScaffoldingCallHandlerUniffiSuggestFnMethodSuggeststorebuilderLoadExtension>();
     }
     case 54: {
-      return MakeUnique<ScaffoldingCallHandlerUniffiSuggestFnMethodSuggeststorebuilderRemoteSettingsServer>();
+      return MakeUnique<ScaffoldingCallHandlerUniffiSuggestFnMethodSuggeststorebuilderRemoteSettingsBucketName>();
     }
     case 55: {
-      return MakeUnique<ScaffoldingCallHandlerUniffiSuggestFnMethodSuggeststorebuilderRemoteSettingsService>();
+      return MakeUnique<ScaffoldingCallHandlerUniffiSuggestFnMethodSuggeststorebuilderRemoteSettingsServer>();
     }
     case 56: {
-      return MakeUnique<ScaffoldingCallHandlerUniffiSuggestFnConstructorSuggeststorebuilderNew>();
+      return MakeUnique<ScaffoldingCallHandlerUniffiSuggestFnMethodSuggeststorebuilderRemoteSettingsService>();
     }
     case 57: {
-      return MakeUnique<ScaffoldingCallHandlerUniffiTabsFnMethodRemotecommandstoreAddRemoteCommand>();
+      return MakeUnique<ScaffoldingCallHandlerUniffiSuggestFnConstructorSuggeststorebuilderNew>();
     }
     case 58: {
-      return MakeUnique<ScaffoldingCallHandlerUniffiTabsFnMethodRemotecommandstoreAddRemoteCommandAt>();
+      return MakeUnique<ScaffoldingCallHandlerUniffiTabsFnMethodRemotecommandstoreAddRemoteCommand>();
     }
     case 59: {
-      return MakeUnique<ScaffoldingCallHandlerUniffiTabsFnMethodRemotecommandstoreGetUnsentCommands>();
+      return MakeUnique<ScaffoldingCallHandlerUniffiTabsFnMethodRemotecommandstoreAddRemoteCommandAt>();
     }
     case 60: {
-      return MakeUnique<ScaffoldingCallHandlerUniffiTabsFnMethodRemotecommandstoreRemoveRemoteCommand>();
+      return MakeUnique<ScaffoldingCallHandlerUniffiTabsFnMethodRemotecommandstoreGetUnsentCommands>();
     }
     case 61: {
-      return MakeUnique<ScaffoldingCallHandlerUniffiTabsFnMethodRemotecommandstoreSetPendingCommandSent>();
+      return MakeUnique<ScaffoldingCallHandlerUniffiTabsFnMethodRemotecommandstoreRemoveRemoteCommand>();
     }
     case 62: {
-      return MakeUnique<ScaffoldingCallHandlerUniffiTabsFnMethodTabsbridgedengineApply>();
+      return MakeUnique<ScaffoldingCallHandlerUniffiTabsFnMethodRemotecommandstoreSetPendingCommandSent>();
     }
     case 63: {
-      return MakeUnique<ScaffoldingCallHandlerUniffiTabsFnMethodTabsbridgedengineEnsureCurrentSyncId>();
+      return MakeUnique<ScaffoldingCallHandlerUniffiTabsFnMethodTabsbridgedengineApply>();
     }
     case 64: {
-      return MakeUnique<ScaffoldingCallHandlerUniffiTabsFnMethodTabsbridgedengineLastSync>();
+      return MakeUnique<ScaffoldingCallHandlerUniffiTabsFnMethodTabsbridgedengineEnsureCurrentSyncId>();
     }
     case 65: {
-      return MakeUnique<ScaffoldingCallHandlerUniffiTabsFnMethodTabsbridgedenginePrepareForSync>();
+      return MakeUnique<ScaffoldingCallHandlerUniffiTabsFnMethodTabsbridgedengineLastSync>();
     }
     case 66: {
-      return MakeUnique<ScaffoldingCallHandlerUniffiTabsFnMethodTabsbridgedengineReset>();
+      return MakeUnique<ScaffoldingCallHandlerUniffiTabsFnMethodTabsbridgedenginePrepareForSync>();
     }
     case 67: {
-      return MakeUnique<ScaffoldingCallHandlerUniffiTabsFnMethodTabsbridgedengineResetSyncId>();
+      return MakeUnique<ScaffoldingCallHandlerUniffiTabsFnMethodTabsbridgedengineReset>();
     }
     case 68: {
-      return MakeUnique<ScaffoldingCallHandlerUniffiTabsFnMethodTabsbridgedengineSetLastSync>();
+      return MakeUnique<ScaffoldingCallHandlerUniffiTabsFnMethodTabsbridgedengineResetSyncId>();
     }
     case 69: {
-      return MakeUnique<ScaffoldingCallHandlerUniffiTabsFnMethodTabsbridgedengineSetUploaded>();
+      return MakeUnique<ScaffoldingCallHandlerUniffiTabsFnMethodTabsbridgedengineSetLastSync>();
     }
     case 70: {
-      return MakeUnique<ScaffoldingCallHandlerUniffiTabsFnMethodTabsbridgedengineStoreIncoming>();
+      return MakeUnique<ScaffoldingCallHandlerUniffiTabsFnMethodTabsbridgedengineSetUploaded>();
     }
     case 71: {
-      return MakeUnique<ScaffoldingCallHandlerUniffiTabsFnMethodTabsbridgedengineSyncFinished>();
+      return MakeUnique<ScaffoldingCallHandlerUniffiTabsFnMethodTabsbridgedengineStoreIncoming>();
     }
     case 72: {
-      return MakeUnique<ScaffoldingCallHandlerUniffiTabsFnMethodTabsbridgedengineSyncId>();
+      return MakeUnique<ScaffoldingCallHandlerUniffiTabsFnMethodTabsbridgedengineSyncFinished>();
     }
     case 73: {
-      return MakeUnique<ScaffoldingCallHandlerUniffiTabsFnMethodTabsbridgedengineSyncStarted>();
+      return MakeUnique<ScaffoldingCallHandlerUniffiTabsFnMethodTabsbridgedengineSyncId>();
     }
     case 74: {
-      return MakeUnique<ScaffoldingCallHandlerUniffiTabsFnMethodTabsbridgedengineWipe>();
+      return MakeUnique<ScaffoldingCallHandlerUniffiTabsFnMethodTabsbridgedengineSyncStarted>();
     }
     case 75: {
-      return MakeUnique<ScaffoldingCallHandlerUniffiTabsFnMethodTabsstoreBridgedEngine>();
+      return MakeUnique<ScaffoldingCallHandlerUniffiTabsFnMethodTabsbridgedengineWipe>();
     }
     case 76: {
-      return MakeUnique<ScaffoldingCallHandlerUniffiTabsFnMethodTabsstoreCloseConnection>();
+      return MakeUnique<ScaffoldingCallHandlerUniffiTabsFnMethodTabsstoreBridgedEngine>();
     }
     case 77: {
-      return MakeUnique<ScaffoldingCallHandlerUniffiTabsFnMethodTabsstoreGetAll>();
+      return MakeUnique<ScaffoldingCallHandlerUniffiTabsFnMethodTabsstoreCloseConnection>();
     }
     case 78: {
-      return MakeUnique<ScaffoldingCallHandlerUniffiTabsFnMethodTabsstoreNewRemoteCommandStore>();
+      return MakeUnique<ScaffoldingCallHandlerUniffiTabsFnMethodTabsstoreGetAll>();
     }
     case 79: {
-      return MakeUnique<ScaffoldingCallHandlerUniffiTabsFnMethodTabsstoreRegisterWithSyncManager>();
+      return MakeUnique<ScaffoldingCallHandlerUniffiTabsFnMethodTabsstoreNewRemoteCommandStore>();
     }
     case 80: {
-      return MakeUnique<ScaffoldingCallHandlerUniffiTabsFnMethodTabsstoreSetLocalTabs>();
+      return MakeUnique<ScaffoldingCallHandlerUniffiTabsFnMethodTabsstoreRegisterWithSyncManager>();
     }
     case 81: {
-      return MakeUnique<ScaffoldingCallHandlerUniffiTabsFnConstructorTabsstoreNew>();
+      return MakeUnique<ScaffoldingCallHandlerUniffiTabsFnMethodTabsstoreSetLocalTabs>();
     }
     case 82: {
-      return MakeUnique<ScaffoldingCallHandlerUniffiWebextStorageFnMethodWebextstoragebridgedengineApply>();
+      return MakeUnique<ScaffoldingCallHandlerUniffiTabsFnConstructorTabsstoreNew>();
     }
     case 83: {
-      return MakeUnique<ScaffoldingCallHandlerUniffiWebextStorageFnMethodWebextstoragebridgedengineEnsureCurrentSyncId>();
+      return MakeUnique<ScaffoldingCallHandlerUniffiWebextStorageFnMethodWebextstoragebridgedengineApply>();
     }
     case 84: {
-      return MakeUnique<ScaffoldingCallHandlerUniffiWebextStorageFnMethodWebextstoragebridgedengineLastSync>();
+      return MakeUnique<ScaffoldingCallHandlerUniffiWebextStorageFnMethodWebextstoragebridgedengineEnsureCurrentSyncId>();
     }
     case 85: {
-      return MakeUnique<ScaffoldingCallHandlerUniffiWebextStorageFnMethodWebextstoragebridgedenginePrepareForSync>();
+      return MakeUnique<ScaffoldingCallHandlerUniffiWebextStorageFnMethodWebextstoragebridgedengineLastSync>();
     }
     case 86: {
-      return MakeUnique<ScaffoldingCallHandlerUniffiWebextStorageFnMethodWebextstoragebridgedengineReset>();
+      return MakeUnique<ScaffoldingCallHandlerUniffiWebextStorageFnMethodWebextstoragebridgedenginePrepareForSync>();
     }
     case 87: {
-      return MakeUnique<ScaffoldingCallHandlerUniffiWebextStorageFnMethodWebextstoragebridgedengineResetSyncId>();
+      return MakeUnique<ScaffoldingCallHandlerUniffiWebextStorageFnMethodWebextstoragebridgedengineReset>();
     }
     case 88: {
-      return MakeUnique<ScaffoldingCallHandlerUniffiWebextStorageFnMethodWebextstoragebridgedengineSetLastSync>();
+      return MakeUnique<ScaffoldingCallHandlerUniffiWebextStorageFnMethodWebextstoragebridgedengineResetSyncId>();
     }
     case 89: {
-      return MakeUnique<ScaffoldingCallHandlerUniffiWebextStorageFnMethodWebextstoragebridgedengineSetUploaded>();
+      return MakeUnique<ScaffoldingCallHandlerUniffiWebextStorageFnMethodWebextstoragebridgedengineSetLastSync>();
     }
     case 90: {
-      return MakeUnique<ScaffoldingCallHandlerUniffiWebextStorageFnMethodWebextstoragebridgedengineStoreIncoming>();
+      return MakeUnique<ScaffoldingCallHandlerUniffiWebextStorageFnMethodWebextstoragebridgedengineSetUploaded>();
     }
     case 91: {
-      return MakeUnique<ScaffoldingCallHandlerUniffiWebextStorageFnMethodWebextstoragebridgedengineSyncFinished>();
+      return MakeUnique<ScaffoldingCallHandlerUniffiWebextStorageFnMethodWebextstoragebridgedengineStoreIncoming>();
     }
     case 92: {
-      return MakeUnique<ScaffoldingCallHandlerUniffiWebextStorageFnMethodWebextstoragebridgedengineSyncId>();
+      return MakeUnique<ScaffoldingCallHandlerUniffiWebextStorageFnMethodWebextstoragebridgedengineSyncFinished>();
     }
     case 93: {
-      return MakeUnique<ScaffoldingCallHandlerUniffiWebextStorageFnMethodWebextstoragebridgedengineSyncStarted>();
+      return MakeUnique<ScaffoldingCallHandlerUniffiWebextStorageFnMethodWebextstoragebridgedengineSyncId>();
     }
     case 94: {
-      return MakeUnique<ScaffoldingCallHandlerUniffiWebextStorageFnMethodWebextstoragebridgedengineWipe>();
+      return MakeUnique<ScaffoldingCallHandlerUniffiWebextStorageFnMethodWebextstoragebridgedengineSyncStarted>();
     }
     case 95: {
-      return MakeUnique<ScaffoldingCallHandlerUniffiWebextStorageFnMethodWebextstoragestoreBridgedEngine>();
+      return MakeUnique<ScaffoldingCallHandlerUniffiWebextStorageFnMethodWebextstoragebridgedengineWipe>();
     }
     case 96: {
-      return MakeUnique<ScaffoldingCallHandlerUniffiWebextStorageFnMethodWebextstoragestoreClear>();
+      return MakeUnique<ScaffoldingCallHandlerUniffiWebextStorageFnMethodWebextstoragestoreBridgedEngine>();
     }
     case 97: {
-      return MakeUnique<ScaffoldingCallHandlerUniffiWebextStorageFnMethodWebextstoragestoreClose>();
+      return MakeUnique<ScaffoldingCallHandlerUniffiWebextStorageFnMethodWebextstoragestoreClear>();
     }
     case 98: {
-      return MakeUnique<ScaffoldingCallHandlerUniffiWebextStorageFnMethodWebextstoragestoreGet>();
+      return MakeUnique<ScaffoldingCallHandlerUniffiWebextStorageFnMethodWebextstoragestoreClose>();
     }
     case 99: {
-      return MakeUnique<ScaffoldingCallHandlerUniffiWebextStorageFnMethodWebextstoragestoreGetBytesInUse>();
+      return MakeUnique<ScaffoldingCallHandlerUniffiWebextStorageFnMethodWebextstoragestoreGet>();
     }
     case 100: {
-      return MakeUnique<ScaffoldingCallHandlerUniffiWebextStorageFnMethodWebextstoragestoreGetSyncedChanges>();
+      return MakeUnique<ScaffoldingCallHandlerUniffiWebextStorageFnMethodWebextstoragestoreGetBytesInUse>();
     }
     case 101: {
-      return MakeUnique<ScaffoldingCallHandlerUniffiWebextStorageFnMethodWebextstoragestoreRemove>();
+      return MakeUnique<ScaffoldingCallHandlerUniffiWebextStorageFnMethodWebextstoragestoreGetSyncedChanges>();
     }
     case 102: {
-      return MakeUnique<ScaffoldingCallHandlerUniffiWebextStorageFnMethodWebextstoragestoreSet>();
+      return MakeUnique<ScaffoldingCallHandlerUniffiWebextStorageFnMethodWebextstoragestoreRemove>();
     }
     case 103: {
+      return MakeUnique<ScaffoldingCallHandlerUniffiWebextStorageFnMethodWebextstoragestoreSet>();
+    }
+    case 104: {
       return MakeUnique<ScaffoldingCallHandlerUniffiWebextStorageFnConstructorWebextstoragestoreNew>();
     }
 
 #ifdef MOZ_UNIFFI_FIXTURES
-    case 104: {
+    case 105: {
       return MakeUnique<ScaffoldingCallHandlerUniffiArithmeticalFnFuncAdd>();
     }
-    case 105: {
+    case 106: {
       return MakeUnique<ScaffoldingCallHandlerUniffiArithmeticalFnFuncDiv>();
     }
-    case 106: {
+    case 107: {
       return MakeUnique<ScaffoldingCallHandlerUniffiArithmeticalFnFuncEqual>();
     }
-    case 107: {
+    case 108: {
       return MakeUnique<ScaffoldingCallHandlerUniffiArithmeticalFnFuncSub>();
     }
-    case 108: {
+    case 109: {
       return MakeUnique<ScaffoldingCallHandlerUniffiUniffiCustomTypesFnFuncGetCustomTypesDemo>();
     }
-    case 109: {
+    case 110: {
       return MakeUnique<ScaffoldingCallHandlerUniffiUniffiFixtureExternalTypesFnFuncGradient>();
     }
-    case 110: {
+    case 111: {
       return MakeUnique<ScaffoldingCallHandlerUniffiUniffiFixtureExternalTypesFnFuncIntersection>();
     }
-    case 111: {
+    case 112: {
       return MakeUnique<ScaffoldingCallHandlerUniffiUniffiFixtureExternalTypesFnFuncMoveSpriteToOrigin>();
     }
-    case 112: {
+    case 113: {
       return MakeUnique<ScaffoldingCallHandlerUniffiUniffiFixtureCallbacksFnFuncCallLogRepeat>();
     }
-    case 113: {
+    case 114: {
       return MakeUnique<ScaffoldingCallHandlerUniffiUniffiFixtureCallbacksFnFuncLogEvenNumbers>();
     }
-    case 114: {
+    case 115: {
       return MakeUnique<ScaffoldingCallHandlerUniffiUniffiFixtureCallbacksFnFuncLogEvenNumbersMainThread>();
     }
-    case 116: {
+    case 117: {
       return MakeUnique<ScaffoldingCallHandlerUniffiUniffiFixtureFuturesFnFuncInitializeGeckoGlobalWorkerQueue>();
     }
-    case 117: {
+    case 118: {
       return MakeUnique<ScaffoldingCallHandlerUniffiUniffiFixtureFuturesFnFuncInitializeGlobalWorkerQueue>();
     }
-    case 132: {
+    case 133: {
       return MakeUnique<ScaffoldingCallHandlerUniffiUniffiFixtureFuturesFnMethodFuturetesterCompleteFutures>();
     }
-    case 134: {
+    case 135: {
       return MakeUnique<ScaffoldingCallHandlerUniffiUniffiFixtureFuturesFnMethodFuturetesterWakeFutures>();
     }
-    case 135: {
+    case 136: {
       return MakeUnique<ScaffoldingCallHandlerUniffiUniffiFixtureFuturesFnConstructorFuturetesterInit>();
     }
-    case 136: {
+    case 137: {
       return MakeUnique<ScaffoldingCallHandlerUniffiUniffiFixtureFuturesFnMethodRusttaskRun>();
     }
-    case 137: {
+    case 138: {
       return MakeUnique<ScaffoldingCallHandlerUniffiUniffiFixtureFuturesFnMethodTravellerName>();
     }
-    case 138: {
+    case 139: {
       return MakeUnique<ScaffoldingCallHandlerUniffiUniffiFixtureFuturesFnConstructorTravellerNew>();
     }
-    case 139: {
+    case 140: {
       return MakeUnique<ScaffoldingCallHandlerUniffiUniffiFixtureFuturesFnMethodWorkerqueueAddTask>();
     }
-    case 140: {
+    case 141: {
       return MakeUnique<ScaffoldingCallHandlerUniffiUniffiGeometryFnFuncGradient>();
     }
-    case 141: {
+    case 142: {
       return MakeUnique<ScaffoldingCallHandlerUniffiUniffiGeometryFnFuncIntersection>();
     }
-    case 142: {
+    case 143: {
       return MakeUnique<ScaffoldingCallHandlerUniffiUniffiFixtureRefcountsFnFuncGetJsRefcount>();
     }
-    case 143: {
+    case 144: {
       return MakeUnique<ScaffoldingCallHandlerUniffiUniffiFixtureRefcountsFnFuncGetSingleton>();
     }
-    case 144: {
+    case 145: {
       return MakeUnique<ScaffoldingCallHandlerUniffiUniffiFixtureRefcountsFnMethodSingletonobjectMethod>();
     }
-    case 145: {
+    case 146: {
       return MakeUnique<ScaffoldingCallHandlerUniffiUniffiRondpointFnFuncCopieCarte>();
     }
-    case 146: {
+    case 147: {
       return MakeUnique<ScaffoldingCallHandlerUniffiUniffiRondpointFnFuncCopieDictionnaire>();
     }
-    case 147: {
+    case 148: {
       return MakeUnique<ScaffoldingCallHandlerUniffiUniffiRondpointFnFuncCopieEnumeration>();
     }
-    case 148: {
+    case 149: {
       return MakeUnique<ScaffoldingCallHandlerUniffiUniffiRondpointFnFuncCopieEnumerations>();
     }
-    case 149: {
+    case 150: {
       return MakeUnique<ScaffoldingCallHandlerUniffiUniffiRondpointFnFuncSwitcheroo>();
     }
-    case 150: {
+    case 151: {
       return MakeUnique<ScaffoldingCallHandlerUniffiUniffiRondpointFnMethodOptionneurSinonBoolean>();
     }
-    case 151: {
+    case 152: {
       return MakeUnique<ScaffoldingCallHandlerUniffiUniffiRondpointFnMethodOptionneurSinonEnum>();
     }
-    case 152: {
+    case 153: {
       return MakeUnique<ScaffoldingCallHandlerUniffiUniffiRondpointFnMethodOptionneurSinonF32>();
     }
-    case 153: {
+    case 154: {
       return MakeUnique<ScaffoldingCallHandlerUniffiUniffiRondpointFnMethodOptionneurSinonF64>();
     }
-    case 154: {
+    case 155: {
       return MakeUnique<ScaffoldingCallHandlerUniffiUniffiRondpointFnMethodOptionneurSinonI16Dec>();
     }
-    case 155: {
+    case 156: {
       return MakeUnique<ScaffoldingCallHandlerUniffiUniffiRondpointFnMethodOptionneurSinonI16Hex>();
     }
-    case 156: {
+    case 157: {
       return MakeUnique<ScaffoldingCallHandlerUniffiUniffiRondpointFnMethodOptionneurSinonI32Dec>();
     }
-    case 157: {
+    case 158: {
       return MakeUnique<ScaffoldingCallHandlerUniffiUniffiRondpointFnMethodOptionneurSinonI32Hex>();
     }
-    case 158: {
+    case 159: {
       return MakeUnique<ScaffoldingCallHandlerUniffiUniffiRondpointFnMethodOptionneurSinonI64Dec>();
     }
-    case 159: {
+    case 160: {
       return MakeUnique<ScaffoldingCallHandlerUniffiUniffiRondpointFnMethodOptionneurSinonI64Hex>();
     }
-    case 160: {
+    case 161: {
       return MakeUnique<ScaffoldingCallHandlerUniffiUniffiRondpointFnMethodOptionneurSinonI8Dec>();
     }
-    case 161: {
+    case 162: {
       return MakeUnique<ScaffoldingCallHandlerUniffiUniffiRondpointFnMethodOptionneurSinonI8Hex>();
     }
-    case 162: {
+    case 163: {
       return MakeUnique<ScaffoldingCallHandlerUniffiUniffiRondpointFnMethodOptionneurSinonNull>();
     }
-    case 163: {
+    case 164: {
       return MakeUnique<ScaffoldingCallHandlerUniffiUniffiRondpointFnMethodOptionneurSinonSequence>();
     }
-    case 164: {
+    case 165: {
       return MakeUnique<ScaffoldingCallHandlerUniffiUniffiRondpointFnMethodOptionneurSinonString>();
     }
-    case 165: {
+    case 166: {
       return MakeUnique<ScaffoldingCallHandlerUniffiUniffiRondpointFnMethodOptionneurSinonU16Dec>();
     }
-    case 166: {
+    case 167: {
       return MakeUnique<ScaffoldingCallHandlerUniffiUniffiRondpointFnMethodOptionneurSinonU16Hex>();
     }
-    case 167: {
+    case 168: {
       return MakeUnique<ScaffoldingCallHandlerUniffiUniffiRondpointFnMethodOptionneurSinonU32Dec>();
     }
-    case 168: {
+    case 169: {
       return MakeUnique<ScaffoldingCallHandlerUniffiUniffiRondpointFnMethodOptionneurSinonU32Hex>();
     }
-    case 169: {
+    case 170: {
       return MakeUnique<ScaffoldingCallHandlerUniffiUniffiRondpointFnMethodOptionneurSinonU32Oct>();
     }
-    case 170: {
+    case 171: {
       return MakeUnique<ScaffoldingCallHandlerUniffiUniffiRondpointFnMethodOptionneurSinonU64Dec>();
     }
-    case 171: {
+    case 172: {
       return MakeUnique<ScaffoldingCallHandlerUniffiUniffiRondpointFnMethodOptionneurSinonU64Hex>();
     }
-    case 172: {
+    case 173: {
       return MakeUnique<ScaffoldingCallHandlerUniffiUniffiRondpointFnMethodOptionneurSinonU8Dec>();
     }
-    case 173: {
+    case 174: {
       return MakeUnique<ScaffoldingCallHandlerUniffiUniffiRondpointFnMethodOptionneurSinonU8Hex>();
     }
-    case 174: {
+    case 175: {
       return MakeUnique<ScaffoldingCallHandlerUniffiUniffiRondpointFnMethodOptionneurSinonZero>();
     }
-    case 175: {
+    case 176: {
       return MakeUnique<ScaffoldingCallHandlerUniffiUniffiRondpointFnConstructorOptionneurNew>();
     }
-    case 176: {
+    case 177: {
       return MakeUnique<ScaffoldingCallHandlerUniffiUniffiRondpointFnMethodRetourneurIdentiqueBoolean>();
     }
-    case 177: {
+    case 178: {
       return MakeUnique<ScaffoldingCallHandlerUniffiUniffiRondpointFnMethodRetourneurIdentiqueDouble>();
     }
-    case 178: {
+    case 179: {
       return MakeUnique<ScaffoldingCallHandlerUniffiUniffiRondpointFnMethodRetourneurIdentiqueFloat>();
     }
-    case 179: {
+    case 180: {
       return MakeUnique<ScaffoldingCallHandlerUniffiUniffiRondpointFnMethodRetourneurIdentiqueI16>();
     }
-    case 180: {
+    case 181: {
       return MakeUnique<ScaffoldingCallHandlerUniffiUniffiRondpointFnMethodRetourneurIdentiqueI32>();
     }
-    case 181: {
+    case 182: {
       return MakeUnique<ScaffoldingCallHandlerUniffiUniffiRondpointFnMethodRetourneurIdentiqueI64>();
     }
-    case 182: {
+    case 183: {
       return MakeUnique<ScaffoldingCallHandlerUniffiUniffiRondpointFnMethodRetourneurIdentiqueI8>();
     }
-    case 183: {
+    case 184: {
       return MakeUnique<ScaffoldingCallHandlerUniffiUniffiRondpointFnMethodRetourneurIdentiqueNombres>();
     }
-    case 184: {
+    case 185: {
       return MakeUnique<ScaffoldingCallHandlerUniffiUniffiRondpointFnMethodRetourneurIdentiqueNombresSignes>();
     }
-    case 185: {
+    case 186: {
       return MakeUnique<ScaffoldingCallHandlerUniffiUniffiRondpointFnMethodRetourneurIdentiqueOptionneurDictionnaire>();
     }
-    case 186: {
+    case 187: {
       return MakeUnique<ScaffoldingCallHandlerUniffiUniffiRondpointFnMethodRetourneurIdentiqueString>();
     }
-    case 187: {
+    case 188: {
       return MakeUnique<ScaffoldingCallHandlerUniffiUniffiRondpointFnMethodRetourneurIdentiqueU16>();
     }
-    case 188: {
+    case 189: {
       return MakeUnique<ScaffoldingCallHandlerUniffiUniffiRondpointFnMethodRetourneurIdentiqueU32>();
     }
-    case 189: {
+    case 190: {
       return MakeUnique<ScaffoldingCallHandlerUniffiUniffiRondpointFnMethodRetourneurIdentiqueU64>();
     }
-    case 190: {
+    case 191: {
       return MakeUnique<ScaffoldingCallHandlerUniffiUniffiRondpointFnMethodRetourneurIdentiqueU8>();
     }
-    case 191: {
+    case 192: {
       return MakeUnique<ScaffoldingCallHandlerUniffiUniffiRondpointFnConstructorRetourneurNew>();
     }
-    case 192: {
+    case 193: {
       return MakeUnique<ScaffoldingCallHandlerUniffiUniffiRondpointFnMethodStringifierToStringBoolean>();
     }
-    case 193: {
+    case 194: {
       return MakeUnique<ScaffoldingCallHandlerUniffiUniffiRondpointFnMethodStringifierToStringDouble>();
     }
-    case 194: {
+    case 195: {
       return MakeUnique<ScaffoldingCallHandlerUniffiUniffiRondpointFnMethodStringifierToStringFloat>();
     }
-    case 195: {
+    case 196: {
       return MakeUnique<ScaffoldingCallHandlerUniffiUniffiRondpointFnMethodStringifierToStringI16>();
     }
-    case 196: {
+    case 197: {
       return MakeUnique<ScaffoldingCallHandlerUniffiUniffiRondpointFnMethodStringifierToStringI32>();
     }
-    case 197: {
+    case 198: {
       return MakeUnique<ScaffoldingCallHandlerUniffiUniffiRondpointFnMethodStringifierToStringI64>();
     }
-    case 198: {
+    case 199: {
       return MakeUnique<ScaffoldingCallHandlerUniffiUniffiRondpointFnMethodStringifierToStringI8>();
     }
-    case 199: {
+    case 200: {
       return MakeUnique<ScaffoldingCallHandlerUniffiUniffiRondpointFnMethodStringifierToStringU16>();
     }
-    case 200: {
+    case 201: {
       return MakeUnique<ScaffoldingCallHandlerUniffiUniffiRondpointFnMethodStringifierToStringU32>();
     }
-    case 201: {
+    case 202: {
       return MakeUnique<ScaffoldingCallHandlerUniffiUniffiRondpointFnMethodStringifierToStringU64>();
     }
-    case 202: {
+    case 203: {
       return MakeUnique<ScaffoldingCallHandlerUniffiUniffiRondpointFnMethodStringifierToStringU8>();
     }
-    case 203: {
+    case 204: {
       return MakeUnique<ScaffoldingCallHandlerUniffiUniffiRondpointFnMethodStringifierWellKnownString>();
     }
-    case 204: {
+    case 205: {
       return MakeUnique<ScaffoldingCallHandlerUniffiUniffiRondpointFnConstructorStringifierNew>();
     }
-    case 205: {
+    case 206: {
       return MakeUnique<ScaffoldingCallHandlerUniffiUniffiSpritesFnFuncTranslate>();
     }
-    case 206: {
+    case 207: {
       return MakeUnique<ScaffoldingCallHandlerUniffiUniffiSpritesFnMethodSpriteGetPosition>();
     }
-    case 207: {
+    case 208: {
       return MakeUnique<ScaffoldingCallHandlerUniffiUniffiSpritesFnMethodSpriteMoveBy>();
     }
-    case 208: {
+    case 209: {
       return MakeUnique<ScaffoldingCallHandlerUniffiUniffiSpritesFnMethodSpriteMoveTo>();
     }
-    case 209: {
+    case 210: {
       return MakeUnique<ScaffoldingCallHandlerUniffiUniffiSpritesFnConstructorSpriteNew>();
     }
-    case 210: {
+    case 211: {
       return MakeUnique<ScaffoldingCallHandlerUniffiUniffiSpritesFnConstructorSpriteNewRelativeTo>();
     }
-    case 211: {
+    case 212: {
       return MakeUnique<ScaffoldingCallHandlerUniffiUniffiTodolistFnFuncCreateEntryWith>();
     }
-    case 212: {
+    case 213: {
       return MakeUnique<ScaffoldingCallHandlerUniffiUniffiTodolistFnFuncGetDefaultList>();
     }
-    case 213: {
+    case 214: {
       return MakeUnique<ScaffoldingCallHandlerUniffiUniffiTodolistFnFuncSetDefaultList>();
     }
-    case 214: {
+    case 215: {
       return MakeUnique<ScaffoldingCallHandlerUniffiUniffiTodolistFnMethodTodolistAddEntries>();
     }
-    case 215: {
+    case 216: {
       return MakeUnique<ScaffoldingCallHandlerUniffiUniffiTodolistFnMethodTodolistAddEntry>();
     }
-    case 216: {
+    case 217: {
       return MakeUnique<ScaffoldingCallHandlerUniffiUniffiTodolistFnMethodTodolistAddItem>();
     }
-    case 217: {
+    case 218: {
       return MakeUnique<ScaffoldingCallHandlerUniffiUniffiTodolistFnMethodTodolistAddItems>();
     }
-    case 218: {
+    case 219: {
       return MakeUnique<ScaffoldingCallHandlerUniffiUniffiTodolistFnMethodTodolistClearItem>();
     }
-    case 219: {
+    case 220: {
       return MakeUnique<ScaffoldingCallHandlerUniffiUniffiTodolistFnMethodTodolistGetEntries>();
     }
-    case 220: {
+    case 221: {
       return MakeUnique<ScaffoldingCallHandlerUniffiUniffiTodolistFnMethodTodolistGetFirst>();
     }
-    case 221: {
+    case 222: {
       return MakeUnique<ScaffoldingCallHandlerUniffiUniffiTodolistFnMethodTodolistGetItems>();
     }
-    case 222: {
+    case 223: {
       return MakeUnique<ScaffoldingCallHandlerUniffiUniffiTodolistFnMethodTodolistGetLast>();
     }
-    case 223: {
+    case 224: {
       return MakeUnique<ScaffoldingCallHandlerUniffiUniffiTodolistFnMethodTodolistGetLastEntry>();
     }
-    case 224: {
+    case 225: {
       return MakeUnique<ScaffoldingCallHandlerUniffiUniffiTodolistFnMethodTodolistMakeDefault>();
     }
-    case 225: {
+    case 226: {
       return MakeUnique<ScaffoldingCallHandlerUniffiUniffiTodolistFnConstructorTodolistNew>();
     }
-    case 226: {
+    case 227: {
       return MakeUnique<ScaffoldingCallHandlerUniffiUniffiTraitInterfacesFnFuncMakeBuggyCalculator>();
     }
-    case 227: {
+    case 228: {
       return MakeUnique<ScaffoldingCallHandlerUniffiUniffiTraitInterfacesFnFuncMakeCalculator>();
     }
-    case 228: {
+    case 229: {
       return MakeUnique<ScaffoldingCallHandlerUniffiUniffiTraitInterfacesFnMethodCalcAdd>();
     }
 #endif /* MOZ_UNIFFI_FIXTURES */
@@ -12471,52 +12507,52 @@ UniquePtr<UniffiAsyncCallHandler> GetAsyncCallHandler(uint64_t aId) {
 
 
 #ifdef MOZ_UNIFFI_FIXTURES
-    case 115: {
+    case 116: {
       return MakeUnique<ScaffoldingCallHandlerUniffiUniffiFixtureFuturesFnFuncExpensiveComputation>();
     }
-    case 118: {
+    case 119: {
       return MakeUnique<ScaffoldingCallHandlerUniffiUniffiFixtureFuturesFnFuncRoundtripF32>();
     }
-    case 119: {
+    case 120: {
       return MakeUnique<ScaffoldingCallHandlerUniffiUniffiFixtureFuturesFnFuncRoundtripF64>();
     }
-    case 120: {
+    case 121: {
       return MakeUnique<ScaffoldingCallHandlerUniffiUniffiFixtureFuturesFnFuncRoundtripI16>();
     }
-    case 121: {
+    case 122: {
       return MakeUnique<ScaffoldingCallHandlerUniffiUniffiFixtureFuturesFnFuncRoundtripI32>();
     }
-    case 122: {
+    case 123: {
       return MakeUnique<ScaffoldingCallHandlerUniffiUniffiFixtureFuturesFnFuncRoundtripI64>();
     }
-    case 123: {
+    case 124: {
       return MakeUnique<ScaffoldingCallHandlerUniffiUniffiFixtureFuturesFnFuncRoundtripI8>();
     }
-    case 124: {
+    case 125: {
       return MakeUnique<ScaffoldingCallHandlerUniffiUniffiFixtureFuturesFnFuncRoundtripMap>();
     }
-    case 125: {
+    case 126: {
       return MakeUnique<ScaffoldingCallHandlerUniffiUniffiFixtureFuturesFnFuncRoundtripObj>();
     }
-    case 126: {
+    case 127: {
       return MakeUnique<ScaffoldingCallHandlerUniffiUniffiFixtureFuturesFnFuncRoundtripString>();
     }
-    case 127: {
+    case 128: {
       return MakeUnique<ScaffoldingCallHandlerUniffiUniffiFixtureFuturesFnFuncRoundtripU16>();
     }
-    case 128: {
+    case 129: {
       return MakeUnique<ScaffoldingCallHandlerUniffiUniffiFixtureFuturesFnFuncRoundtripU32>();
     }
-    case 129: {
+    case 130: {
       return MakeUnique<ScaffoldingCallHandlerUniffiUniffiFixtureFuturesFnFuncRoundtripU64>();
     }
-    case 130: {
+    case 131: {
       return MakeUnique<ScaffoldingCallHandlerUniffiUniffiFixtureFuturesFnFuncRoundtripU8>();
     }
-    case 131: {
+    case 132: {
       return MakeUnique<ScaffoldingCallHandlerUniffiUniffiFixtureFuturesFnFuncRoundtripVec>();
     }
-    case 133: {
+    case 134: {
       return MakeUnique<ScaffoldingCallHandlerUniffiUniffiFixtureFuturesFnMethodFuturetesterMakeFuture>();
     }
 #endif /* MOZ_UNIFFI_FIXTURES */