diff --git a/.cargo/config.toml.in b/.cargo/config.toml.in index f61deb117a98..40b39ad23671 100644 --- a/.cargo/config.toml.in +++ b/.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=e1b42aa3292a71e788bc0f95fb5ab5fbe533996f"] +[source."git+https://github.com/mozilla/application-services?rev=41e0b8f5679977ff2f551eb60fa9b3288ce1f2d8"] git = "https://github.com/mozilla/application-services" -rev = "e1b42aa3292a71e788bc0f95fb5ab5fbe533996f" +rev = "41e0b8f5679977ff2f551eb60fa9b3288ce1f2d8" replace-with = "vendored-sources" [source."git+https://github.com/mozilla/audioipc?rev=e6f44a2bd1e57d11dfc737632a9e849077632330"] diff --git a/Cargo.lock b/Cargo.lock index 58a3072f01ec..b0d74ebe5644 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1854,7 +1854,7 @@ dependencies = [ [[package]] name = "error-support" version = "0.1.0" -source = "git+https://github.com/mozilla/application-services?rev=e1b42aa3292a71e788bc0f95fb5ab5fbe533996f#e1b42aa3292a71e788bc0f95fb5ab5fbe533996f" +source = "git+https://github.com/mozilla/application-services?rev=41e0b8f5679977ff2f551eb60fa9b3288ce1f2d8#41e0b8f5679977ff2f551eb60fa9b3288ce1f2d8" dependencies = [ "error-support-macros", "lazy_static", @@ -1866,7 +1866,7 @@ dependencies = [ [[package]] name = "error-support-macros" version = "0.1.0" -source = "git+https://github.com/mozilla/application-services?rev=e1b42aa3292a71e788bc0f95fb5ab5fbe533996f#e1b42aa3292a71e788bc0f95fb5ab5fbe533996f" +source = "git+https://github.com/mozilla/application-services?rev=41e0b8f5679977ff2f551eb60fa9b3288ce1f2d8#41e0b8f5679977ff2f551eb60fa9b3288ce1f2d8" dependencies = [ "proc-macro2", "quote", @@ -1983,7 +1983,7 @@ dependencies = [ [[package]] name = "firefox-versioning" version = "0.1.0" -source = "git+https://github.com/mozilla/application-services?rev=e1b42aa3292a71e788bc0f95fb5ab5fbe533996f#e1b42aa3292a71e788bc0f95fb5ab5fbe533996f" +source = "git+https://github.com/mozilla/application-services?rev=41e0b8f5679977ff2f551eb60fa9b3288ce1f2d8#41e0b8f5679977ff2f551eb60fa9b3288ce1f2d8" dependencies = [ "serde_json", "thiserror 1.999.999", @@ -3320,7 +3320,7 @@ dependencies = [ [[package]] name = "interrupt-support" version = "0.1.0" -source = "git+https://github.com/mozilla/application-services?rev=e1b42aa3292a71e788bc0f95fb5ab5fbe533996f#e1b42aa3292a71e788bc0f95fb5ab5fbe533996f" +source = "git+https://github.com/mozilla/application-services?rev=41e0b8f5679977ff2f551eb60fa9b3288ce1f2d8#41e0b8f5679977ff2f551eb60fa9b3288ce1f2d8" dependencies = [ "lazy_static", "parking_lot", @@ -5028,7 +5028,7 @@ checksum = "d01a5bd0424d00070b0098dd17ebca6f961a959dead1dbcbbbc1d1cd8d3deeba" [[package]] name = "payload-support" version = "0.1.0" -source = "git+https://github.com/mozilla/application-services?rev=e1b42aa3292a71e788bc0f95fb5ab5fbe533996f#e1b42aa3292a71e788bc0f95fb5ab5fbe533996f" +source = "git+https://github.com/mozilla/application-services?rev=41e0b8f5679977ff2f551eb60fa9b3288ce1f2d8#41e0b8f5679977ff2f551eb60fa9b3288ce1f2d8" dependencies = [ "serde", "serde_derive", @@ -5531,7 +5531,7 @@ checksum = "dbb5fb1acd8a1a18b3dd5be62d25485eb770e05afb408a9627d14d451bae12da" [[package]] name = "relevancy" version = "0.1.0" -source = "git+https://github.com/mozilla/application-services?rev=e1b42aa3292a71e788bc0f95fb5ab5fbe533996f#e1b42aa3292a71e788bc0f95fb5ab5fbe533996f" +source = "git+https://github.com/mozilla/application-services?rev=41e0b8f5679977ff2f551eb60fa9b3288ce1f2d8#41e0b8f5679977ff2f551eb60fa9b3288ce1f2d8" dependencies = [ "anyhow", "base64 0.21.999", @@ -5556,7 +5556,7 @@ dependencies = [ [[package]] name = "remote_settings" version = "0.1.0" -source = "git+https://github.com/mozilla/application-services?rev=e1b42aa3292a71e788bc0f95fb5ab5fbe533996f#e1b42aa3292a71e788bc0f95fb5ab5fbe533996f" +source = "git+https://github.com/mozilla/application-services?rev=41e0b8f5679977ff2f551eb60fa9b3288ce1f2d8#41e0b8f5679977ff2f551eb60fa9b3288ce1f2d8" dependencies = [ "anyhow", "camino", @@ -5904,7 +5904,7 @@ dependencies = [ [[package]] name = "search" version = "0.1.0" -source = "git+https://github.com/mozilla/application-services?rev=e1b42aa3292a71e788bc0f95fb5ab5fbe533996f#e1b42aa3292a71e788bc0f95fb5ab5fbe533996f" +source = "git+https://github.com/mozilla/application-services?rev=41e0b8f5679977ff2f551eb60fa9b3288ce1f2d8#41e0b8f5679977ff2f551eb60fa9b3288ce1f2d8" 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=e1b42aa3292a71e788bc0f95fb5ab5fbe533996f#e1b42aa3292a71e788bc0f95fb5ab5fbe533996f" +source = "git+https://github.com/mozilla/application-services?rev=41e0b8f5679977ff2f551eb60fa9b3288ce1f2d8#41e0b8f5679977ff2f551eb60fa9b3288ce1f2d8" 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=e1b42aa3292a71e788bc0f95fb5ab5fbe533996f#e1b42aa3292a71e788bc0f95fb5ab5fbe533996f" +source = "git+https://github.com/mozilla/application-services?rev=41e0b8f5679977ff2f551eb60fa9b3288ce1f2d8#41e0b8f5679977ff2f551eb60fa9b3288ce1f2d8" 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=e1b42aa3292a71e788bc0f95fb5ab5fbe533996f#e1b42aa3292a71e788bc0f95fb5ab5fbe533996f" +source = "git+https://github.com/mozilla/application-services?rev=41e0b8f5679977ff2f551eb60fa9b3288ce1f2d8#41e0b8f5679977ff2f551eb60fa9b3288ce1f2d8" 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=e1b42aa3292a71e788bc0f95fb5ab5fbe533996f#e1b42aa3292a71e788bc0f95fb5ab5fbe533996f" +source = "git+https://github.com/mozilla/application-services?rev=41e0b8f5679977ff2f551eb60fa9b3288ce1f2d8#41e0b8f5679977ff2f551eb60fa9b3288ce1f2d8" 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=e1b42aa3292a71e788bc0f95fb5ab5fbe533996f#e1b42aa3292a71e788bc0f95fb5ab5fbe533996f" +source = "git+https://github.com/mozilla/application-services?rev=41e0b8f5679977ff2f551eb60fa9b3288ce1f2d8#41e0b8f5679977ff2f551eb60fa9b3288ce1f2d8" 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=e1b42aa3292a71e788bc0f95fb5ab5fbe533996f#e1b42aa3292a71e788bc0f95fb5ab5fbe533996f" +source = "git+https://github.com/mozilla/application-services?rev=41e0b8f5679977ff2f551eb60fa9b3288ce1f2d8#41e0b8f5679977ff2f551eb60fa9b3288ce1f2d8" 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=e1b42aa3292a71e788bc0f95fb5ab5fbe533996f#e1b42aa3292a71e788bc0f95fb5ab5fbe533996f" +source = "git+https://github.com/mozilla/application-services?rev=41e0b8f5679977ff2f551eb60fa9b3288ce1f2d8#41e0b8f5679977ff2f551eb60fa9b3288ce1f2d8" 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=e1b42aa3292a71e788bc0f95fb5ab5fbe533996f#e1b42aa3292a71e788bc0f95fb5ab5fbe533996f" +source = "git+https://github.com/mozilla/application-services?rev=41e0b8f5679977ff2f551eb60fa9b3288ce1f2d8#41e0b8f5679977ff2f551eb60fa9b3288ce1f2d8" dependencies = [ "anyhow", "error-support", diff --git a/Cargo.toml b/Cargo.toml index 45126d563dad..c7cad879b12d 100644 --- a/Cargo.toml +++ b/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 = "e1b42aa3292a71e788bc0f95fb5ab5fbe533996f" } -relevancy = { git = "https://github.com/mozilla/application-services", rev = "e1b42aa3292a71e788bc0f95fb5ab5fbe533996f" } -search = { git = "https://github.com/mozilla/application-services", rev = "e1b42aa3292a71e788bc0f95fb5ab5fbe533996f" } -sql-support = { git = "https://github.com/mozilla/application-services", rev = "e1b42aa3292a71e788bc0f95fb5ab5fbe533996f" } -suggest = { git = "https://github.com/mozilla/application-services", rev = "e1b42aa3292a71e788bc0f95fb5ab5fbe533996f" } -sync15 = { git = "https://github.com/mozilla/application-services", rev = "e1b42aa3292a71e788bc0f95fb5ab5fbe533996f" } -tabs = { git = "https://github.com/mozilla/application-services", rev = "e1b42aa3292a71e788bc0f95fb5ab5fbe533996f" } -viaduct = { git = "https://github.com/mozilla/application-services", rev = "e1b42aa3292a71e788bc0f95fb5ab5fbe533996f" } -webext-storage = { git = "https://github.com/mozilla/application-services", rev = "e1b42aa3292a71e788bc0f95fb5ab5fbe533996f" } +interrupt-support = { git = "https://github.com/mozilla/application-services", rev = "41e0b8f5679977ff2f551eb60fa9b3288ce1f2d8" } +relevancy = { git = "https://github.com/mozilla/application-services", rev = "41e0b8f5679977ff2f551eb60fa9b3288ce1f2d8" } +search = { git = "https://github.com/mozilla/application-services", rev = "41e0b8f5679977ff2f551eb60fa9b3288ce1f2d8" } +sql-support = { git = "https://github.com/mozilla/application-services", rev = "41e0b8f5679977ff2f551eb60fa9b3288ce1f2d8" } +suggest = { git = "https://github.com/mozilla/application-services", rev = "41e0b8f5679977ff2f551eb60fa9b3288ce1f2d8" } +sync15 = { git = "https://github.com/mozilla/application-services", rev = "41e0b8f5679977ff2f551eb60fa9b3288ce1f2d8" } +tabs = { git = "https://github.com/mozilla/application-services", rev = "41e0b8f5679977ff2f551eb60fa9b3288ce1f2d8" } +viaduct = { git = "https://github.com/mozilla/application-services", rev = "41e0b8f5679977ff2f551eb60fa9b3288ce1f2d8" } +webext-storage = { git = "https://github.com/mozilla/application-services", rev = "41e0b8f5679977ff2f551eb60fa9b3288ce1f2d8" } allocator-api2 = { path = "third_party/rust/allocator-api2" } diff --git a/third_party/rust/suggest/.cargo-checksum.json b/third_party/rust/suggest/.cargo-checksum.json index 138fca2f603f..256ca90ccf5d 100644 --- a/third_party/rust/suggest/.cargo-checksum.json +++ b/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":"566e62ab951c0a372450ffb8842ded85a0147242cf191254d895dc0fe320a58c","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":"51dfe27c01884dfbd3bb7c868c01505dd69cf119d9bb37ddb653f77ead170956","src/store.rs":"d127c58e26a3e380e815e11e6660feb58df335ab40426aa051902a6fec659b5a","src/suggestion.rs":"e74abdc1eace082ad7ed8762bcee25b1943ec3d04d7e644959c5737b42732660","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} \ No newline at end of file +{"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} \ No newline at end of file diff --git a/third_party/rust/suggest/src/db.rs b/third_party/rust/suggest/src/db.rs index 427473567d96..f643ce5dd931 100644 --- a/third_party/rust/suggest/src/db.rs +++ b/third_party/rust/suggest/src/db.rs @@ -1271,12 +1271,12 @@ impl<'a> SuggestDao<'a> { Ok(()) } - pub fn insert_dismissal(&self, url: &str) -> Result<()> { + pub fn insert_dismissal(&self, key: &str) -> Result<()> { self.conn.execute( "INSERT OR IGNORE INTO dismissed_suggestions(url) VALUES(:url)", named_params! { - ":url": url, + ":url": key, }, )?; Ok(()) @@ -1287,6 +1287,21 @@ impl<'a> SuggestDao<'a> { Ok(()) } + pub fn has_dismissal(&self, key: &str) -> Result { + Ok(self.conn.exists( + "SELECT 1 FROM dismissed_suggestions WHERE url = :url", + named_params! { + ":url": key, + }, + )?) + } + + pub fn any_dismissals(&self) -> Result { + Ok(self + .conn + .exists("SELECT 1 FROM dismissed_suggestions LIMIT 1", ())?) + } + /// Deletes all suggestions associated with a Remote Settings record from /// the database. pub fn drop_suggestions(&mut self, record_id: &SuggestRecordId) -> Result<()> { diff --git a/third_party/rust/suggest/src/schema.rs b/third_party/rust/suggest/src/schema.rs index db00c8581695..c7287ebf3385 100644 --- a/third_party/rust/suggest/src/schema.rs +++ b/third_party/rust/suggest/src/schema.rs @@ -23,7 +23,7 @@ use sql_support::{ /// `clear_database()` by adding their names to `conditional_tables`, unless /// they are cleared via a deletion trigger or there's some other good /// reason not to do so. -pub const VERSION: u32 = 35; +pub const VERSION: u32 = 36; /// The current Suggest database schema. pub const SQL: &str = " @@ -645,6 +645,10 @@ impl ConnectionInitializer for SuggestConnectionInitializer<'_> { )?; Ok(()) } + 35 => { + // The commit that added this migration was reverted. + Ok(()) + } _ => Err(open_database::Error::IncompatibleVersion(version)), } } diff --git a/third_party/rust/suggest/src/store.rs b/third_party/rust/suggest/src/store.rs index 951e882988e9..0e4c8c535251 100644 --- a/third_party/rust/suggest/src/store.rs +++ b/third_party/rust/suggest/src/store.rs @@ -134,7 +134,7 @@ pub enum InterruptKind { /// Interrupt read operations like [SuggestStore::query] Read, /// Interrupt write operations. This mostly means [SuggestStore::ingest], but - /// [SuggestStore::dismiss_suggestion] may also be interrupted. + /// other operations may also be interrupted. Write, /// Interrupt both read and write operations, ReadWrite, @@ -204,12 +204,27 @@ impl SuggestStore { } /// Dismiss a suggestion. + /// + /// Dismissed suggestions cannot be fetched again. #[handle_error(Error)] - pub fn dismiss(&self, suggestion: &Suggestion) -> SuggestApiResult<()> { - self.inner.dismiss(suggestion) + pub fn dismiss_by_suggestion(&self, suggestion: &Suggestion) -> SuggestApiResult<()> { + self.inner.dismiss_by_suggestion(suggestion) } - /// Deprecated, use [SuggestStore::dismiss] instead. + /// Dismiss a suggestion by its dismissal key. + /// + /// Dismissed suggestions cannot be fetched again. + /// + /// Prefer [SuggestStore::dismiss_by_suggestion] if you have a + /// `crate::Suggestion`. This method is intended for cases where a + /// suggestion originates outside this component. + #[handle_error(Error)] + pub fn dismiss_by_key(&self, key: &str) -> SuggestApiResult<()> { + self.inner.dismiss_by_key(key) + } + + /// Deprecated, use [SuggestStore::dismiss_by_suggestion] or + /// [SuggestStore::dismiss_by_key] instead. /// /// Dismiss a suggestion /// @@ -225,6 +240,33 @@ impl SuggestStore { self.inner.clear_dismissed_suggestions() } + /// Return whether a suggestion has been dismissed. + /// + /// [SuggestStore::query] will never return dismissed suggestions, so + /// normally you never need to know whether a `Suggestion` has been + /// dismissed, but this method can be used to do so. + #[handle_error(Error)] + pub fn is_dismissed_by_suggestion(&self, suggestion: &Suggestion) -> SuggestApiResult { + self.inner.is_dismissed_by_suggestion(suggestion) + } + + /// Return whether a suggestion has been dismissed given its dismissal key. + /// + /// [SuggestStore::query] will never return dismissed suggestions, so + /// normally you never need to know whether a suggestion has been dismissed. + /// This method is intended for cases where a dismissal key originates + /// outside this component. + #[handle_error(Error)] + pub fn is_dismissed_by_key(&self, key: &str) -> SuggestApiResult { + self.inner.is_dismissed_by_key(key) + } + + /// Return whether any suggestions have been dismissed. + #[handle_error(Error)] + pub fn any_dismissed_suggestions(&self) -> SuggestApiResult { + self.inner.any_dismissed_suggestions() + } + /// Interrupts any ongoing queries. /// /// This should be called when the user types new input into the address @@ -448,15 +490,17 @@ impl SuggestStoreInner { }) } - fn dismiss(&self, suggestion: &Suggestion) -> Result<()> { - if let Some(dismissal_key) = suggestion.dismissal_key() { - self.dbs()? - .writer - .write(|dao| dao.insert_dismissal(dismissal_key))?; + fn dismiss_by_suggestion(&self, suggestion: &Suggestion) -> Result<()> { + if let Some(key) = suggestion.dismissal_key() { + self.dismiss_by_key(key)?; } Ok(()) } + fn dismiss_by_key(&self, key: &str) -> Result<()> { + self.dbs()?.writer.write(|dao| dao.insert_dismissal(key)) + } + fn dismiss_suggestion(&self, suggestion_url: String) -> Result<()> { self.dbs()? .writer @@ -468,6 +512,22 @@ impl SuggestStoreInner { Ok(()) } + fn is_dismissed_by_suggestion(&self, suggestion: &Suggestion) -> Result { + if let Some(key) = suggestion.dismissal_key() { + self.dbs()?.reader.read(|dao| dao.has_dismissal(key)) + } else { + Ok(false) + } + } + + fn is_dismissed_by_key(&self, key: &str) -> Result { + self.dbs()?.reader.read(|dao| dao.has_dismissal(key)) + } + + fn any_dismissed_suggestions(&self) -> Result { + self.dbs()?.reader.read(|dao| dao.any_dismissals()) + } + fn interrupt(&self, kind: Option) { if let Some(dbs) = self.dbs.get() { // Only interrupt if the databases are already open. @@ -1174,8 +1234,12 @@ pub(crate) mod tests { assert_eq!(suggestions[0].dismissal_key(), expected_dismissal_key); // Dismiss the suggestion. - store.inner.dismiss(&suggestions[0])?; + let dismissal_key = suggestions[0].dismissal_key().unwrap(); + store.inner.dismiss_by_suggestion(&suggestions[0])?; assert_eq!(store.fetch_suggestions(SuggestionQuery::amp(query)), vec![]); + assert!(store.inner.is_dismissed_by_suggestion(&suggestions[0])?); + assert!(store.inner.is_dismissed_by_key(dismissal_key)?); + assert!(store.inner.any_dismissed_suggestions()?); // Clear dismissals and fetch again. store.inner.clear_dismissed_suggestions()?; @@ -1183,19 +1247,44 @@ pub(crate) mod tests { store.fetch_suggestions(SuggestionQuery::amp(query)), vec![expected_suggestion.clone()] ); + assert!(!store.inner.is_dismissed_by_suggestion(&suggestions[0])?); + assert!(!store.inner.is_dismissed_by_key(dismissal_key)?); + assert!(!store.inner.any_dismissed_suggestions()?); - // Dismiss the suggestion by its raw URL using the deprecated API. - store - .inner - .dismiss_suggestion(expected_suggestion.raw_url().unwrap().to_string())?; + // Dismiss the suggestion by its dismissal key. + store.inner.dismiss_by_key(dismissal_key)?; assert_eq!(store.fetch_suggestions(SuggestionQuery::amp(query)), vec![]); + assert!(store.inner.is_dismissed_by_suggestion(&suggestions[0])?); + assert!(store.inner.is_dismissed_by_key(dismissal_key)?); + assert!(store.inner.any_dismissed_suggestions()?); // Clear dismissals and fetch again. store.inner.clear_dismissed_suggestions()?; assert_eq!( store.fetch_suggestions(SuggestionQuery::amp(query)), - vec![expected_suggestion] + vec![expected_suggestion.clone()] ); + assert!(!store.inner.is_dismissed_by_suggestion(&suggestions[0])?); + assert!(!store.inner.is_dismissed_by_key(dismissal_key)?); + assert!(!store.inner.any_dismissed_suggestions()?); + + // Dismiss the suggestion by its raw URL using the deprecated API. + let raw_url = expected_suggestion.raw_url().unwrap(); + store.inner.dismiss_suggestion(raw_url.to_string())?; + assert_eq!(store.fetch_suggestions(SuggestionQuery::amp(query)), vec![]); + assert!(store.inner.is_dismissed_by_key(raw_url)?); + assert!(store.inner.any_dismissed_suggestions()?); + + // Clear dismissals and fetch again. + store.inner.clear_dismissed_suggestions()?; + assert_eq!( + store.fetch_suggestions(SuggestionQuery::amp(query)), + vec![expected_suggestion.clone()] + ); + assert!(!store.inner.is_dismissed_by_suggestion(&suggestions[0])?); + assert!(!store.inner.is_dismissed_by_key(dismissal_key)?); + assert!(!store.inner.is_dismissed_by_key(raw_url)?); + assert!(!store.inner.any_dismissed_suggestions()?); } Ok(()) @@ -2452,19 +2541,32 @@ pub(crate) mod tests { let results = store.fetch_suggestions(query.clone()); assert_eq!(results.len(), 5); - for result in results { - store - .inner - .dismiss_suggestion(result.raw_url().unwrap().to_string())?; + assert!(!store.inner.any_dismissed_suggestions()?); + + for result in &results { + let dismissal_key = result.dismissal_key().unwrap(); + assert!(!store.inner.is_dismissed_by_suggestion(result)?); + assert!(!store.inner.is_dismissed_by_key(dismissal_key)?); + store.inner.dismiss_by_suggestion(result)?; + assert!(store.inner.is_dismissed_by_suggestion(result)?); + assert!(store.inner.is_dismissed_by_key(dismissal_key)?); + assert!(store.inner.any_dismissed_suggestions()?); } // After dismissing the suggestions, the next query shouldn't return them - assert_eq!(store.fetch_suggestions(query.clone()).len(), 0); + assert_eq!(store.fetch_suggestions(query.clone()), vec![]); // Clearing the dismissals should cause them to be returned again store.inner.clear_dismissed_suggestions()?; assert_eq!(store.fetch_suggestions(query.clone()).len(), 5); + for result in &results { + let dismissal_key = result.dismissal_key().unwrap(); + assert!(!store.inner.is_dismissed_by_suggestion(result)?); + assert!(!store.inner.is_dismissed_by_key(dismissal_key)?); + } + assert!(!store.inner.any_dismissed_suggestions()?); + Ok(()) } @@ -3697,8 +3799,9 @@ pub(crate) mod tests { }); // Make sure the suggestions are initially fetchable. + let suggestions = store.fetch_suggestions(SuggestionQuery::dynamic("aaa", &["aaa"])); assert_eq!( - store.fetch_suggestions(SuggestionQuery::dynamic("aaa", &["aaa"])), + suggestions, vec![ Suggestion::Dynamic { suggestion_type: "aaa".to_string(), @@ -3722,7 +3825,8 @@ pub(crate) mod tests { ); // Dismiss the first suggestion. - store.inner.dismiss_suggestion("dk0".to_string())?; + assert_eq!(suggestions[0].dismissal_key(), Some("dk0")); + store.inner.dismiss_by_suggestion(&suggestions[0])?; assert_eq!( store.fetch_suggestions(SuggestionQuery::dynamic("aaa", &["aaa"])), vec![ @@ -3742,7 +3846,8 @@ pub(crate) mod tests { ); // Dismiss the second suggestion. - store.inner.dismiss_suggestion("dk1".to_string())?; + assert_eq!(suggestions[1].dismissal_key(), Some("dk1")); + store.inner.dismiss_by_suggestion(&suggestions[1])?; assert_eq!( store.fetch_suggestions(SuggestionQuery::dynamic("aaa", &["aaa"])), vec![Suggestion::Dynamic { diff --git a/third_party/rust/suggest/src/suggestion.rs b/third_party/rust/suggest/src/suggestion.rs index cb8452625bad..3d96d01b4df5 100644 --- a/third_party/rust/suggest/src/suggestion.rs +++ b/third_party/rust/suggest/src/suggestion.rs @@ -146,14 +146,14 @@ impl Suggestion { self.raw_url() } } + Self::Dynamic { dismissal_key, .. } => dismissal_key.as_deref(), Self::Pocket { .. } | Self::Wikipedia { .. } | Self::Amo { .. } | Self::Yelp { .. } | Self::Mdn { .. } | Self::Weather { .. } - | Self::Fakespot { .. } - | Self::Dynamic { .. } => self.raw_url(), + | Self::Fakespot { .. } => self.raw_url(), } } diff --git a/toolkit/components/uniffi-bindgen-gecko-js/components/generated/RustSuggest.sys.mjs b/toolkit/components/uniffi-bindgen-gecko-js/components/generated/RustSuggest.sys.mjs index 5d762fc33e97..df384ec3f8ee 100644 --- a/toolkit/components/uniffi-bindgen-gecko-js/components/generated/RustSuggest.sys.mjs +++ b/toolkit/components/uniffi-bindgen-gecko-js/components/generated/RustSuggest.sys.mjs @@ -551,13 +551,33 @@ export class SuggestStore { throw e; } return UniFFIScaffolding.callSync( - 44, // suggest:uniffi_suggest_fn_constructor_suggeststore_new + 48, // suggest:uniffi_suggest_fn_constructor_suggeststore_new FfiConverterString.lower(path), FfiConverterTypeRemoteSettingsService.lower(remoteSettingsService), ) } return handleRustResult(functionCall(), liftResult, liftError);} + /** + * Return whether any suggestions have been dismissed. + * @returns {Boolean} + */ + anyDismissedSuggestions() { + const liftResult = (result) => FfiConverterBool.lift(result); + const liftError = (data) => FfiConverterTypeSuggestApiError.lift(data); + const functionCall = () => { + return UniFFIScaffolding.callAsyncWrapper( + 33, // suggest:uniffi_suggest_fn_method_suggeststore_any_dismissed_suggestions + FfiConverterTypeSuggestStore.lower(this), + ) + } + try { + return functionCall().then((result) => handleRustResult(result, liftResult, liftError)); + } catch (error) { + return Promise.reject(error) + } + } + /** * Removes all content from the database. */ @@ -566,7 +586,7 @@ export class SuggestStore { const liftError = (data) => FfiConverterTypeSuggestApiError.lift(data); const functionCall = () => { return UniFFIScaffolding.callAsyncWrapper( - 33, // suggest:uniffi_suggest_fn_method_suggeststore_clear + 34, // suggest:uniffi_suggest_fn_method_suggeststore_clear FfiConverterTypeSuggestStore.lower(this), ) } @@ -585,7 +605,7 @@ export class SuggestStore { const liftError = (data) => FfiConverterTypeSuggestApiError.lift(data); const functionCall = () => { return UniFFIScaffolding.callAsyncWrapper( - 34, // suggest:uniffi_suggest_fn_method_suggeststore_clear_dismissed_suggestions + 35, // suggest:uniffi_suggest_fn_method_suggeststore_clear_dismissed_suggestions FfiConverterTypeSuggestStore.lower(this), ) } @@ -597,9 +617,45 @@ export class SuggestStore { } /** - * Dismiss a suggestion. + * Dismiss a suggestion by its dismissal key. + * + * Dismissed suggestions cannot be fetched again. + * + * Prefer [SuggestStore::dismiss_by_suggestion] if you have a + * `crate::Suggestion`. This method is intended for cases where a + * suggestion originates outside this component. */ - dismiss(suggestion) { + dismissByKey(key) { + const liftResult = (result) => undefined; + const liftError = (data) => FfiConverterTypeSuggestApiError.lift(data); + const functionCall = () => { + try { + FfiConverterString.checkType(key) + } catch (e) { + if (e instanceof UniFFITypeError) { + e.addItemDescriptionPart("key"); + } + throw e; + } + return UniFFIScaffolding.callAsyncWrapper( + 36, // suggest:uniffi_suggest_fn_method_suggeststore_dismiss_by_key + FfiConverterTypeSuggestStore.lower(this), + FfiConverterString.lower(key), + ) + } + try { + return functionCall().then((result) => handleRustResult(result, liftResult, liftError)); + } catch (error) { + return Promise.reject(error) + } + } + + /** + * Dismiss a suggestion. + * + * Dismissed suggestions cannot be fetched again. + */ + dismissBySuggestion(suggestion) { const liftResult = (result) => undefined; const liftError = (data) => FfiConverterTypeSuggestApiError.lift(data); const functionCall = () => { @@ -612,7 +668,7 @@ export class SuggestStore { throw e; } return UniFFIScaffolding.callAsyncWrapper( - 35, // suggest:uniffi_suggest_fn_method_suggeststore_dismiss + 37, // suggest:uniffi_suggest_fn_method_suggeststore_dismiss_by_suggestion FfiConverterTypeSuggestStore.lower(this), FfiConverterTypeSuggestion.lower(suggestion), ) @@ -625,7 +681,8 @@ export class SuggestStore { } /** - * Deprecated, use [SuggestStore::dismiss] instead. + * Deprecated, use [SuggestStore::dismiss_by_suggestion] or + * [SuggestStore::dismiss_by_key] instead. * * Dismiss a suggestion * @@ -644,7 +701,7 @@ export class SuggestStore { throw e; } return UniFFIScaffolding.callAsyncWrapper( - 36, // suggest:uniffi_suggest_fn_method_suggeststore_dismiss_suggestion + 38, // suggest:uniffi_suggest_fn_method_suggeststore_dismiss_suggestion FfiConverterTypeSuggestStore.lower(this), FfiConverterString.lower(suggestionUrl), ) @@ -719,7 +776,7 @@ export class SuggestStore { throw e; } return UniFFIScaffolding.callAsyncWrapper( - 37, // suggest:uniffi_suggest_fn_method_suggeststore_fetch_geonames + 39, // suggest:uniffi_suggest_fn_method_suggeststore_fetch_geonames FfiConverterTypeSuggestStore.lower(this), FfiConverterString.lower(query), FfiConverterBool.lower(matchNamePrefix), @@ -743,7 +800,7 @@ export class SuggestStore { const liftError = (data) => FfiConverterTypeSuggestApiError.lift(data); const functionCall = () => { return UniFFIScaffolding.callAsyncWrapper( - 38, // suggest:uniffi_suggest_fn_method_suggeststore_fetch_global_config + 40, // suggest:uniffi_suggest_fn_method_suggeststore_fetch_global_config FfiConverterTypeSuggestStore.lower(this), ) } @@ -771,7 +828,7 @@ export class SuggestStore { throw e; } return UniFFIScaffolding.callAsyncWrapper( - 39, // suggest:uniffi_suggest_fn_method_suggeststore_fetch_provider_config + 41, // suggest:uniffi_suggest_fn_method_suggeststore_fetch_provider_config FfiConverterTypeSuggestStore.lower(this), FfiConverterTypeSuggestionProvider.lower(provider), ) @@ -800,7 +857,7 @@ export class SuggestStore { throw e; } return UniFFIScaffolding.callAsyncWrapper( - 40, // suggest:uniffi_suggest_fn_method_suggeststore_ingest + 42, // suggest:uniffi_suggest_fn_method_suggeststore_ingest FfiConverterTypeSuggestStore.lower(this), FfiConverterTypeSuggestIngestionConstraints.lower(constraints), ) @@ -832,7 +889,7 @@ export class SuggestStore { throw e; } return UniFFIScaffolding.callSync( - 41, // suggest:uniffi_suggest_fn_method_suggeststore_interrupt + 43, // suggest:uniffi_suggest_fn_method_suggeststore_interrupt FfiConverterTypeSuggestStore.lower(this), FfiConverterOptionalTypeInterruptKind.lower(kind), ) @@ -840,6 +897,73 @@ export class SuggestStore { return handleRustResult(functionCall(), liftResult, liftError); } + /** + * Return whether a suggestion has been dismissed given its dismissal key. + * + * [SuggestStore::query] will never return dismissed suggestions, so + * normally you never need to know whether a suggestion has been dismissed. + * This method is intended for cases where a dismissal key originates + * outside this component. + * @returns {Boolean} + */ + isDismissedByKey(key) { + const liftResult = (result) => FfiConverterBool.lift(result); + const liftError = (data) => FfiConverterTypeSuggestApiError.lift(data); + const functionCall = () => { + try { + FfiConverterString.checkType(key) + } catch (e) { + if (e instanceof UniFFITypeError) { + e.addItemDescriptionPart("key"); + } + throw e; + } + return UniFFIScaffolding.callAsyncWrapper( + 44, // suggest:uniffi_suggest_fn_method_suggeststore_is_dismissed_by_key + FfiConverterTypeSuggestStore.lower(this), + FfiConverterString.lower(key), + ) + } + try { + return functionCall().then((result) => handleRustResult(result, liftResult, liftError)); + } catch (error) { + return Promise.reject(error) + } + } + + /** + * Return whether a suggestion has been dismissed. + * + * [SuggestStore::query] will never return dismissed suggestions, so + * normally you never need to know whether a `Suggestion` has been + * dismissed, but this method can be used to do so. + * @returns {Boolean} + */ + isDismissedBySuggestion(suggestion) { + const liftResult = (result) => FfiConverterBool.lift(result); + const liftError = (data) => FfiConverterTypeSuggestApiError.lift(data); + const functionCall = () => { + try { + FfiConverterTypeSuggestion.checkType(suggestion) + } catch (e) { + if (e instanceof UniFFITypeError) { + e.addItemDescriptionPart("suggestion"); + } + throw e; + } + return UniFFIScaffolding.callAsyncWrapper( + 45, // suggest:uniffi_suggest_fn_method_suggeststore_is_dismissed_by_suggestion + FfiConverterTypeSuggestStore.lower(this), + FfiConverterTypeSuggestion.lower(suggestion), + ) + } + try { + return functionCall().then((result) => handleRustResult(result, liftResult, liftError)); + } catch (error) { + return Promise.reject(error) + } + } + /** * Queries the database for suggestions. * @returns {Array.} @@ -857,7 +981,7 @@ export class SuggestStore { throw e; } return UniFFIScaffolding.callAsyncWrapper( - 42, // suggest:uniffi_suggest_fn_method_suggeststore_query + 46, // suggest:uniffi_suggest_fn_method_suggeststore_query FfiConverterTypeSuggestStore.lower(this), FfiConverterTypeSuggestionQuery.lower(query), ) @@ -886,7 +1010,7 @@ export class SuggestStore { throw e; } return UniFFIScaffolding.callAsyncWrapper( - 43, // suggest:uniffi_suggest_fn_method_suggeststore_query_with_metrics + 47, // suggest:uniffi_suggest_fn_method_suggeststore_query_with_metrics FfiConverterTypeSuggestStore.lower(this), FfiConverterTypeSuggestionQuery.lower(query), ) @@ -957,7 +1081,7 @@ export class SuggestStoreBuilder { const liftError = null; const functionCall = () => { return UniFFIScaffolding.callSync( - 52, // suggest:uniffi_suggest_fn_constructor_suggeststorebuilder_new + 56, // suggest:uniffi_suggest_fn_constructor_suggeststorebuilder_new ) } return handleRustResult(functionCall(), liftResult, liftError);} @@ -971,7 +1095,7 @@ export class SuggestStoreBuilder { const liftError = (data) => FfiConverterTypeSuggestApiError.lift(data); const functionCall = () => { return UniFFIScaffolding.callSync( - 45, // suggest:uniffi_suggest_fn_method_suggeststorebuilder_build + 49, // suggest:uniffi_suggest_fn_method_suggeststorebuilder_build FfiConverterTypeSuggestStoreBuilder.lower(this), ) } @@ -995,7 +1119,7 @@ export class SuggestStoreBuilder { throw e; } return UniFFIScaffolding.callAsyncWrapper( - 46, // suggest:uniffi_suggest_fn_method_suggeststorebuilder_cache_path + 50, // suggest:uniffi_suggest_fn_method_suggeststorebuilder_cache_path FfiConverterTypeSuggestStoreBuilder.lower(this), FfiConverterString.lower(path), ) @@ -1024,7 +1148,7 @@ export class SuggestStoreBuilder { throw e; } return UniFFIScaffolding.callSync( - 47, // suggest:uniffi_suggest_fn_method_suggeststorebuilder_data_path + 51, // suggest:uniffi_suggest_fn_method_suggeststorebuilder_data_path FfiConverterTypeSuggestStoreBuilder.lower(this), FfiConverterString.lower(path), ) @@ -1061,7 +1185,7 @@ export class SuggestStoreBuilder { throw e; } return UniFFIScaffolding.callSync( - 48, // suggest:uniffi_suggest_fn_method_suggeststorebuilder_load_extension + 52, // suggest:uniffi_suggest_fn_method_suggeststorebuilder_load_extension FfiConverterTypeSuggestStoreBuilder.lower(this), FfiConverterString.lower(library), FfiConverterOptionalstring.lower(entryPoint), @@ -1087,7 +1211,7 @@ export class SuggestStoreBuilder { throw e; } return UniFFIScaffolding.callSync( - 49, // suggest:uniffi_suggest_fn_method_suggeststorebuilder_remote_settings_bucket_name + 53, // suggest:uniffi_suggest_fn_method_suggeststorebuilder_remote_settings_bucket_name FfiConverterTypeSuggestStoreBuilder.lower(this), FfiConverterString.lower(bucketName), ) @@ -1112,7 +1236,7 @@ export class SuggestStoreBuilder { throw e; } return UniFFIScaffolding.callSync( - 50, // suggest:uniffi_suggest_fn_method_suggeststorebuilder_remote_settings_server + 54, // suggest:uniffi_suggest_fn_method_suggeststorebuilder_remote_settings_server FfiConverterTypeSuggestStoreBuilder.lower(this), FfiConverterTypeRemoteSettingsServer.lower(server), ) @@ -1137,7 +1261,7 @@ export class SuggestStoreBuilder { throw e; } return UniFFIScaffolding.callSync( - 51, // suggest:uniffi_suggest_fn_method_suggeststorebuilder_remote_settings_service + 55, // suggest:uniffi_suggest_fn_method_suggeststorebuilder_remote_settings_service FfiConverterTypeSuggestStoreBuilder.lower(this), FfiConverterTypeRemoteSettingsService.lower(rsService), ) @@ -2426,7 +2550,7 @@ export const InterruptKind = { READ: 1, /** * Interrupt write operations. This mostly means [SuggestStore::ingest], but - * [SuggestStore::dismiss_suggestion] may also be interrupted. + * other operations may also be interrupted. */ WRITE: 2, /** diff --git a/toolkit/components/uniffi-bindgen-gecko-js/components/generated/RustTabs.sys.mjs b/toolkit/components/uniffi-bindgen-gecko-js/components/generated/RustTabs.sys.mjs index 76054be42fd7..972470f71664 100644 --- a/toolkit/components/uniffi-bindgen-gecko-js/components/generated/RustTabs.sys.mjs +++ b/toolkit/components/uniffi-bindgen-gecko-js/components/generated/RustTabs.sys.mjs @@ -448,7 +448,7 @@ export class RemoteCommandStore { throw e; } return UniFFIScaffolding.callAsyncWrapper( - 53, // tabs:uniffi_tabs_fn_method_remotecommandstore_add_remote_command + 57, // 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( - 54, // tabs:uniffi_tabs_fn_method_remotecommandstore_add_remote_command_at + 58, // 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( - 55, // tabs:uniffi_tabs_fn_method_remotecommandstore_get_unsent_commands + 59, // tabs:uniffi_tabs_fn_method_remotecommandstore_get_unsent_commands FfiConverterTypeRemoteCommandStore.lower(this), ) } @@ -554,7 +554,7 @@ export class RemoteCommandStore { throw e; } return UniFFIScaffolding.callAsyncWrapper( - 56, // tabs:uniffi_tabs_fn_method_remotecommandstore_remove_remote_command + 60, // 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( - 57, // tabs:uniffi_tabs_fn_method_remotecommandstore_set_pending_command_sent + 61, // 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( - 58, // tabs:uniffi_tabs_fn_method_tabsbridgedengine_apply + 62, // tabs:uniffi_tabs_fn_method_tabsbridgedengine_apply FfiConverterTypeTabsBridgedEngine.lower(this), ) } @@ -683,7 +683,7 @@ export class TabsBridgedEngine { throw e; } return UniFFIScaffolding.callAsyncWrapper( - 59, // tabs:uniffi_tabs_fn_method_tabsbridgedengine_ensure_current_sync_id + 63, // 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( - 60, // tabs:uniffi_tabs_fn_method_tabsbridgedengine_last_sync + 64, // tabs:uniffi_tabs_fn_method_tabsbridgedengine_last_sync FfiConverterTypeTabsBridgedEngine.lower(this), ) } @@ -731,7 +731,7 @@ export class TabsBridgedEngine { throw e; } return UniFFIScaffolding.callAsyncWrapper( - 61, // tabs:uniffi_tabs_fn_method_tabsbridgedengine_prepare_for_sync + 65, // 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( - 62, // tabs:uniffi_tabs_fn_method_tabsbridgedengine_reset + 66, // 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( - 63, // tabs:uniffi_tabs_fn_method_tabsbridgedengine_reset_sync_id + 67, // tabs:uniffi_tabs_fn_method_tabsbridgedengine_reset_sync_id FfiConverterTypeTabsBridgedEngine.lower(this), ) } @@ -798,7 +798,7 @@ export class TabsBridgedEngine { throw e; } return UniFFIScaffolding.callAsyncWrapper( - 64, // tabs:uniffi_tabs_fn_method_tabsbridgedengine_set_last_sync + 68, // 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( - 65, // tabs:uniffi_tabs_fn_method_tabsbridgedengine_set_uploaded + 69, // 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( - 66, // tabs:uniffi_tabs_fn_method_tabsbridgedengine_store_incoming + 70, // 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( - 67, // tabs:uniffi_tabs_fn_method_tabsbridgedengine_sync_finished + 71, // 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( - 68, // tabs:uniffi_tabs_fn_method_tabsbridgedengine_sync_id + 72, // 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( - 69, // tabs:uniffi_tabs_fn_method_tabsbridgedengine_sync_started + 73, // 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( - 70, // tabs:uniffi_tabs_fn_method_tabsbridgedengine_wipe + 74, // tabs:uniffi_tabs_fn_method_tabsbridgedengine_wipe FfiConverterTypeTabsBridgedEngine.lower(this), ) } @@ -1016,7 +1016,7 @@ export class TabsStore { throw e; } return UniFFIScaffolding.callAsyncWrapper( - 77, // tabs:uniffi_tabs_fn_constructor_tabsstore_new + 81, // 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( - 71, // tabs:uniffi_tabs_fn_method_tabsstore_bridged_engine + 75, // 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( - 72, // tabs:uniffi_tabs_fn_method_tabsstore_close_connection + 76, // 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( - 73, // tabs:uniffi_tabs_fn_method_tabsstore_get_all + 77, // 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( - 74, // tabs:uniffi_tabs_fn_method_tabsstore_new_remote_command_store + 78, // 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( - 75, // tabs:uniffi_tabs_fn_method_tabsstore_register_with_sync_manager + 79, // 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( - 76, // tabs:uniffi_tabs_fn_method_tabsstore_set_local_tabs + 80, // tabs:uniffi_tabs_fn_method_tabsstore_set_local_tabs FfiConverterTypeTabsStore.lower(this), FfiConverterSequenceTypeRemoteTabRecord.lower(remoteTabs), ) diff --git a/toolkit/components/uniffi-bindgen-gecko-js/components/generated/RustWebextstorage.sys.mjs b/toolkit/components/uniffi-bindgen-gecko-js/components/generated/RustWebextstorage.sys.mjs index f3572c76feb4..2a0ab977abd0 100644 --- a/toolkit/components/uniffi-bindgen-gecko-js/components/generated/RustWebextstorage.sys.mjs +++ b/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( - 78, // webextstorage:uniffi_webext_storage_fn_method_webextstoragebridgedengine_apply + 82, // webextstorage:uniffi_webext_storage_fn_method_webextstoragebridgedengine_apply FfiConverterTypeWebExtStorageBridgedEngine.lower(this), ) } @@ -445,7 +445,7 @@ export class WebExtStorageBridgedEngine { throw e; } return UniFFIScaffolding.callAsyncWrapper( - 79, // webextstorage:uniffi_webext_storage_fn_method_webextstoragebridgedengine_ensure_current_sync_id + 83, // 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( - 80, // webextstorage:uniffi_webext_storage_fn_method_webextstoragebridgedengine_last_sync + 84, // webextstorage:uniffi_webext_storage_fn_method_webextstoragebridgedengine_last_sync FfiConverterTypeWebExtStorageBridgedEngine.lower(this), ) } @@ -493,7 +493,7 @@ export class WebExtStorageBridgedEngine { throw e; } return UniFFIScaffolding.callAsyncWrapper( - 81, // webextstorage:uniffi_webext_storage_fn_method_webextstoragebridgedengine_prepare_for_sync + 85, // 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( - 82, // webextstorage:uniffi_webext_storage_fn_method_webextstoragebridgedengine_reset + 86, // 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( - 83, // webextstorage:uniffi_webext_storage_fn_method_webextstoragebridgedengine_reset_sync_id + 87, // 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( - 84, // webextstorage:uniffi_webext_storage_fn_method_webextstoragebridgedengine_set_last_sync + 88, // 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( - 85, // webextstorage:uniffi_webext_storage_fn_method_webextstoragebridgedengine_set_uploaded + 89, // 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( - 86, // webextstorage:uniffi_webext_storage_fn_method_webextstoragebridgedengine_store_incoming + 90, // 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( - 87, // webextstorage:uniffi_webext_storage_fn_method_webextstoragebridgedengine_sync_finished + 91, // 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( - 88, // webextstorage:uniffi_webext_storage_fn_method_webextstoragebridgedengine_sync_id + 92, // 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( - 89, // webextstorage:uniffi_webext_storage_fn_method_webextstoragebridgedengine_sync_started + 93, // 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( - 90, // webextstorage:uniffi_webext_storage_fn_method_webextstoragebridgedengine_wipe + 94, // webextstorage:uniffi_webext_storage_fn_method_webextstoragebridgedengine_wipe FfiConverterTypeWebExtStorageBridgedEngine.lower(this), ) } @@ -778,7 +778,7 @@ export class WebExtStorageStore { throw e; } return UniFFIScaffolding.callAsyncWrapper( - 99, // webextstorage:uniffi_webext_storage_fn_constructor_webextstoragestore_new + 103, // 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( - 91, // webextstorage:uniffi_webext_storage_fn_method_webextstoragestore_bridged_engine + 95, // webextstorage:uniffi_webext_storage_fn_method_webextstoragestore_bridged_engine FfiConverterTypeWebExtStorageStore.lower(this), ) } @@ -825,7 +825,7 @@ export class WebExtStorageStore { throw e; } return UniFFIScaffolding.callAsyncWrapper( - 92, // webextstorage:uniffi_webext_storage_fn_method_webextstoragestore_clear + 96, // 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( - 93, // webextstorage:uniffi_webext_storage_fn_method_webextstoragestore_close + 97, // webextstorage:uniffi_webext_storage_fn_method_webextstoragestore_close FfiConverterTypeWebExtStorageStore.lower(this), ) } @@ -881,7 +881,7 @@ export class WebExtStorageStore { throw e; } return UniFFIScaffolding.callAsyncWrapper( - 94, // webextstorage:uniffi_webext_storage_fn_method_webextstoragestore_get + 98, // 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( - 95, // webextstorage:uniffi_webext_storage_fn_method_webextstoragestore_get_bytes_in_use + 99, // 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( - 96, // webextstorage:uniffi_webext_storage_fn_method_webextstoragestore_get_synced_changes + 100, // 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( - 97, // webextstorage:uniffi_webext_storage_fn_method_webextstoragestore_remove + 101, // 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( - 98, // webextstorage:uniffi_webext_storage_fn_method_webextstoragestore_set + 102, // webextstorage:uniffi_webext_storage_fn_method_webextstoragestore_set FfiConverterTypeWebExtStorageStore.lower(this), FfiConverterString.lower(extId), FfiConverterTypeJsonValue.lower(val), diff --git a/toolkit/components/uniffi-bindgen-gecko-js/fixtures/generated/RustArithmetic.sys.mjs b/toolkit/components/uniffi-bindgen-gecko-js/fixtures/generated/RustArithmetic.sys.mjs index 2077545c1927..254a93f7715b 100644 --- a/toolkit/components/uniffi-bindgen-gecko-js/fixtures/generated/RustArithmetic.sys.mjs +++ b/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( - 100, // arithmetic:uniffi_arithmetical_fn_func_add + 104, // 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( - 101, // arithmetic:uniffi_arithmetical_fn_func_div + 105, // 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( - 102, // arithmetic:uniffi_arithmetical_fn_func_equal + 106, // 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( - 103, // arithmetic:uniffi_arithmetical_fn_func_sub + 107, // arithmetic:uniffi_arithmetical_fn_func_sub FfiConverterU64.lower(a), FfiConverterU64.lower(b), ) diff --git a/toolkit/components/uniffi-bindgen-gecko-js/fixtures/generated/RustCustomTypes.sys.mjs b/toolkit/components/uniffi-bindgen-gecko-js/fixtures/generated/RustCustomTypes.sys.mjs index d5bc522e7900..a083cb4176f9 100644 --- a/toolkit/components/uniffi-bindgen-gecko-js/fixtures/generated/RustCustomTypes.sys.mjs +++ 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( - 104, // custom_types:uniffi_uniffi_custom_types_fn_func_get_custom_types_demo + 108, // custom_types:uniffi_uniffi_custom_types_fn_func_get_custom_types_demo FfiConverterOptionalTypeCustomTypesDemo.lower(demo), ) } diff --git a/toolkit/components/uniffi-bindgen-gecko-js/fixtures/generated/RustExternalTypes.sys.mjs b/toolkit/components/uniffi-bindgen-gecko-js/fixtures/generated/RustExternalTypes.sys.mjs index a7f7aaa95b3e..c154853f3575 100644 --- a/toolkit/components/uniffi-bindgen-gecko-js/fixtures/generated/RustExternalTypes.sys.mjs +++ b/toolkit/components/uniffi-bindgen-gecko-js/fixtures/generated/RustExternalTypes.sys.mjs @@ -431,7 +431,7 @@ export function gradient(value) { throw e; } return UniFFIScaffolding.callAsyncWrapper( - 105, // external_types:uniffi_uniffi_fixture_external_types_fn_func_gradient + 109, // 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( - 106, // external_types:uniffi_uniffi_fixture_external_types_fn_func_intersection + 110, // 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( - 107, // external_types:uniffi_uniffi_fixture_external_types_fn_func_move_sprite_to_origin + 111, // external_types:uniffi_uniffi_fixture_external_types_fn_func_move_sprite_to_origin FfiConverterTypeSprite.lower(sprite), ) } diff --git a/toolkit/components/uniffi-bindgen-gecko-js/fixtures/generated/RustFixtureCallbacks.sys.mjs b/toolkit/components/uniffi-bindgen-gecko-js/fixtures/generated/RustFixtureCallbacks.sys.mjs index ff244bd7cca5..85ac3b24f67a 100644 --- a/toolkit/components/uniffi-bindgen-gecko-js/fixtures/generated/RustFixtureCallbacks.sys.mjs +++ b/toolkit/components/uniffi-bindgen-gecko-js/fixtures/generated/RustFixtureCallbacks.sys.mjs @@ -737,7 +737,7 @@ export function callLogRepeat(logger,message,count,exclude) { throw e; } return UniFFIScaffolding.callAsyncWrapper( - 108, // fixture_callbacks:uniffi_uniffi_fixture_callbacks_fn_func_call_log_repeat + 112, // 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( - 109, // fixture_callbacks:uniffi_uniffi_fixture_callbacks_fn_func_log_even_numbers + 113, // 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( - 110, // fixture_callbacks:uniffi_uniffi_fixture_callbacks_fn_func_log_even_numbers_main_thread + 114, // fixture_callbacks:uniffi_uniffi_fixture_callbacks_fn_func_log_even_numbers_main_thread FfiConverterTypeLogger.lower(logger), FfiConverterSequencei32.lower(items), ) diff --git a/toolkit/components/uniffi-bindgen-gecko-js/fixtures/generated/RustFutures.sys.mjs b/toolkit/components/uniffi-bindgen-gecko-js/fixtures/generated/RustFutures.sys.mjs index 97c88f5617d3..65404c281956 100644 --- a/toolkit/components/uniffi-bindgen-gecko-js/fixtures/generated/RustFutures.sys.mjs +++ b/toolkit/components/uniffi-bindgen-gecko-js/fixtures/generated/RustFutures.sys.mjs @@ -662,7 +662,7 @@ export class FutureTester { const liftError = null; const functionCall = () => { return UniFFIScaffolding.callSync( - 131, // futures:uniffi_uniffi_fixture_futures_fn_constructor_futuretester_init + 135, // 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( - 128, // futures:uniffi_uniffi_fixture_futures_fn_method_futuretester_complete_futures + 132, // 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( - 129, // futures:uniffi_uniffi_fixture_futures_fn_method_futuretester_make_future + 133, // 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( - 130, // futures:uniffi_uniffi_fixture_futures_fn_method_futuretester_wake_futures + 134, // 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( - 132, // futures:uniffi_uniffi_fixture_futures_fn_method_rusttask_run + 136, // futures:uniffi_uniffi_fixture_futures_fn_method_rusttask_run FfiConverterTypeRustTask.lower(this), ) } @@ -858,7 +858,7 @@ export class Traveller { throw e; } return UniFFIScaffolding.callSync( - 134, // futures:uniffi_uniffi_fixture_futures_fn_constructor_traveller_new + 138, // 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( - 133, // futures:uniffi_uniffi_fixture_futures_fn_method_traveller_name + 137, // futures:uniffi_uniffi_fixture_futures_fn_method_traveller_name FfiConverterTypeTraveller.lower(this), ) } @@ -950,7 +950,7 @@ export class WorkerQueue { throw e; } return UniFFIScaffolding.callSync( - 135, // futures:uniffi_uniffi_fixture_futures_fn_method_workerqueue_add_task + 139, // 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( - 111, // futures:uniffi_uniffi_fixture_futures_fn_func_expensive_computation + 115, // 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( - 112, // futures:uniffi_uniffi_fixture_futures_fn_func_initialize_gecko_global_worker_queue + 116, // 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( - 113, // futures:uniffi_uniffi_fixture_futures_fn_func_initialize_global_worker_queue + 117, // 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( - 114, // futures:uniffi_uniffi_fixture_futures_fn_func_roundtrip_f32 + 118, // 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( - 115, // futures:uniffi_uniffi_fixture_futures_fn_func_roundtrip_f64 + 119, // 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( - 116, // futures:uniffi_uniffi_fixture_futures_fn_func_roundtrip_i16 + 120, // 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( - 117, // futures:uniffi_uniffi_fixture_futures_fn_func_roundtrip_i32 + 121, // 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( - 118, // futures:uniffi_uniffi_fixture_futures_fn_func_roundtrip_i64 + 122, // 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( - 119, // futures:uniffi_uniffi_fixture_futures_fn_func_roundtrip_i8 + 123, // 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( - 120, // futures:uniffi_uniffi_fixture_futures_fn_func_roundtrip_map + 124, // 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( - 121, // futures:uniffi_uniffi_fixture_futures_fn_func_roundtrip_obj + 125, // 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( - 122, // futures:uniffi_uniffi_fixture_futures_fn_func_roundtrip_string + 126, // 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( - 123, // futures:uniffi_uniffi_fixture_futures_fn_func_roundtrip_u16 + 127, // 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( - 124, // futures:uniffi_uniffi_fixture_futures_fn_func_roundtrip_u32 + 128, // 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( - 125, // futures:uniffi_uniffi_fixture_futures_fn_func_roundtrip_u64 + 129, // 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( - 126, // futures:uniffi_uniffi_fixture_futures_fn_func_roundtrip_u8 + 130, // 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( - 127, // futures:uniffi_uniffi_fixture_futures_fn_func_roundtrip_vec + 131, // futures:uniffi_uniffi_fixture_futures_fn_func_roundtrip_vec FfiConverterSequenceu32.lower(v), ) } diff --git a/toolkit/components/uniffi-bindgen-gecko-js/fixtures/generated/RustGeometry.sys.mjs b/toolkit/components/uniffi-bindgen-gecko-js/fixtures/generated/RustGeometry.sys.mjs index 26669a260f3f..87a93ecff890 100644 --- a/toolkit/components/uniffi-bindgen-gecko-js/fixtures/generated/RustGeometry.sys.mjs +++ b/toolkit/components/uniffi-bindgen-gecko-js/fixtures/generated/RustGeometry.sys.mjs @@ -542,7 +542,7 @@ export function gradient(ln) { throw e; } return UniFFIScaffolding.callAsyncWrapper( - 136, // geometry:uniffi_uniffi_geometry_fn_func_gradient + 140, // geometry:uniffi_uniffi_geometry_fn_func_gradient FfiConverterTypeLine.lower(ln), ) } @@ -579,7 +579,7 @@ export function intersection(ln1,ln2) { throw e; } return UniFFIScaffolding.callAsyncWrapper( - 137, // geometry:uniffi_uniffi_geometry_fn_func_intersection + 141, // geometry:uniffi_uniffi_geometry_fn_func_intersection FfiConverterTypeLine.lower(ln1), FfiConverterTypeLine.lower(ln2), ) diff --git a/toolkit/components/uniffi-bindgen-gecko-js/fixtures/generated/RustRefcounts.sys.mjs b/toolkit/components/uniffi-bindgen-gecko-js/fixtures/generated/RustRefcounts.sys.mjs index dcc84416d365..3b7cd2f21fe7 100644 --- a/toolkit/components/uniffi-bindgen-gecko-js/fixtures/generated/RustRefcounts.sys.mjs +++ b/toolkit/components/uniffi-bindgen-gecko-js/fixtures/generated/RustRefcounts.sys.mjs @@ -371,7 +371,7 @@ export class SingletonObject { const liftError = null; const functionCall = () => { return UniFFIScaffolding.callSync( - 140, // refcounts:uniffi_uniffi_fixture_refcounts_fn_method_singletonobject_method + 144, // 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( - 138, // refcounts:uniffi_uniffi_fixture_refcounts_fn_func_get_js_refcount + 142, // 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( - 139, // refcounts:uniffi_uniffi_fixture_refcounts_fn_func_get_singleton + 143, // refcounts:uniffi_uniffi_fixture_refcounts_fn_func_get_singleton ) } return handleRustResult(functionCall(), liftResult, liftError); diff --git a/toolkit/components/uniffi-bindgen-gecko-js/fixtures/generated/RustRondpoint.sys.mjs b/toolkit/components/uniffi-bindgen-gecko-js/fixtures/generated/RustRondpoint.sys.mjs index 5434c72c268d..079af3e3e573 100644 --- a/toolkit/components/uniffi-bindgen-gecko-js/fixtures/generated/RustRondpoint.sys.mjs +++ b/toolkit/components/uniffi-bindgen-gecko-js/fixtures/generated/RustRondpoint.sys.mjs @@ -665,7 +665,7 @@ export class Optionneur { const liftError = null; const functionCall = () => { return UniFFIScaffolding.callAsyncWrapper( - 171, // rondpoint:uniffi_uniffi_rondpoint_fn_constructor_optionneur_new + 175, // rondpoint:uniffi_uniffi_rondpoint_fn_constructor_optionneur_new ) } try { @@ -691,7 +691,7 @@ export class Optionneur { throw e; } return UniFFIScaffolding.callAsyncWrapper( - 146, // rondpoint:uniffi_uniffi_rondpoint_fn_method_optionneur_sinon_boolean + 150, // 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( - 147, // rondpoint:uniffi_uniffi_rondpoint_fn_method_optionneur_sinon_enum + 151, // 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( - 148, // rondpoint:uniffi_uniffi_rondpoint_fn_method_optionneur_sinon_f32 + 152, // 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( - 149, // rondpoint:uniffi_uniffi_rondpoint_fn_method_optionneur_sinon_f64 + 153, // 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( - 150, // rondpoint:uniffi_uniffi_rondpoint_fn_method_optionneur_sinon_i16_dec + 154, // 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( - 151, // rondpoint:uniffi_uniffi_rondpoint_fn_method_optionneur_sinon_i16_hex + 155, // 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( - 152, // rondpoint:uniffi_uniffi_rondpoint_fn_method_optionneur_sinon_i32_dec + 156, // 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( - 153, // rondpoint:uniffi_uniffi_rondpoint_fn_method_optionneur_sinon_i32_hex + 157, // 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( - 154, // rondpoint:uniffi_uniffi_rondpoint_fn_method_optionneur_sinon_i64_dec + 158, // 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( - 155, // rondpoint:uniffi_uniffi_rondpoint_fn_method_optionneur_sinon_i64_hex + 159, // 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( - 156, // rondpoint:uniffi_uniffi_rondpoint_fn_method_optionneur_sinon_i8_dec + 160, // 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( - 157, // rondpoint:uniffi_uniffi_rondpoint_fn_method_optionneur_sinon_i8_hex + 161, // 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( - 158, // rondpoint:uniffi_uniffi_rondpoint_fn_method_optionneur_sinon_null + 162, // 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( - 159, // rondpoint:uniffi_uniffi_rondpoint_fn_method_optionneur_sinon_sequence + 163, // 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( - 160, // rondpoint:uniffi_uniffi_rondpoint_fn_method_optionneur_sinon_string + 164, // 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( - 161, // rondpoint:uniffi_uniffi_rondpoint_fn_method_optionneur_sinon_u16_dec + 165, // 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( - 162, // rondpoint:uniffi_uniffi_rondpoint_fn_method_optionneur_sinon_u16_hex + 166, // 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( - 163, // rondpoint:uniffi_uniffi_rondpoint_fn_method_optionneur_sinon_u32_dec + 167, // 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( - 164, // rondpoint:uniffi_uniffi_rondpoint_fn_method_optionneur_sinon_u32_hex + 168, // 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( - 165, // rondpoint:uniffi_uniffi_rondpoint_fn_method_optionneur_sinon_u32_oct + 169, // 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( - 166, // rondpoint:uniffi_uniffi_rondpoint_fn_method_optionneur_sinon_u64_dec + 170, // 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( - 167, // rondpoint:uniffi_uniffi_rondpoint_fn_method_optionneur_sinon_u64_hex + 171, // 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( - 168, // rondpoint:uniffi_uniffi_rondpoint_fn_method_optionneur_sinon_u8_dec + 172, // 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( - 169, // rondpoint:uniffi_uniffi_rondpoint_fn_method_optionneur_sinon_u8_hex + 173, // 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( - 170, // rondpoint:uniffi_uniffi_rondpoint_fn_method_optionneur_sinon_zero + 174, // 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( - 187, // rondpoint:uniffi_uniffi_rondpoint_fn_constructor_retourneur_new + 191, // rondpoint:uniffi_uniffi_rondpoint_fn_constructor_retourneur_new ) } try { @@ -1481,7 +1481,7 @@ export class Retourneur { throw e; } return UniFFIScaffolding.callAsyncWrapper( - 172, // rondpoint:uniffi_uniffi_rondpoint_fn_method_retourneur_identique_boolean + 176, // 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( - 173, // rondpoint:uniffi_uniffi_rondpoint_fn_method_retourneur_identique_double + 177, // 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( - 174, // rondpoint:uniffi_uniffi_rondpoint_fn_method_retourneur_identique_float + 178, // 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( - 175, // rondpoint:uniffi_uniffi_rondpoint_fn_method_retourneur_identique_i16 + 179, // 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( - 176, // rondpoint:uniffi_uniffi_rondpoint_fn_method_retourneur_identique_i32 + 180, // 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( - 177, // rondpoint:uniffi_uniffi_rondpoint_fn_method_retourneur_identique_i64 + 181, // 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( - 178, // rondpoint:uniffi_uniffi_rondpoint_fn_method_retourneur_identique_i8 + 182, // 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( - 179, // rondpoint:uniffi_uniffi_rondpoint_fn_method_retourneur_identique_nombres + 183, // 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( - 180, // rondpoint:uniffi_uniffi_rondpoint_fn_method_retourneur_identique_nombres_signes + 184, // 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( - 181, // rondpoint:uniffi_uniffi_rondpoint_fn_method_retourneur_identique_optionneur_dictionnaire + 185, // 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( - 182, // rondpoint:uniffi_uniffi_rondpoint_fn_method_retourneur_identique_string + 186, // 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( - 183, // rondpoint:uniffi_uniffi_rondpoint_fn_method_retourneur_identique_u16 + 187, // 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( - 184, // rondpoint:uniffi_uniffi_rondpoint_fn_method_retourneur_identique_u32 + 188, // 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( - 185, // rondpoint:uniffi_uniffi_rondpoint_fn_method_retourneur_identique_u64 + 189, // 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( - 186, // rondpoint:uniffi_uniffi_rondpoint_fn_method_retourneur_identique_u8 + 190, // 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( - 200, // rondpoint:uniffi_uniffi_rondpoint_fn_constructor_stringifier_new + 204, // rondpoint:uniffi_uniffi_rondpoint_fn_constructor_stringifier_new ) } try { @@ -1981,7 +1981,7 @@ export class Stringifier { throw e; } return UniFFIScaffolding.callAsyncWrapper( - 188, // rondpoint:uniffi_uniffi_rondpoint_fn_method_stringifier_to_string_boolean + 192, // 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( - 189, // rondpoint:uniffi_uniffi_rondpoint_fn_method_stringifier_to_string_double + 193, // 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( - 190, // rondpoint:uniffi_uniffi_rondpoint_fn_method_stringifier_to_string_float + 194, // 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( - 191, // rondpoint:uniffi_uniffi_rondpoint_fn_method_stringifier_to_string_i16 + 195, // 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( - 192, // rondpoint:uniffi_uniffi_rondpoint_fn_method_stringifier_to_string_i32 + 196, // 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( - 193, // rondpoint:uniffi_uniffi_rondpoint_fn_method_stringifier_to_string_i64 + 197, // 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( - 194, // rondpoint:uniffi_uniffi_rondpoint_fn_method_stringifier_to_string_i8 + 198, // 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( - 195, // rondpoint:uniffi_uniffi_rondpoint_fn_method_stringifier_to_string_u16 + 199, // 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( - 196, // rondpoint:uniffi_uniffi_rondpoint_fn_method_stringifier_to_string_u32 + 200, // 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( - 197, // rondpoint:uniffi_uniffi_rondpoint_fn_method_stringifier_to_string_u64 + 201, // 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( - 198, // rondpoint:uniffi_uniffi_rondpoint_fn_method_stringifier_to_string_u8 + 202, // 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( - 199, // rondpoint:uniffi_uniffi_rondpoint_fn_method_stringifier_well_known_string + 203, // 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( - 141, // rondpoint:uniffi_uniffi_rondpoint_fn_func_copie_carte + 145, // rondpoint:uniffi_uniffi_rondpoint_fn_func_copie_carte FfiConverterMapStringTypeEnumerationAvecDonnees.lower(c), ) } @@ -3706,7 +3706,7 @@ export function copieDictionnaire(d) { throw e; } return UniFFIScaffolding.callAsyncWrapper( - 142, // rondpoint:uniffi_uniffi_rondpoint_fn_func_copie_dictionnaire + 146, // rondpoint:uniffi_uniffi_rondpoint_fn_func_copie_dictionnaire FfiConverterTypeDictionnaire.lower(d), ) } @@ -3735,7 +3735,7 @@ export function copieEnumeration(e) { throw e; } return UniFFIScaffolding.callAsyncWrapper( - 143, // rondpoint:uniffi_uniffi_rondpoint_fn_func_copie_enumeration + 147, // rondpoint:uniffi_uniffi_rondpoint_fn_func_copie_enumeration FfiConverterTypeEnumeration.lower(e), ) } @@ -3764,7 +3764,7 @@ export function copieEnumerations(e) { throw e; } return UniFFIScaffolding.callAsyncWrapper( - 144, // rondpoint:uniffi_uniffi_rondpoint_fn_func_copie_enumerations + 148, // rondpoint:uniffi_uniffi_rondpoint_fn_func_copie_enumerations FfiConverterSequenceTypeEnumeration.lower(e), ) } @@ -3793,7 +3793,7 @@ export function switcheroo(b) { throw e; } return UniFFIScaffolding.callAsyncWrapper( - 145, // rondpoint:uniffi_uniffi_rondpoint_fn_func_switcheroo + 149, // rondpoint:uniffi_uniffi_rondpoint_fn_func_switcheroo FfiConverterBool.lower(b), ) } diff --git a/toolkit/components/uniffi-bindgen-gecko-js/fixtures/generated/RustSprites.sys.mjs b/toolkit/components/uniffi-bindgen-gecko-js/fixtures/generated/RustSprites.sys.mjs index 0477c6bfa7bb..a135e0139770 100644 --- a/toolkit/components/uniffi-bindgen-gecko-js/fixtures/generated/RustSprites.sys.mjs +++ b/toolkit/components/uniffi-bindgen-gecko-js/fixtures/generated/RustSprites.sys.mjs @@ -370,7 +370,7 @@ export class Sprite { throw e; } return UniFFIScaffolding.callAsyncWrapper( - 205, // sprites:uniffi_uniffi_sprites_fn_constructor_sprite_new + 209, // sprites:uniffi_uniffi_sprites_fn_constructor_sprite_new FfiConverterOptionalTypePoint.lower(initialPosition), ) } @@ -404,7 +404,7 @@ export class Sprite { throw e; } return UniFFIScaffolding.callAsyncWrapper( - 206, // sprites:uniffi_uniffi_sprites_fn_constructor_sprite_new_relative_to + 210, // 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( - 202, // sprites:uniffi_uniffi_sprites_fn_method_sprite_get_position + 206, // sprites:uniffi_uniffi_sprites_fn_method_sprite_get_position FfiConverterTypeSprite.lower(this), ) } @@ -451,7 +451,7 @@ export class Sprite { throw e; } return UniFFIScaffolding.callAsyncWrapper( - 203, // sprites:uniffi_uniffi_sprites_fn_method_sprite_move_by + 207, // 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( - 204, // sprites:uniffi_uniffi_sprites_fn_method_sprite_move_to + 208, // 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( - 201, // sprites:uniffi_uniffi_sprites_fn_func_translate + 205, // sprites:uniffi_uniffi_sprites_fn_func_translate FfiConverterTypePoint.lower(p), FfiConverterTypeVector.lower(v), ) diff --git a/toolkit/components/uniffi-bindgen-gecko-js/fixtures/generated/RustTodolist.sys.mjs b/toolkit/components/uniffi-bindgen-gecko-js/fixtures/generated/RustTodolist.sys.mjs index e850c4e11367..41f68eec4467 100644 --- a/toolkit/components/uniffi-bindgen-gecko-js/fixtures/generated/RustTodolist.sys.mjs +++ b/toolkit/components/uniffi-bindgen-gecko-js/fixtures/generated/RustTodolist.sys.mjs @@ -343,7 +343,7 @@ export class TodoList { const liftError = null; const functionCall = () => { return UniFFIScaffolding.callAsyncWrapper( - 221, // todolist:uniffi_uniffi_todolist_fn_constructor_todolist_new + 225, // todolist:uniffi_uniffi_todolist_fn_constructor_todolist_new ) } try { @@ -368,7 +368,7 @@ export class TodoList { throw e; } return UniFFIScaffolding.callAsyncWrapper( - 210, // todolist:uniffi_uniffi_todolist_fn_method_todolist_add_entries + 214, // 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( - 211, // todolist:uniffi_uniffi_todolist_fn_method_todolist_add_entry + 215, // 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( - 212, // todolist:uniffi_uniffi_todolist_fn_method_todolist_add_item + 216, // 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( - 213, // todolist:uniffi_uniffi_todolist_fn_method_todolist_add_items + 217, // 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( - 214, // todolist:uniffi_uniffi_todolist_fn_method_todolist_clear_item + 218, // 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( - 215, // todolist:uniffi_uniffi_todolist_fn_method_todolist_get_entries + 219, // 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( - 216, // todolist:uniffi_uniffi_todolist_fn_method_todolist_get_first + 220, // 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( - 217, // todolist:uniffi_uniffi_todolist_fn_method_todolist_get_items + 221, // 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( - 218, // todolist:uniffi_uniffi_todolist_fn_method_todolist_get_last + 222, // 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( - 219, // todolist:uniffi_uniffi_todolist_fn_method_todolist_get_last_entry + 223, // 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( - 220, // todolist:uniffi_uniffi_todolist_fn_method_todolist_make_default + 224, // 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( - 207, // todolist:uniffi_uniffi_todolist_fn_func_create_entry_with + 211, // 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( - 208, // todolist:uniffi_uniffi_todolist_fn_func_get_default_list + 212, // todolist:uniffi_uniffi_todolist_fn_func_get_default_list ) } try { @@ -1040,7 +1040,7 @@ export function setDefaultList(list) { throw e; } return UniFFIScaffolding.callAsyncWrapper( - 209, // todolist:uniffi_uniffi_todolist_fn_func_set_default_list + 213, // todolist:uniffi_uniffi_todolist_fn_func_set_default_list FfiConverterTypeTodoList.lower(list), ) } diff --git a/toolkit/components/uniffi-bindgen-gecko-js/fixtures/generated/RustUniffiTraitInterfaces.sys.mjs b/toolkit/components/uniffi-bindgen-gecko-js/fixtures/generated/RustUniffiTraitInterfaces.sys.mjs index cc0b951204fd..719b1915bead 100644 --- a/toolkit/components/uniffi-bindgen-gecko-js/fixtures/generated/RustUniffiTraitInterfaces.sys.mjs +++ b/toolkit/components/uniffi-bindgen-gecko-js/fixtures/generated/RustUniffiTraitInterfaces.sys.mjs @@ -388,7 +388,7 @@ export class Calc { throw e; } return UniFFIScaffolding.callSync( - 224, // uniffi_trait_interfaces:uniffi_uniffi_trait_interfaces_fn_method_calc_add + 228, // 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( - 222, // uniffi_trait_interfaces:uniffi_uniffi_trait_interfaces_fn_func_make_buggy_calculator + 226, // 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( - 223, // uniffi_trait_interfaces:uniffi_uniffi_trait_interfaces_fn_func_make_calculator + 227, // uniffi_trait_interfaces:uniffi_uniffi_trait_interfaces_fn_func_make_calculator ) } return handleRustResult(functionCall(), liftResult, liftError); diff --git a/toolkit/components/uniffi-js/GeneratedScaffolding.cpp b/toolkit/components/uniffi-js/GeneratedScaffolding.cpp index bb61df7f3b3e..c79930de7b6b 100644 --- a/toolkit/components/uniffi-js/GeneratedScaffolding.cpp +++ b/toolkit/components/uniffi-js/GeneratedScaffolding.cpp @@ -420,15 +420,19 @@ extern "C" { void* uniffi_suggest_fn_clone_suggeststore(void*, RustCallStatus*); void uniffi_suggest_fn_free_suggeststore(void*, RustCallStatus*); void* uniffi_suggest_fn_constructor_suggeststore_new(RustBuffer, void*, RustCallStatus*); + int8_t uniffi_suggest_fn_method_suggeststore_any_dismissed_suggestions(void*, RustCallStatus*); void uniffi_suggest_fn_method_suggeststore_clear(void*, RustCallStatus*); void uniffi_suggest_fn_method_suggeststore_clear_dismissed_suggestions(void*, RustCallStatus*); - void uniffi_suggest_fn_method_suggeststore_dismiss(void*, RustBuffer, RustCallStatus*); + void uniffi_suggest_fn_method_suggeststore_dismiss_by_key(void*, RustBuffer, RustCallStatus*); + void uniffi_suggest_fn_method_suggeststore_dismiss_by_suggestion(void*, RustBuffer, RustCallStatus*); void uniffi_suggest_fn_method_suggeststore_dismiss_suggestion(void*, RustBuffer, RustCallStatus*); RustBuffer uniffi_suggest_fn_method_suggeststore_fetch_geonames(void*, RustBuffer, int8_t, RustBuffer, RustBuffer, RustCallStatus*); RustBuffer uniffi_suggest_fn_method_suggeststore_fetch_global_config(void*, RustCallStatus*); RustBuffer uniffi_suggest_fn_method_suggeststore_fetch_provider_config(void*, RustBuffer, RustCallStatus*); RustBuffer uniffi_suggest_fn_method_suggeststore_ingest(void*, RustBuffer, RustCallStatus*); void uniffi_suggest_fn_method_suggeststore_interrupt(void*, RustBuffer, RustCallStatus*); + int8_t uniffi_suggest_fn_method_suggeststore_is_dismissed_by_key(void*, RustBuffer, RustCallStatus*); + int8_t uniffi_suggest_fn_method_suggeststore_is_dismissed_by_suggestion(void*, RustBuffer, RustCallStatus*); RustBuffer uniffi_suggest_fn_method_suggeststore_query(void*, RustBuffer, RustCallStatus*); RustBuffer uniffi_suggest_fn_method_suggeststore_query_with_metrics(void*, RustBuffer, RustCallStatus*); void* uniffi_suggest_fn_clone_suggeststorebuilder(void*, RustCallStatus*); @@ -499,15 +503,19 @@ extern "C" { void ffi_suggest_rust_future_free_void(uint64_t); void ffi_suggest_rust_future_complete_void(uint64_t, RustCallStatus*); uint16_t uniffi_suggest_checksum_func_raw_suggestion_url_matches(); + uint16_t uniffi_suggest_checksum_method_suggeststore_any_dismissed_suggestions(); uint16_t uniffi_suggest_checksum_method_suggeststore_clear(); uint16_t uniffi_suggest_checksum_method_suggeststore_clear_dismissed_suggestions(); - uint16_t uniffi_suggest_checksum_method_suggeststore_dismiss(); + uint16_t uniffi_suggest_checksum_method_suggeststore_dismiss_by_key(); + uint16_t uniffi_suggest_checksum_method_suggeststore_dismiss_by_suggestion(); uint16_t uniffi_suggest_checksum_method_suggeststore_dismiss_suggestion(); uint16_t uniffi_suggest_checksum_method_suggeststore_fetch_geonames(); uint16_t uniffi_suggest_checksum_method_suggeststore_fetch_global_config(); uint16_t uniffi_suggest_checksum_method_suggeststore_fetch_provider_config(); uint16_t uniffi_suggest_checksum_method_suggeststore_ingest(); uint16_t uniffi_suggest_checksum_method_suggeststore_interrupt(); + uint16_t uniffi_suggest_checksum_method_suggeststore_is_dismissed_by_key(); + uint16_t uniffi_suggest_checksum_method_suggeststore_is_dismissed_by_suggestion(); uint16_t uniffi_suggest_checksum_method_suggeststore_query(); uint16_t uniffi_suggest_checksum_method_suggeststore_query_with_metrics(); uint16_t uniffi_suggest_checksum_method_suggeststorebuilder_build(); @@ -4925,6 +4933,39 @@ public: ); } }; +class ScaffoldingCallHandlerUniffiSuggestFnMethodSuggeststoreAnyDismissedSuggestions : public UniffiSyncCallHandler { +private: + // LowerRustArgs stores the resulting arguments in these fields + FfiValueObjectHandleSuggestSuggestStore mPtr{}; + + // MakeRustCall stores the result of the call in these fields + FfiValueInt mUniffiReturnValue{}; + +public: + void LowerRustArgs(const dom::Sequence& aArgs, ErrorResult& aError) override { + mPtr.Lower(aArgs[0], aError); + if (aError.Failed()) { + return; + } + } + + void MakeRustCall(RustCallStatus* aOutStatus) override { + mUniffiReturnValue = FfiValueInt::FromRust( + uniffi_suggest_fn_method_suggeststore_any_dismissed_suggestions( + mPtr.IntoRust(), + aOutStatus + ) + ); + } + + virtual void LiftSuccessfulCallResult(JSContext* aCx, dom::Optional& aDest, ErrorResult& aError) override { + mUniffiReturnValue.Lift( + aCx, + &aDest.Construct(), + aError + ); + } +}; class ScaffoldingCallHandlerUniffiSuggestFnMethodSuggeststoreClear : public UniffiSyncCallHandler { private: // LowerRustArgs stores the resulting arguments in these fields @@ -4975,7 +5016,38 @@ public: virtual void LiftSuccessfulCallResult(JSContext* aCx, dom::Optional& aDest, ErrorResult& aError) override { } }; -class ScaffoldingCallHandlerUniffiSuggestFnMethodSuggeststoreDismiss : public UniffiSyncCallHandler { +class ScaffoldingCallHandlerUniffiSuggestFnMethodSuggeststoreDismissByKey : public UniffiSyncCallHandler { +private: + // LowerRustArgs stores the resulting arguments in these fields + FfiValueObjectHandleSuggestSuggestStore mPtr{}; + FfiValueRustBuffer mKey{}; + + // MakeRustCall stores the result of the call in these fields + +public: + void LowerRustArgs(const dom::Sequence& aArgs, ErrorResult& aError) override { + mPtr.Lower(aArgs[0], aError); + if (aError.Failed()) { + return; + } + mKey.Lower(aArgs[1], aError); + if (aError.Failed()) { + return; + } + } + + void MakeRustCall(RustCallStatus* aOutStatus) override { + uniffi_suggest_fn_method_suggeststore_dismiss_by_key( + mPtr.IntoRust(), + mKey.IntoRust(), + aOutStatus + ); + } + + virtual void LiftSuccessfulCallResult(JSContext* aCx, dom::Optional& aDest, ErrorResult& aError) override { + } +}; +class ScaffoldingCallHandlerUniffiSuggestFnMethodSuggeststoreDismissBySuggestion : public UniffiSyncCallHandler { private: // LowerRustArgs stores the resulting arguments in these fields FfiValueObjectHandleSuggestSuggestStore mPtr{}; @@ -4996,7 +5068,7 @@ public: } void MakeRustCall(RustCallStatus* aOutStatus) override { - uniffi_suggest_fn_method_suggeststore_dismiss( + uniffi_suggest_fn_method_suggeststore_dismiss_by_suggestion( mPtr.IntoRust(), mSuggestion.IntoRust(), aOutStatus @@ -5236,6 +5308,84 @@ public: virtual void LiftSuccessfulCallResult(JSContext* aCx, dom::Optional& aDest, ErrorResult& aError) override { } }; +class ScaffoldingCallHandlerUniffiSuggestFnMethodSuggeststoreIsDismissedByKey : public UniffiSyncCallHandler { +private: + // LowerRustArgs stores the resulting arguments in these fields + FfiValueObjectHandleSuggestSuggestStore mPtr{}; + FfiValueRustBuffer mKey{}; + + // MakeRustCall stores the result of the call in these fields + FfiValueInt mUniffiReturnValue{}; + +public: + void LowerRustArgs(const dom::Sequence& aArgs, ErrorResult& aError) override { + mPtr.Lower(aArgs[0], aError); + if (aError.Failed()) { + return; + } + mKey.Lower(aArgs[1], aError); + if (aError.Failed()) { + return; + } + } + + void MakeRustCall(RustCallStatus* aOutStatus) override { + mUniffiReturnValue = FfiValueInt::FromRust( + uniffi_suggest_fn_method_suggeststore_is_dismissed_by_key( + mPtr.IntoRust(), + mKey.IntoRust(), + aOutStatus + ) + ); + } + + virtual void LiftSuccessfulCallResult(JSContext* aCx, dom::Optional& aDest, ErrorResult& aError) override { + mUniffiReturnValue.Lift( + aCx, + &aDest.Construct(), + aError + ); + } +}; +class ScaffoldingCallHandlerUniffiSuggestFnMethodSuggeststoreIsDismissedBySuggestion : public UniffiSyncCallHandler { +private: + // LowerRustArgs stores the resulting arguments in these fields + FfiValueObjectHandleSuggestSuggestStore mPtr{}; + FfiValueRustBuffer mSuggestion{}; + + // MakeRustCall stores the result of the call in these fields + FfiValueInt mUniffiReturnValue{}; + +public: + void LowerRustArgs(const dom::Sequence& aArgs, ErrorResult& aError) override { + mPtr.Lower(aArgs[0], aError); + if (aError.Failed()) { + return; + } + mSuggestion.Lower(aArgs[1], aError); + if (aError.Failed()) { + return; + } + } + + void MakeRustCall(RustCallStatus* aOutStatus) override { + mUniffiReturnValue = FfiValueInt::FromRust( + uniffi_suggest_fn_method_suggeststore_is_dismissed_by_suggestion( + mPtr.IntoRust(), + mSuggestion.IntoRust(), + aOutStatus + ) + ); + } + + virtual void LiftSuccessfulCallResult(JSContext* aCx, dom::Optional& aDest, ErrorResult& aError) override { + mUniffiReturnValue.Lift( + aCx, + &aDest.Construct(), + aError + ); + } +}; class ScaffoldingCallHandlerUniffiSuggestFnMethodSuggeststoreQuery : public UniffiSyncCallHandler { private: // LowerRustArgs stores the resulting arguments in these fields @@ -11768,533 +11918,545 @@ UniquePtr GetSyncCallHandler(uint64_t aId) { return MakeUnique(); } case 33: { - return MakeUnique(); + return MakeUnique(); } case 34: { - return MakeUnique(); + return MakeUnique(); } case 35: { - return MakeUnique(); + return MakeUnique(); } case 36: { - return MakeUnique(); + return MakeUnique(); } case 37: { - return MakeUnique(); + return MakeUnique(); } case 38: { - return MakeUnique(); + return MakeUnique(); } case 39: { - return MakeUnique(); + return MakeUnique(); } case 40: { - return MakeUnique(); + return MakeUnique(); } case 41: { - return MakeUnique(); + return MakeUnique(); } case 42: { - return MakeUnique(); + return MakeUnique(); } case 43: { - return MakeUnique(); + return MakeUnique(); } case 44: { - return MakeUnique(); + return MakeUnique(); } case 45: { - return MakeUnique(); + return MakeUnique(); } case 46: { - return MakeUnique(); + return MakeUnique(); } case 47: { - return MakeUnique(); + return MakeUnique(); } case 48: { - return MakeUnique(); + return MakeUnique(); } case 49: { - return MakeUnique(); + return MakeUnique(); } case 50: { - return MakeUnique(); + return MakeUnique(); } case 51: { - return MakeUnique(); + return MakeUnique(); } case 52: { - return MakeUnique(); + return MakeUnique(); } case 53: { - return MakeUnique(); + return MakeUnique(); } case 54: { - return MakeUnique(); + return MakeUnique(); } case 55: { - return MakeUnique(); + return MakeUnique(); } case 56: { - return MakeUnique(); + return MakeUnique(); } case 57: { - return MakeUnique(); + return MakeUnique(); } case 58: { - return MakeUnique(); + return MakeUnique(); } case 59: { - return MakeUnique(); + return MakeUnique(); } case 60: { - return MakeUnique(); + return MakeUnique(); } case 61: { - return MakeUnique(); + return MakeUnique(); } case 62: { - return MakeUnique(); + return MakeUnique(); } case 63: { - return MakeUnique(); + return MakeUnique(); } case 64: { - return MakeUnique(); + return MakeUnique(); } case 65: { - return MakeUnique(); + return MakeUnique(); } case 66: { - return MakeUnique(); + return MakeUnique(); } case 67: { - return MakeUnique(); + return MakeUnique(); } case 68: { - return MakeUnique(); + return MakeUnique(); } case 69: { - return MakeUnique(); + return MakeUnique(); } case 70: { - return MakeUnique(); + return MakeUnique(); } case 71: { - return MakeUnique(); + return MakeUnique(); } case 72: { - return MakeUnique(); + return MakeUnique(); } case 73: { - return MakeUnique(); + return MakeUnique(); } case 74: { - return MakeUnique(); + return MakeUnique(); } case 75: { - return MakeUnique(); + return MakeUnique(); } case 76: { - return MakeUnique(); + return MakeUnique(); } case 77: { - return MakeUnique(); + return MakeUnique(); } case 78: { - return MakeUnique(); + return MakeUnique(); } case 79: { - return MakeUnique(); + return MakeUnique(); } case 80: { - return MakeUnique(); + return MakeUnique(); } case 81: { - return MakeUnique(); + return MakeUnique(); } case 82: { - return MakeUnique(); + return MakeUnique(); } case 83: { - return MakeUnique(); + return MakeUnique(); } case 84: { - return MakeUnique(); + return MakeUnique(); } case 85: { - return MakeUnique(); + return MakeUnique(); } case 86: { - return MakeUnique(); + return MakeUnique(); } case 87: { - return MakeUnique(); + return MakeUnique(); } case 88: { - return MakeUnique(); + return MakeUnique(); } case 89: { - return MakeUnique(); + return MakeUnique(); } case 90: { - return MakeUnique(); + return MakeUnique(); } case 91: { - return MakeUnique(); + return MakeUnique(); } case 92: { - return MakeUnique(); + return MakeUnique(); } case 93: { - return MakeUnique(); + return MakeUnique(); } case 94: { - return MakeUnique(); + return MakeUnique(); } case 95: { - return MakeUnique(); + return MakeUnique(); } case 96: { - return MakeUnique(); + return MakeUnique(); } case 97: { - return MakeUnique(); + return MakeUnique(); } case 98: { - return MakeUnique(); + return MakeUnique(); } case 99: { + return MakeUnique(); + } + case 100: { + return MakeUnique(); + } + case 101: { + return MakeUnique(); + } + case 102: { + return MakeUnique(); + } + case 103: { return MakeUnique(); } #ifdef MOZ_UNIFFI_FIXTURES - case 100: { + case 104: { return MakeUnique(); } - case 101: { + case 105: { return MakeUnique(); } - case 102: { + case 106: { return MakeUnique(); } - case 103: { + case 107: { return MakeUnique(); } - case 104: { + case 108: { return MakeUnique(); } - case 105: { + case 109: { return MakeUnique(); } - case 106: { + case 110: { return MakeUnique(); } - case 107: { + case 111: { return MakeUnique(); } - case 108: { + case 112: { return MakeUnique(); } - case 109: { + case 113: { return MakeUnique(); } - case 110: { + case 114: { return MakeUnique(); } - case 112: { + case 116: { return MakeUnique(); } - case 113: { + case 117: { return MakeUnique(); } - case 128: { + case 132: { return MakeUnique(); } - case 130: { + case 134: { return MakeUnique(); } - case 131: { + case 135: { return MakeUnique(); } - case 132: { + case 136: { return MakeUnique(); } - case 133: { + case 137: { return MakeUnique(); } - case 134: { + case 138: { return MakeUnique(); } - case 135: { + case 139: { return MakeUnique(); } - case 136: { + case 140: { return MakeUnique(); } - case 137: { + case 141: { return MakeUnique(); } - case 138: { + case 142: { return MakeUnique(); } - case 139: { + case 143: { return MakeUnique(); } - case 140: { + case 144: { return MakeUnique(); } - case 141: { + case 145: { return MakeUnique(); } - case 142: { + case 146: { return MakeUnique(); } - case 143: { + case 147: { return MakeUnique(); } - case 144: { + case 148: { return MakeUnique(); } - case 145: { + case 149: { return MakeUnique(); } - case 146: { + case 150: { return MakeUnique(); } - case 147: { + case 151: { return MakeUnique(); } - case 148: { + case 152: { return MakeUnique(); } - case 149: { + case 153: { return MakeUnique(); } - case 150: { + case 154: { return MakeUnique(); } - case 151: { + case 155: { return MakeUnique(); } - case 152: { + case 156: { return MakeUnique(); } - case 153: { + case 157: { return MakeUnique(); } - case 154: { + case 158: { return MakeUnique(); } - case 155: { + case 159: { return MakeUnique(); } - case 156: { + case 160: { return MakeUnique(); } - case 157: { + case 161: { return MakeUnique(); } - case 158: { + case 162: { return MakeUnique(); } - case 159: { + case 163: { return MakeUnique(); } - case 160: { + case 164: { return MakeUnique(); } - case 161: { + case 165: { return MakeUnique(); } - case 162: { + case 166: { return MakeUnique(); } - case 163: { + case 167: { return MakeUnique(); } - case 164: { + case 168: { return MakeUnique(); } - case 165: { + case 169: { return MakeUnique(); } - case 166: { + case 170: { return MakeUnique(); } - case 167: { + case 171: { return MakeUnique(); } - case 168: { + case 172: { return MakeUnique(); } - case 169: { + case 173: { return MakeUnique(); } - case 170: { + case 174: { return MakeUnique(); } - case 171: { + case 175: { return MakeUnique(); } - case 172: { + case 176: { return MakeUnique(); } - case 173: { + case 177: { return MakeUnique(); } - case 174: { + case 178: { return MakeUnique(); } - case 175: { + case 179: { return MakeUnique(); } - case 176: { + case 180: { return MakeUnique(); } - case 177: { + case 181: { return MakeUnique(); } - case 178: { + case 182: { return MakeUnique(); } - case 179: { + case 183: { return MakeUnique(); } - case 180: { + case 184: { return MakeUnique(); } - case 181: { + case 185: { return MakeUnique(); } - case 182: { + case 186: { return MakeUnique(); } - case 183: { + case 187: { return MakeUnique(); } - case 184: { + case 188: { return MakeUnique(); } - case 185: { + case 189: { return MakeUnique(); } - case 186: { + case 190: { return MakeUnique(); } - case 187: { + case 191: { return MakeUnique(); } - case 188: { + case 192: { return MakeUnique(); } - case 189: { + case 193: { return MakeUnique(); } - case 190: { + case 194: { return MakeUnique(); } - case 191: { + case 195: { return MakeUnique(); } - case 192: { + case 196: { return MakeUnique(); } - case 193: { + case 197: { return MakeUnique(); } - case 194: { + case 198: { return MakeUnique(); } - case 195: { + case 199: { return MakeUnique(); } - case 196: { + case 200: { return MakeUnique(); } - case 197: { + case 201: { return MakeUnique(); } - case 198: { + case 202: { return MakeUnique(); } - case 199: { + case 203: { return MakeUnique(); } - case 200: { + case 204: { return MakeUnique(); } - case 201: { + case 205: { return MakeUnique(); } - case 202: { + case 206: { return MakeUnique(); } - case 203: { + case 207: { return MakeUnique(); } - case 204: { + case 208: { return MakeUnique(); } - case 205: { + case 209: { return MakeUnique(); } - case 206: { + case 210: { return MakeUnique(); } - case 207: { + case 211: { return MakeUnique(); } - case 208: { + case 212: { return MakeUnique(); } - case 209: { + case 213: { return MakeUnique(); } - case 210: { + case 214: { return MakeUnique(); } - case 211: { + case 215: { return MakeUnique(); } - case 212: { + case 216: { return MakeUnique(); } - case 213: { + case 217: { return MakeUnique(); } - case 214: { + case 218: { return MakeUnique(); } - case 215: { + case 219: { return MakeUnique(); } - case 216: { + case 220: { return MakeUnique(); } - case 217: { + case 221: { return MakeUnique(); } - case 218: { + case 222: { return MakeUnique(); } - case 219: { + case 223: { return MakeUnique(); } - case 220: { + case 224: { return MakeUnique(); } - case 221: { + case 225: { return MakeUnique(); } - case 222: { + case 226: { return MakeUnique(); } - case 223: { + case 227: { return MakeUnique(); } - case 224: { + case 228: { return MakeUnique(); } #endif /* MOZ_UNIFFI_FIXTURES */ @@ -12309,52 +12471,52 @@ UniquePtr GetAsyncCallHandler(uint64_t aId) { #ifdef MOZ_UNIFFI_FIXTURES - case 111: { + case 115: { return MakeUnique(); } - case 114: { + case 118: { return MakeUnique(); } - case 115: { + case 119: { return MakeUnique(); } - case 116: { + case 120: { return MakeUnique(); } - case 117: { + case 121: { return MakeUnique(); } - case 118: { + case 122: { return MakeUnique(); } - case 119: { + case 123: { return MakeUnique(); } - case 120: { + case 124: { return MakeUnique(); } - case 121: { + case 125: { return MakeUnique(); } - case 122: { + case 126: { return MakeUnique(); } - case 123: { + case 127: { return MakeUnique(); } - case 124: { + case 128: { return MakeUnique(); } - case 125: { + case 129: { return MakeUnique(); } - case 126: { + case 130: { return MakeUnique(); } - case 127: { + case 131: { return MakeUnique(); } - case 129: { + case 133: { return MakeUnique(); } #endif /* MOZ_UNIFFI_FIXTURES */