corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 1967446 - Convert uniffi generated Rust modules to use moz-src. r=bdk

Browse Source 
Differential Revision: https://phabricator.services.mozilla.com/D250243
This commit is contained in:
Mark Banner
2025-05-20 18:58:02 +00:00
committed by mbanner@mozilla.com
parent ea86a855fc
commit 0186d5865e
33 changed files with 150 additions and 96 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
browser/components/urlbar/private/AmpSuggestions.sys.mjs
View File

@@ -7,12 +7,14 @@ import { SuggestProvider } from "resource:///modules/urlbar/private/SuggestFeatu
const lazy = {};
ChromeUtils.defineESModuleGetters(lazy, {
AmpMatchingStrategy: "resource://gre/modules/RustSuggest.sys.mjs",
AmpMatchingStrategy:
"moz-src:///toolkit/components/uniffi-bindgen-gecko-js/components/generated/RustSuggest.sys.mjs",
CONTEXTUAL_SERVICES_PING_TYPES:
"resource:///modules/PartnerLinkAttribution.sys.mjs",
ContextId: "moz-src:///browser/modules/ContextId.sys.mjs",
QuickSuggest: "resource:///modules/QuickSuggest.sys.mjs",
rawSuggestionUrlMatches: "resource://gre/modules/RustSuggest.sys.mjs",
rawSuggestionUrlMatches:
"moz-src:///toolkit/components/uniffi-bindgen-gecko-js/components/generated/RustSuggest.sys.mjs",
UrlbarPrefs: "resource:///modules/UrlbarPrefs.sys.mjs",
UrlbarResult: "resource:///modules/UrlbarResult.sys.mjs",
UrlbarUtils: "resource:///modules/UrlbarUtils.sys.mjs",

33
browser/components/urlbar/private/SuggestBackendRust.sys.mjs
View File

@@ -10,20 +10,31 @@ const lazy = {};
ChromeUtils.defineESModuleGetters(lazy, {
AsyncShutdown: "resource://gre/modules/AsyncShutdown.sys.mjs",
InterruptKind: "resource://gre/modules/RustSuggest.sys.mjs",
InterruptKind:
"moz-src:///toolkit/components/uniffi-bindgen-gecko-js/components/generated/RustSuggest.sys.mjs",
ObjectUtils: "resource://gre/modules/ObjectUtils.sys.mjs",
QuickSuggest: "resource:///modules/QuickSuggest.sys.mjs",
Region: "resource://gre/modules/Region.sys.mjs",
RemoteSettingsConfig2: "resource://gre/modules/RustRemoteSettings.sys.mjs",
RemoteSettingsContext: "resource://gre/modules/RustRemoteSettings.sys.mjs",
RemoteSettingsServer: "resource://gre/modules/RustRemoteSettings.sys.mjs",
RemoteSettingsService: "resource://gre/modules/RustRemoteSettings.sys.mjs",
SuggestIngestionConstraints: "resource://gre/modules/RustSuggest.sys.mjs",
SuggestStoreBuilder: "resource://gre/modules/RustSuggest.sys.mjs",
Suggestion: "resource://gre/modules/RustSuggest.sys.mjs",
SuggestionProvider: "resource://gre/modules/RustSuggest.sys.mjs",
SuggestionProviderConstraints: "resource://gre/modules/RustSuggest.sys.mjs",
SuggestionQuery: "resource://gre/modules/RustSuggest.sys.mjs",
RemoteSettingsConfig2:
"moz-src:///toolkit/components/uniffi-bindgen-gecko-js/components/generated/RustRemoteSettings.sys.mjs",
RemoteSettingsContext:
"moz-src:///toolkit/components/uniffi-bindgen-gecko-js/components/generated/RustRemoteSettings.sys.mjs",
RemoteSettingsServer:
"moz-src:///toolkit/components/uniffi-bindgen-gecko-js/components/generated/RustRemoteSettings.sys.mjs",
RemoteSettingsService:
"moz-src:///toolkit/components/uniffi-bindgen-gecko-js/components/generated/RustRemoteSettings.sys.mjs",
SuggestIngestionConstraints:
"moz-src:///toolkit/components/uniffi-bindgen-gecko-js/components/generated/RustSuggest.sys.mjs",
SuggestStoreBuilder:
"moz-src:///toolkit/components/uniffi-bindgen-gecko-js/components/generated/RustSuggest.sys.mjs",
Suggestion:
"moz-src:///toolkit/components/uniffi-bindgen-gecko-js/components/generated/RustSuggest.sys.mjs",
SuggestionProvider:
"moz-src:///toolkit/components/uniffi-bindgen-gecko-js/components/generated/RustSuggest.sys.mjs",
SuggestionProviderConstraints:
"moz-src:///toolkit/components/uniffi-bindgen-gecko-js/components/generated/RustSuggest.sys.mjs",
SuggestionQuery:
"moz-src:///toolkit/components/uniffi-bindgen-gecko-js/components/generated/RustSuggest.sys.mjs",
TaskQueue: "resource:///modules/UrlbarUtils.sys.mjs",
UrlbarPrefs: "resource:///modules/UrlbarPrefs.sys.mjs",
Utils: "resource://services-settings/Utils.sys.mjs",

9
browser/components/urlbar/private/YelpSuggestions.sys.mjs
View File

@@ -9,13 +9,16 @@ const lazy = {};
ChromeUtils.defineESModuleGetters(lazy, {
GeolocationUtils:
"resource:///modules/urlbar/private/GeolocationUtils.sys.mjs",
GeonameMatchType: "resource://gre/modules/RustSuggest.sys.mjs",
GeonameType: "resource://gre/modules/RustSuggest.sys.mjs",
GeonameMatchType:
"moz-src:///toolkit/components/uniffi-bindgen-gecko-js/components/generated/RustSuggest.sys.mjs",
GeonameType:
"moz-src:///toolkit/components/uniffi-bindgen-gecko-js/components/generated/RustSuggest.sys.mjs",
QuickSuggest: "resource:///modules/QuickSuggest.sys.mjs",
UrlbarPrefs: "resource:///modules/UrlbarPrefs.sys.mjs",
UrlbarResult: "resource:///modules/UrlbarResult.sys.mjs",
UrlbarUtils: "resource:///modules/UrlbarUtils.sys.mjs",
YelpSubjectType: "resource://gre/modules/RustSuggest.sys.mjs",
YelpSubjectType:
"moz-src:///toolkit/components/uniffi-bindgen-gecko-js/components/generated/RustSuggest.sys.mjs",
});
const RESULT_MENU_COMMAND = {

6
browser/components/urlbar/tests/quicksuggest/QuickSuggestTestUtils.sys.mjs
View File

@@ -14,11 +14,13 @@ ChromeUtils.defineESModuleGetters(lazy, {
RemoteSettingsServer:
"resource://testing-common/RemoteSettingsServer.sys.mjs",
SearchUtils: "moz-src:///toolkit/components/search/SearchUtils.sys.mjs",
Suggestion: "resource://gre/modules/RustSuggest.sys.mjs",
Suggestion:
"moz-src:///toolkit/components/uniffi-bindgen-gecko-js/components/generated/RustSuggest.sys.mjs",
TestUtils: "resource://testing-common/TestUtils.sys.mjs",
UrlbarPrefs: "resource:///modules/UrlbarPrefs.sys.mjs",
UrlbarUtils: "resource:///modules/UrlbarUtils.sys.mjs",
YelpSubjectType: "resource://gre/modules/RustSuggest.sys.mjs",
YelpSubjectType:
"moz-src:///toolkit/components/uniffi-bindgen-gecko-js/components/generated/RustSuggest.sys.mjs",
setTimeout: "resource://gre/modules/Timer.sys.mjs",
});

6
browser/components/urlbar/tests/quicksuggest/unit/test_quicksuggest.js
View File

@@ -8,9 +8,11 @@
"use strict";
ChromeUtils.defineESModuleGetters(this, {
AmpMatchingStrategy: "resource://gre/modules/RustSuggest.sys.mjs",
AmpMatchingStrategy:
"moz-src:///toolkit/components/uniffi-bindgen-gecko-js/components/generated/RustSuggest.sys.mjs",
AmpSuggestions: "resource:///modules/urlbar/private/AmpSuggestions.sys.mjs",
SuggestionProvider: "resource://gre/modules/RustSuggest.sys.mjs",
SuggestionProvider:
"moz-src:///toolkit/components/uniffi-bindgen-gecko-js/components/generated/RustSuggest.sys.mjs",
});
const SPONSORED_SEARCH_STRING = "amp";

3
browser/components/urlbar/tests/quicksuggest/unit/test_quicksuggest_fakespot.js
View File

@@ -7,7 +7,8 @@
"use strict";
ChromeUtils.defineESModuleGetters(this, {
Suggestion: "resource://gre/modules/RustSuggest.sys.mjs",
Suggestion:
"moz-src:///toolkit/components/uniffi-bindgen-gecko-js/components/generated/RustSuggest.sys.mjs",
});
const REMOTE_SETTINGS_RECORDS = [

3
browser/components/urlbar/tests/quicksuggest/unit/test_quicksuggest_pocket.js
View File

@@ -7,7 +7,8 @@
"use strict";
ChromeUtils.defineESModuleGetters(this, {
Suggestion: "resource://gre/modules/RustSuggest.sys.mjs",
Suggestion:
"moz-src:///toolkit/components/uniffi-bindgen-gecko-js/components/generated/RustSuggest.sys.mjs",
});
const LOW_KEYWORD = "low one two";

3
browser/components/urlbar/tests/quicksuggest/unit/test_quicksuggest_relevanceRanking.js
View File

@@ -11,7 +11,8 @@ const lazy = {};
ChromeUtils.defineESModuleGetters(lazy, {
ContentRelevancyManager:
"resource://gre/modules/ContentRelevancyManager.sys.mjs",
InterestVector: "resource://gre/modules/RustRelevancy.sys.mjs",
InterestVector:
"moz-src:///toolkit/components/uniffi-bindgen-gecko-js/components/generated/RustRelevancy.sys.mjs",
});
const PREF_CONTENT_RELEVANCY_ENABLED = "toolkit.contentRelevancy.enabled";

9
browser/components/urlbar/tests/quicksuggest/unit/test_rust_ingest.js
View File

@@ -8,10 +8,13 @@
ChromeUtils.defineESModuleGetters(this, {
AsyncShutdown: "resource://gre/modules/AsyncShutdown.sys.mjs",
InterruptKind: "resource://gre/modules/RustSuggest.sys.mjs",
InterruptKind:
"moz-src:///toolkit/components/uniffi-bindgen-gecko-js/components/generated/RustSuggest.sys.mjs",
setTimeout: "resource://gre/modules/Timer.sys.mjs",
SuggestIngestionMetrics: "resource://gre/modules/RustSuggest.sys.mjs",
SuggestionProvider: "resource://gre/modules/RustSuggest.sys.mjs",
SuggestIngestionMetrics:
"moz-src:///toolkit/components/uniffi-bindgen-gecko-js/components/generated/RustSuggest.sys.mjs",
SuggestionProvider:
"moz-src:///toolkit/components/uniffi-bindgen-gecko-js/components/generated/RustSuggest.sys.mjs",
});
// These consts are copied from the update timer manager test. See

2
browser/modules/ContextId.sys.mjs
View File

@@ -3,7 +3,7 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
import { XPCOMUtils } from "resource://gre/modules/XPCOMUtils.sys.mjs";
import { ContextIdComponent } from "resource://gre/modules/RustContextId.sys.mjs";
import { ContextIdComponent } from "moz-src:///toolkit/components/uniffi-bindgen-gecko-js/components/generated/RustContextId.sys.mjs";
const CONTEXT_ID_PREF = "browser.contextual-services.contextId";
const CONTEXT_ID_TIMESTAMP_PREF =

2
docs/rust-components/developing-rust-components/uniffi.md
View File

@@ -66,7 +66,7 @@ Here's how you can create a new set of bindings using UniFFI:
``` js
ChromeUtils.defineESModuleGetters(lazy, {
...
TabsStore: "resource://gre/modules/RustTabs.sys.mjs",
TabsStore: "moz-src:///toolkit/components/uniffi-bindgen-gecko-js/components/generated/RustTabs.sys.mjs",
});
...
this._rustStore = await lazy.TabsStore.init(path);

2
docs/rust-components/topic-guides/relevancy.md
View File

@@ -36,7 +36,7 @@ let store = RelevancyStore(dbPath: "path/to/database")
```js
ChromeUtils.defineESModuleGetters(lazy, {
RelevancyStore: "resource://gre/modules/RustSuggest.sys.mjs",
RelevancyStore: "moz-src:///toolkit/components/uniffi-bindgen-gecko-js/components/generated/RustSuggest.sys.mjs",
});
const store = RelevancyStore.init(dbPath);

16
docs/rust-components/topic-guides/suggest.md
View File

@@ -38,14 +38,14 @@ import MozillaAppServices
```js
ChromeUtils.defineESModuleGetters(lazy, {
RemoteSettingsServer: "resource://gre/modules/RustSuggest.sys.mjs",
SuggestApiException: "resource://gre/modules/RustSuggest.sys.mjs",
SuggestIngestionConstraints: "resource://gre/modules/RustSuggest.sys.mjs",
SuggestStore: "resource://gre/modules/RustSuggest.sys.mjs",
SuggestStoreBuilder: "resource://gre/modules/RustSuggest.sys.mjs",
Suggestion: "resource://gre/modules/RustSuggest.sys.mjs",
SuggestionProvider: "resource://gre/modules/RustSuggest.sys.mjs",
SuggestionQuery: "resource://gre/modules/RustSuggest.sys.mjs",
RemoteSettingsServer: "moz-src:///toolkit/components/uniffi-bindgen-gecko-js/components/generated/RustSuggest.sys.mjs",
SuggestApiException: "moz-src:///toolkit/components/uniffi-bindgen-gecko-js/components/generated/RustSuggest.sys.mjs",
SuggestIngestionConstraints: "moz-src:///toolkit/components/uniffi-bindgen-gecko-js/components/generated/RustSuggest.sys.mjs",
SuggestStore: "moz-src:///toolkit/components/uniffi-bindgen-gecko-js/components/generated/RustSuggest.sys.mjs",
SuggestStoreBuilder: "moz-src:///toolkit/components/uniffi-bindgen-gecko-js/components/generated/RustSuggest.sys.mjs",
Suggestion: "moz-src:///toolkit/components/uniffi-bindgen-gecko-js/components/generated/RustSuggest.sys.mjs",
SuggestionProvider: "moz-src:///toolkit/components/uniffi-bindgen-gecko-js/components/generated/RustSuggest.sys.mjs",
SuggestionQuery: "moz-src:///toolkit/components/uniffi-bindgen-gecko-js/components/generated/RustSuggest.sys.mjs",
});
```

5
services/sync/modules/TabsStore.sys.mjs
View File

@@ -6,7 +6,8 @@ const lazy = {};
ChromeUtils.defineESModuleGetters(lazy, {
AsyncShutdown: "resource://gre/modules/AsyncShutdown.sys.mjs",
TabsStore: "resource://gre/modules/RustTabs.sys.mjs",
TabsStore:
"moz-src:///toolkit/components/uniffi-bindgen-gecko-js/components/generated/RustTabs.sys.mjs",
});
var storePromise = null;
@@ -41,4 +42,4 @@ export async function getRemoteCommandStore() {
export {
RemoteCommand,
PendingCommand,
} from "resource://gre/modules/RustTabs.sys.mjs";
} from "moz-src:///toolkit/components/uniffi-bindgen-gecko-js/components/generated/RustTabs.sys.mjs";

3
services/sync/modules/engines/tabs.sys.mjs
View File

@@ -30,7 +30,8 @@ ChromeUtils.defineESModuleGetters(lazy, {
PrivateBrowsingUtils: "resource://gre/modules/PrivateBrowsingUtils.sys.mjs",
ReaderMode: "moz-src:///toolkit/components/reader/ReaderMode.sys.mjs",
getTabsStore: "resource://services-sync/TabsStore.sys.mjs",
RemoteTabRecord: "resource://gre/modules/RustTabs.sys.mjs",
RemoteTabRecord:
"moz-src:///toolkit/components/uniffi-bindgen-gecko-js/components/generated/RustTabs.sys.mjs",
});
XPCOMUtils.defineLazyPreferenceGetter(

18
toolkit/components/contentrelevancy/ContentRelevancyManager.sys.mjs
View File

@@ -11,12 +11,18 @@ ChromeUtils.defineESModuleGetters(lazy, {
"resource://gre/modules/contentrelevancy/private/InputUtils.sys.mjs",
AsyncShutdown: "resource://gre/modules/AsyncShutdown.sys.mjs",
NimbusFeatures: "resource://nimbus/ExperimentAPI.sys.mjs",
Interest: "resource://gre/modules/RustRelevancy.sys.mjs",
InterestVector: "resource://gre/modules/RustRelevancy.sys.mjs",
RelevancyStore: "resource://gre/modules/RustRelevancy.sys.mjs",
RemoteSettingsConfig2: "resource://gre/modules/RustRemoteSettings.sys.mjs",
RemoteSettingsService: "resource://gre/modules/RustRemoteSettings.sys.mjs",
score: "resource://gre/modules/RustRelevancy.sys.mjs",
Interest:
"moz-src:///toolkit/components/uniffi-bindgen-gecko-js/components/generated/RustRelevancy.sys.mjs",
InterestVector:
"moz-src:///toolkit/components/uniffi-bindgen-gecko-js/components/generated/RustRelevancy.sys.mjs",
RelevancyStore:
"moz-src:///toolkit/components/uniffi-bindgen-gecko-js/components/generated/RustRelevancy.sys.mjs",
RemoteSettingsConfig2:
"moz-src:///toolkit/components/uniffi-bindgen-gecko-js/components/generated/RustRemoteSettings.sys.mjs",
RemoteSettingsService:
"moz-src:///toolkit/components/uniffi-bindgen-gecko-js/components/generated/RustRemoteSettings.sys.mjs",
score:
"moz-src:///toolkit/components/uniffi-bindgen-gecko-js/components/generated/RustRelevancy.sys.mjs",
});
XPCOMUtils.defineLazyServiceGetter(

6
toolkit/components/contentrelevancy/tests/xpcshell/test_InterestVectorBasedScoring.js
View File

@@ -6,8 +6,10 @@
ChromeUtils.defineESModuleGetters(this, {
ContentRelevancyManager:
"resource://gre/modules/ContentRelevancyManager.sys.mjs",
Interest: "resource://gre/modules/RustRelevancy.sys.mjs",
InterestVector: "resource://gre/modules/RustRelevancy.sys.mjs",
Interest:
"moz-src:///toolkit/components/uniffi-bindgen-gecko-js/components/generated/RustRelevancy.sys.mjs",
InterestVector:
"moz-src:///toolkit/components/uniffi-bindgen-gecko-js/components/generated/RustRelevancy.sys.mjs",
sinon: "resource://testing-common/Sinon.sys.mjs",
});

3
toolkit/components/extensions/ExtensionStorageSync.sys.mjs
View File

@@ -12,7 +12,8 @@ const lazy = XPCOMUtils.declareLazy({
ExtensionUtils: "resource://gre/modules/ExtensionUtils.sys.mjs",
storageSyncService:
"resource://gre/modules/ExtensionStorageComponents.sys.mjs",
QuotaError: "resource://gre/modules/RustWebextstorage.sys.mjs",
QuotaError:
"moz-src:///toolkit/components/uniffi-bindgen-gecko-js/components/generated/RustWebextstorage.sys.mjs",
});
// The backing implementation of the browser.storage.sync web extension API.

3
toolkit/components/extensions/storage/ExtensionStorageComponents.sys.mjs
View File

@@ -6,7 +6,8 @@ const lazy = {};
ChromeUtils.defineESModuleGetters(lazy, {
AsyncShutdown: "resource://gre/modules/AsyncShutdown.sys.mjs",
WebExtStorageStore: "resource://gre/modules/RustWebextstorage.sys.mjs",
WebExtStorageStore:
"moz-src:///toolkit/components/uniffi-bindgen-gecko-js/components/generated/RustWebextstorage.sys.mjs",
});
function StorageSyncService() {}

3
toolkit/components/extensions/test/xpcshell/test_StorageSyncService.js
View File

@@ -6,7 +6,8 @@
ChromeUtils.defineESModuleGetters(this, {
extensionStorageSync: "resource://gre/modules/ExtensionStorageSync.sys.mjs",
Service: "resource://services-sync/service.sys.mjs",
QuotaError: "resource://gre/modules/RustWebextstorage.sys.mjs",
QuotaError:
"moz-src:///toolkit/components/uniffi-bindgen-gecko-js/components/generated/RustWebextstorage.sys.mjs",
});
const { ExtensionStorageEngineBridge } = ChromeUtils.importESModule(

3
toolkit/components/search/AppProvidedSearchEngine.sys.mjs
View File

@@ -25,7 +25,8 @@ ChromeUtils.defineESModuleGetters(lazy, {
NimbusFeatures: "resource://nimbus/ExperimentAPI.sys.mjs",
ObjectUtils: "resource://gre/modules/ObjectUtils.sys.mjs",
RemoteSettings: "resource://services-settings/remote-settings.sys.mjs",
SearchEngineClassification: "resource://gre/modules/RustSearch.sys.mjs",
SearchEngineClassification:
"moz-src:///toolkit/components/uniffi-bindgen-gecko-js/components/generated/RustSearch.sys.mjs",
SearchUtils: "moz-src:///toolkit/components/search/SearchUtils.sys.mjs",
});

15
toolkit/components/search/SearchEngineSelector.sys.mjs
View File

@@ -13,11 +13,16 @@ const lazy = {};
ChromeUtils.defineESModuleGetters(lazy, {
RemoteSettings: "resource://services-settings/remote-settings.sys.mjs",
SearchDeviceType: "resource://gre/modules/RustSearch.sys.mjs",
SearchEngineSelector: "resource://gre/modules/RustSearch.sys.mjs",
SearchUserEnvironment: "resource://gre/modules/RustSearch.sys.mjs",
SearchApplicationName: "resource://gre/modules/RustSearch.sys.mjs",
SearchUpdateChannel: "resource://gre/modules/RustSearch.sys.mjs",
SearchDeviceType:
"moz-src:///toolkit/components/uniffi-bindgen-gecko-js/components/generated/RustSearch.sys.mjs",
SearchEngineSelector:
"moz-src:///toolkit/components/uniffi-bindgen-gecko-js/components/generated/RustSearch.sys.mjs",
SearchUserEnvironment:
"moz-src:///toolkit/components/uniffi-bindgen-gecko-js/components/generated/RustSearch.sys.mjs",
SearchApplicationName:
"moz-src:///toolkit/components/uniffi-bindgen-gecko-js/components/generated/RustSearch.sys.mjs",
SearchUpdateChannel:
"moz-src:///toolkit/components/uniffi-bindgen-gecko-js/components/generated/RustSearch.sys.mjs",
SearchUtils: "moz-src:///toolkit/components/search/SearchUtils.sys.mjs",
});

3
toolkit/components/search/tests/xpcshell/head_search.js
View File

@@ -14,7 +14,8 @@ ChromeUtils.defineESModuleGetters(this, {
RemoteSettings: "resource://services-settings/remote-settings.sys.mjs",
RemoteSettingsClient:
"resource://services-settings/RemoteSettingsClient.sys.mjs",
SearchEngineClassification: "resource://gre/modules/RustSearch.sys.mjs",
SearchEngineClassification:
"moz-src:///toolkit/components/uniffi-bindgen-gecko-js/components/generated/RustSearch.sys.mjs",
SearchEngineSelector:
"moz-src:///toolkit/components/search/SearchEngineSelector.sys.mjs",
SearchService: "resource://gre/modules/SearchService.sys.mjs",

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

@@ -1964,7 +1964,7 @@ export class FfiConverterSequenceTypeInterest extends FfiConverterArrayBuffer {
import {
FfiConverterTypeRemoteSettingsService,
RemoteSettingsService,
} from "resource://gre/modules/RustRemoteSettings.sys.mjs";
} from "moz-src:///toolkit/components/uniffi-bindgen-gecko-js/components/generated/RustRemoteSettings.sys.mjs";
// Export the FFIConverter object to make external types work.
export { FfiConverterTypeRemoteSettingsService, RemoteSettingsService };

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

@@ -2740,7 +2740,7 @@ export class FfiConverterSequenceTypeSearchUrlParam extends FfiConverterArrayBuf
import {
FfiConverterTypeRemoteSettingsService,
RemoteSettingsService,
} from "resource://gre/modules/RustRemoteSettings.sys.mjs";
} from "moz-src:///toolkit/components/uniffi-bindgen-gecko-js/components/generated/RustRemoteSettings.sys.mjs";
// Export the FFIConverter object to make external types work.
export { FfiConverterTypeRemoteSettingsService, RemoteSettingsService };

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

@@ -4348,13 +4348,13 @@ export class FfiConverterTypeJsonValue extends FfiConverter {
import {
FfiConverterTypeRemoteSettingsService,
RemoteSettingsService,
} from "resource://gre/modules/RustRemoteSettings.sys.mjs";
} from "moz-src:///toolkit/components/uniffi-bindgen-gecko-js/components/generated/RustRemoteSettings.sys.mjs";
// Export the FFIConverter object to make external types work.
export { FfiConverterTypeRemoteSettingsService, RemoteSettingsService };import {
FfiConverterTypeRemoteSettingsServer,
RemoteSettingsServer,
} from "resource://gre/modules/RustRemoteSettings.sys.mjs";
} from "moz-src:///toolkit/components/uniffi-bindgen-gecko-js/components/generated/RustRemoteSettings.sys.mjs";
// Export the FFIConverter object to make external types work.
export { FfiConverterTypeRemoteSettingsServer, RemoteSettingsServer };

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

@@ -2151,7 +2151,7 @@ export class FfiConverterTypeTimestamp extends FfiConverter {
import {
FfiConverterTypeDeviceType,
DeviceType,
} from "resource://gre/modules/RustSync15.sys.mjs";
} from "moz-src:///toolkit/components/uniffi-bindgen-gecko-js/components/generated/RustSync15.sys.mjs";
// Export the FFIConverter object to make external types work.
export { FfiConverterTypeDeviceType, DeviceType };

2
toolkit/components/uniffi-bindgen-gecko-js/components/moz.build
View File

@@ -4,7 +4,7 @@
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
EXTRA_JS_MODULES += [
MOZ_SRC_FILES += [
"generated/RustContextId.sys.mjs",
"generated/RustRelevancy.sys.mjs",
"generated/RustRemoteSettings.sys.mjs",

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

@@ -394,19 +394,19 @@ export class FfiConverterOptionalTypePoint extends FfiConverterArrayBuffer {
import {
FfiConverterTypeSprite,
Sprite,
} from "resource://gre/modules/RustSprites.sys.mjs";
} from "moz-src:///toolkit/components/uniffi-bindgen-gecko-js/components/generated/RustSprites.sys.mjs";
// Export the FFIConverter object to make external types work.
export { FfiConverterTypeSprite, Sprite };import {
FfiConverterTypeLine,
Line,
} from "resource://gre/modules/RustGeometry.sys.mjs";
} from "moz-src:///toolkit/components/uniffi-bindgen-gecko-js/components/generated/RustGeometry.sys.mjs";
// Export the FFIConverter object to make external types work.
export { FfiConverterTypeLine, Line };import {
FfiConverterTypePoint,
Point,
} from "resource://gre/modules/RustGeometry.sys.mjs";
} from "moz-src:///toolkit/components/uniffi-bindgen-gecko-js/components/generated/RustGeometry.sys.mjs";
// Export the FFIConverter object to make external types work.
export { FfiConverterTypePoint, Point };

4
toolkit/components/uniffi-bindgen-gecko-js/src/lib.rs
View File

@@ -100,6 +100,7 @@ fn render_js(
function_ids: &FunctionIds,
object_ids: &ObjectIds,
callback_ids: &CallbackIds,
js_dir: &Utf8PathBuf,
) -> Result<()> {
for c in components {
let template = JSBindingsTemplate {
@@ -108,6 +109,7 @@ fn render_js(
function_ids,
object_ids,
callback_ids,
js_dir,
};
let path = out_dir.join(template.js_module_name());
render(path, template)?;
@@ -136,6 +138,7 @@ pub fn run_main() -> Result<()> {
&function_ids,
&object_ids,
&callback_ids,
&args.js_dir,
)?;
render_js(
&args.fixture_js_dir,
@@ -143,6 +146,7 @@ pub fn run_main() -> Result<()> {
&function_ids,
&object_ids,
&callback_ids,
&args.js_dir,
)?;
docs::render_docs(&args.docs_path, &components.components)?;

10
toolkit/components/uniffi-bindgen-gecko-js/src/render/js.rs
View File

@@ -5,6 +5,7 @@ License, v. 2.0. If a copy of the MPL was not distributed with this
use super::shared::*;
use crate::{CallbackIds, Config, FunctionIds, ObjectIds};
use askama::Template;
use camino::Utf8PathBuf;
use extend::ext;
use heck::{ToLowerCamelCase, ToShoutySnakeCase, ToUpperCamelCase};
use uniffi_bindgen::interface::{
@@ -46,6 +47,7 @@ pub struct JSBindingsTemplate<'a> {
pub function_ids: &'a FunctionIds<'a>,
pub object_ids: &'a ObjectIds<'a>,
pub callback_ids: &'a CallbackIds<'a>,
pub js_dir: &'a Utf8PathBuf,
}
impl JSBindingsTemplate<'_> {
@@ -55,7 +57,8 @@ impl JSBindingsTemplate<'_> {
fn external_type_module(&self, crate_name: &str) -> String {
format!(
"resource://gre/modules/{}",
"moz-src:///{}/{}",
self.js_dir,
self.js_module_name_for_crate_name(crate_name),
)
}
@@ -332,7 +335,10 @@ pub impl Enum {
match self.variant_discr(*idx) {
Ok(Literal::UInt(v, _, _)) => Ok(v),
Ok(Literal::Int(v, _, _)) if v >= 0 => Ok(v as u64),
Ok(other) => Err(format!("Unexpected literal type for enum discriminant: {:?}", other)),
Ok(other) => Err(format!(
"Unexpected literal type for enum discriminant: {:?}",
other
)),
Err(e) => Err(format!("Failed to get discriminant: {}", e)),
}
}

16
tools/@types/generated/lib.gecko.modules.d.ts vendored
View File

@@ -214,6 +214,7 @@ export interface LazyModules {
"moz-src:///browser/components/tabbrowser/TabMetrics.sys.mjs": typeof import("moz-src:///browser/components/tabbrowser/TabMetrics.sys.mjs"),
"moz-src:///browser/components/tabbrowser/TabsList.sys.mjs": typeof import("moz-src:///browser/components/tabbrowser/TabsList.sys.mjs"),
"moz-src:///browser/components/uitour/UITour.sys.mjs": typeof import("moz-src:///browser/components/uitour/UITour.sys.mjs"),
"moz-src:///browser/modules/ContextId.sys.mjs": typeof import("moz-src:///browser/modules/ContextId.sys.mjs"),
"moz-src:///browser/themes/ToolbarIconColor.sys.mjs": typeof import("moz-src:///browser/themes/ToolbarIconColor.sys.mjs"),
"moz-src:///toolkit/components/reader/AboutReader.sys.mjs": typeof import("moz-src:///toolkit/components/reader/AboutReader.sys.mjs"),
"moz-src:///toolkit/components/reader/ReaderMode.sys.mjs": typeof import("moz-src:///toolkit/components/reader/ReaderMode.sys.mjs"),
@@ -231,6 +232,12 @@ export interface LazyModules {
"moz-src:///toolkit/components/search/SearchSuggestionController.sys.mjs": typeof import("moz-src:///toolkit/components/search/SearchSuggestionController.sys.mjs"),
"moz-src:///toolkit/components/search/SearchUtils.sys.mjs": typeof import("moz-src:///toolkit/components/search/SearchUtils.sys.mjs"),
"moz-src:///toolkit/components/search/UserSearchEngine.sys.mjs": typeof import("moz-src:///toolkit/components/search/UserSearchEngine.sys.mjs"),
"moz-src:///toolkit/components/uniffi-bindgen-gecko-js/components/generated/RustRelevancy.sys.mjs": typeof import("moz-src:///toolkit/components/uniffi-bindgen-gecko-js/components/generated/RustRelevancy.sys.mjs"),
"moz-src:///toolkit/components/uniffi-bindgen-gecko-js/components/generated/RustRemoteSettings.sys.mjs": typeof import("moz-src:///toolkit/components/uniffi-bindgen-gecko-js/components/generated/RustRemoteSettings.sys.mjs"),
"moz-src:///toolkit/components/uniffi-bindgen-gecko-js/components/generated/RustSearch.sys.mjs": typeof import("moz-src:///toolkit/components/uniffi-bindgen-gecko-js/components/generated/RustSearch.sys.mjs"),
"moz-src:///toolkit/components/uniffi-bindgen-gecko-js/components/generated/RustSuggest.sys.mjs": typeof import("moz-src:///toolkit/components/uniffi-bindgen-gecko-js/components/generated/RustSuggest.sys.mjs"),
"moz-src:///toolkit/components/uniffi-bindgen-gecko-js/components/generated/RustTabs.sys.mjs": typeof import("moz-src:///toolkit/components/uniffi-bindgen-gecko-js/components/generated/RustTabs.sys.mjs"),
"moz-src:///toolkit/components/uniffi-bindgen-gecko-js/components/generated/RustWebextstorage.sys.mjs": typeof import("moz-src:///toolkit/components/uniffi-bindgen-gecko-js/components/generated/RustWebextstorage.sys.mjs"),
"resource:///actors/AboutNewTabParent.sys.mjs": typeof import("resource:///actors/AboutNewTabParent.sys.mjs"),
"resource:///actors/AboutReaderParent.sys.mjs": typeof import("resource:///actors/AboutReaderParent.sys.mjs"),
"resource:///actors/AboutWelcomeParent.sys.mjs": typeof import("resource:///actors/AboutWelcomeParent.sys.mjs"),
@@ -693,12 +700,6 @@ export interface LazyModules {
"resource://gre/modules/RemoteSettingsCrashPull.sys.mjs": typeof import("resource://gre/modules/RemoteSettingsCrashPull.sys.mjs"),
"resource://gre/modules/RemoteWebNavigation.sys.mjs": typeof import("resource://gre/modules/RemoteWebNavigation.sys.mjs"),
"resource://gre/modules/ResetProfile.sys.mjs": typeof import("resource://gre/modules/ResetProfile.sys.mjs"),
"resource://gre/modules/RustRelevancy.sys.mjs": typeof import("resource://gre/modules/RustRelevancy.sys.mjs"),
"resource://gre/modules/RustRemoteSettings.sys.mjs": typeof import("resource://gre/modules/RustRemoteSettings.sys.mjs"),
"resource://gre/modules/RustSearch.sys.mjs": typeof import("resource://gre/modules/RustSearch.sys.mjs"),
"resource://gre/modules/RustSuggest.sys.mjs": typeof import("resource://gre/modules/RustSuggest.sys.mjs"),
"resource://gre/modules/RustTabs.sys.mjs": typeof import("resource://gre/modules/RustTabs.sys.mjs"),
"resource://gre/modules/RustWebextstorage.sys.mjs": typeof import("resource://gre/modules/RustWebextstorage.sys.mjs"),
"resource://gre/modules/SafeBrowsing.sys.mjs": typeof import("resource://gre/modules/SafeBrowsing.sys.mjs"),
"resource://gre/modules/SandboxUtils.sys.mjs": typeof import("resource://gre/modules/SandboxUtils.sys.mjs"),
"resource://gre/modules/Schemas.sys.mjs": typeof import("resource://gre/modules/Schemas.sys.mjs"),
@@ -813,6 +814,8 @@ export interface LazyModules {
"resource://newtab/lib/DownloadsManager.sys.mjs": typeof import("resource://newtab/lib/DownloadsManager.sys.mjs"),
"resource://newtab/lib/FaviconFeed.sys.mjs": typeof import("resource://newtab/lib/FaviconFeed.sys.mjs"),
"resource://newtab/lib/HighlightsFeed.sys.mjs": typeof import("resource://newtab/lib/HighlightsFeed.sys.mjs"),
"resource://newtab/lib/InferredModel/FeatureModel.sys.mjs": typeof import("resource://newtab/lib/InferredModel/FeatureModel.sys.mjs"),
"resource://newtab/lib/InferredPersonalizationFeed.sys.mjs": typeof import("resource://newtab/lib/InferredPersonalizationFeed.sys.mjs"),
"resource://newtab/lib/NewTabGleanUtils.sys.mjs": typeof import("resource://newtab/lib/NewTabGleanUtils.sys.mjs"),
"resource://newtab/lib/NewTabInit.sys.mjs": typeof import("resource://newtab/lib/NewTabInit.sys.mjs"),
"resource://newtab/lib/NewTabMessaging.sys.mjs": typeof import("resource://newtab/lib/NewTabMessaging.sys.mjs"),
@@ -949,6 +952,7 @@ export interface LazyModules {
"resource://testing-common/PlacesTestUtils.sys.mjs": typeof import("resource://testing-common/PlacesTestUtils.sys.mjs"),
"resource://testing-common/PromiseTestUtils.sys.mjs": typeof import("resource://testing-common/PromiseTestUtils.sys.mjs"),
"resource://testing-common/PromptTestUtils.sys.mjs": typeof import("resource://testing-common/PromptTestUtils.sys.mjs"),
"resource://testing-common/QuickSuggestTestUtils.sys.mjs": typeof import("resource://testing-common/QuickSuggestTestUtils.sys.mjs"),
"resource://testing-common/RegionTestUtils.sys.mjs": typeof import("resource://testing-common/RegionTestUtils.sys.mjs"),
"resource://testing-common/RemoteSettingsServer.sys.mjs": typeof import("resource://testing-common/RemoteSettingsServer.sys.mjs"),
"resource://testing-common/SearchTestUtils.sys.mjs": typeof import("resource://testing-common/SearchTestUtils.sys.mjs"),

36
tools/@types/generated/tspaths.json
View File

@@ -266,9 +266,15 @@
"chrome://global/content/elements/moz-toggle.mjs": [
"toolkit/content/widgets/moz-toggle/moz-toggle.mjs"
],
"chrome://global/content/elements/moz-visual-picker.mjs": [
"toolkit/content/widgets/moz-visual-picker/moz-visual-picker.mjs"
],
"chrome://global/content/elements/panel-list.js": [
"toolkit/content/widgets/panel-list/panel-list.js"
],
"chrome://global/content/lit-select-control.mjs": [
"toolkit/content/widgets/lit-select-control.mjs"
],
"chrome://global/content/lit-utils.mjs": [
"toolkit/content/widgets/lit-utils.mjs"
],
@@ -6323,39 +6329,18 @@
"resource://gre/modules/RustRefcounts.sys.mjs": [
"toolkit/components/uniffi-bindgen-gecko-js/fixtures/generated/RustRefcounts.sys.mjs"
],
"resource://gre/modules/RustRelevancy.sys.mjs": [
"toolkit/components/uniffi-bindgen-gecko-js/components/generated/RustRelevancy.sys.mjs"
],
"resource://gre/modules/RustRemoteSettings.sys.mjs": [
"toolkit/components/uniffi-bindgen-gecko-js/components/generated/RustRemoteSettings.sys.mjs"
],
"resource://gre/modules/RustRondpoint.sys.mjs": [
"toolkit/components/uniffi-bindgen-gecko-js/fixtures/generated/RustRondpoint.sys.mjs"
],
"resource://gre/modules/RustSearch.sys.mjs": [
"toolkit/components/uniffi-bindgen-gecko-js/components/generated/RustSearch.sys.mjs"
],
"resource://gre/modules/RustSprites.sys.mjs": [
"toolkit/components/uniffi-bindgen-gecko-js/fixtures/generated/RustSprites.sys.mjs"
],
"resource://gre/modules/RustSuggest.sys.mjs": [
"toolkit/components/uniffi-bindgen-gecko-js/components/generated/RustSuggest.sys.mjs"
],
"resource://gre/modules/RustSync15.sys.mjs": [
"toolkit/components/uniffi-bindgen-gecko-js/components/generated/RustSync15.sys.mjs"
],
"resource://gre/modules/RustTabs.sys.mjs": [
"toolkit/components/uniffi-bindgen-gecko-js/components/generated/RustTabs.sys.mjs"
],
"resource://gre/modules/RustTodolist.sys.mjs": [
"toolkit/components/uniffi-bindgen-gecko-js/fixtures/generated/RustTodolist.sys.mjs"
],
"resource://gre/modules/RustUniffiTraitInterfaces.sys.mjs": [
"toolkit/components/uniffi-bindgen-gecko-js/fixtures/generated/RustUniffiTraitInterfaces.sys.mjs"
],
"resource://gre/modules/RustWebextstorage.sys.mjs": [
"toolkit/components/uniffi-bindgen-gecko-js/components/generated/RustWebextstorage.sys.mjs"
],
"resource://gre/modules/SafeBrowsing.sys.mjs": [
"toolkit/components/url-classifier/SafeBrowsing.sys.mjs"
],
@@ -6839,6 +6824,15 @@
"resource://newtab/lib/HighlightsFeed.sys.mjs": [
"browser/extensions/newtab/lib/HighlightsFeed.sys.mjs"
],
"resource://newtab/lib/InferredModel/FeatureModel.sys.mjs": [
"browser/extensions/newtab/lib/InferredModel/FeatureModel.sys.mjs"
],
"resource://newtab/lib/InferredModel/InferredConstants.sys.mjs": [
"browser/extensions/newtab/lib/InferredModel/InferredConstants.sys.mjs"
],
"resource://newtab/lib/InferredPersonalizationFeed.sys.mjs": [
"browser/extensions/newtab/lib/InferredPersonalizationFeed.sys.mjs"
],
"resource://newtab/lib/NewTabGleanUtils.sys.mjs": [
"browser/extensions/newtab/lib/NewTabGleanUtils.sys.mjs"
],