Skip to content

Commit 4665d9f

Browse files
author
Firefox Sync Engineering
committed
Nightly auto-update (138.0.20250328200527)
1 parent bb049a2 commit 4665d9f

32 files changed

+1067
-2182
lines changed

Package.swift

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
// swift-tools-version:5.4
22
import PackageDescription
33

4-
let checksum = "5c57a40170d9738abce06c52068631b6eecddb2232d3620af42173221baf34a1"
5-
let version = "138.0.20250328050321"
6-
let url = "https://firefox-ci-tc.services.mozilla.com/api/index/v1/task/project.application-services.v2.swift.138.20250328050321/artifacts/public/build/MozillaRustComponents.xcframework.zip"
4+
let checksum = "3b6c42e94878eaa21ec426a42378488594e1c8e806dacfaba128000c8d0b4fa8"
5+
let version = "138.0.20250328200527"
6+
let url = "https://firefox-ci-tc.services.mozilla.com/api/index/v1/task/project.application-services.v2.swift.138.20250328200527/artifacts/public/build/MozillaRustComponents.xcframework.zip"
77

88
// Focus xcframework
9-
let focusChecksum = "3a966c7ac9fe1e2accc2f2f33c6d70e606bd5b4fad735082bbcbe410f3836ded"
10-
let focusUrl = "https://firefox-ci-tc.services.mozilla.com/api/index/v1/task/project.application-services.v2.swift.138.20250328050321/artifacts/public/build/FocusRustComponents.xcframework.zip"
9+
let focusChecksum = "5abee80faa94899522808d05ce391700a11bdbf94e294bfcebfdb94b836fb99a"
10+
let focusUrl = "https://firefox-ci-tc.services.mozilla.com/api/index/v1/task/project.application-services.v2.swift.138.20250328200527/artifacts/public/build/FocusRustComponents.xcframework.zip"
1111
let package = Package(
1212
name: "MozillaRustComponentsSwift",
1313
platforms: [.iOS(.v14)],

swift-source/all/Generated/Metrics/Metrics.swift

Lines changed: 9 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// -*- mode: Swift -*-
22

3-
// AUTOGENERATED BY glean_parser v17.0.1. DO NOT EDIT. DO NOT COMMIT.
3+
// AUTOGENERATED BY glean_parser v16.2.0. DO NOT EDIT. DO NOT COMMIT.
44

55
#if canImport(Foundation)
66
import Foundation
@@ -23,7 +23,7 @@ extension GleanMetrics {
2323
// Intentionally left private, no external user can instantiate a new global object.
2424
}
2525

26-
public static let info = BuildInfo(buildDate: DateComponents(calendar: Calendar.current, timeZone: TimeZone(abbreviation: "UTC"), year: 2025, month: 3, day: 28, hour: 5, minute: 16, second: 12))
26+
public static let info = BuildInfo(buildDate: DateComponents(calendar: Calendar.current, timeZone: TimeZone(abbreviation: "UTC"), year: 2025, month: 3, day: 28, hour: 20, minute: 49, second: 21))
2727
}
2828

2929
enum NimbusEvents {
@@ -1303,8 +1303,7 @@ extension GleanMetrics {
13031303
enabled: true,
13041304
schedulesPings: [],
13051305
reasonCodes: [],
1306-
followsCollectionEnabled: true,
1307-
uploaderCapabilities: []
1306+
followsCollectionEnabled: true
13081307
)
13091308

13101309
/// A ping sent for every bookmarks sync. It doesn't include the `client_id`
@@ -1318,8 +1317,7 @@ extension GleanMetrics {
13181317
enabled: true,
13191318
schedulesPings: [],
13201319
reasonCodes: [],
1321-
followsCollectionEnabled: true,
1322-
uploaderCapabilities: []
1320+
followsCollectionEnabled: true
13231321
)
13241322

13251323
/// A ping sent for every Credit Cards engine sync. It doesn't include the
@@ -1334,8 +1332,7 @@ extension GleanMetrics {
13341332
enabled: true,
13351333
schedulesPings: [],
13361334
reasonCodes: [],
1337-
followsCollectionEnabled: true,
1338-
uploaderCapabilities: []
1335+
followsCollectionEnabled: true
13391336
)
13401337

13411338
/// A ping sent for every history sync. It doesn't include the `client_id` because
@@ -1349,8 +1346,7 @@ extension GleanMetrics {
13491346
enabled: true,
13501347
schedulesPings: [],
13511348
reasonCodes: [],
1352-
followsCollectionEnabled: true,
1353-
uploaderCapabilities: []
1349+
followsCollectionEnabled: true
13541350
)
13551351

13561352
/// A ping sent for every logins/passwords sync. It doesn't include the `client_id`
@@ -1364,8 +1360,7 @@ extension GleanMetrics {
13641360
enabled: true,
13651361
schedulesPings: [],
13661362
reasonCodes: [],
1367-
followsCollectionEnabled: true,
1368-
uploaderCapabilities: []
1363+
followsCollectionEnabled: true
13691364
)
13701365

13711366
/// A summary ping, sent every time a sync is performed. During each Sync one or
@@ -1388,8 +1383,7 @@ extension GleanMetrics {
13881383
enabled: true,
13891384
schedulesPings: [],
13901385
reasonCodes: [],
1391-
followsCollectionEnabled: true,
1392-
uploaderCapabilities: []
1386+
followsCollectionEnabled: true
13931387
)
13941388

13951389
/// A ping sent for every Tabs engine sync. It doesn't include the `client_id`
@@ -1403,8 +1397,7 @@ extension GleanMetrics {
14031397
enabled: true,
14041398
schedulesPings: [],
14051399
reasonCodes: [],
1406-
followsCollectionEnabled: true,
1407-
uploaderCapabilities: []
1400+
followsCollectionEnabled: true
14081401
)
14091402

14101403
}

swift-source/all/Generated/as_ohttp_client.swift

Lines changed: 29 additions & 59 deletions
Original file line numberDiff line numberDiff line change
@@ -281,7 +281,7 @@ private func makeRustCall<T, E: Swift.Error>(
281281
_ callback: (UnsafeMutablePointer<RustCallStatus>) -> T,
282282
errorHandler: ((RustBuffer) throws -> E)?
283283
) throws -> T {
284-
uniffiEnsureAsOhttpClientInitialized()
284+
uniffiEnsureInitialized()
285285
var callStatus = RustCallStatus.init()
286286
let returnedVal = callback(&callStatus)
287287
try uniffiCheckCallStatus(callStatus: callStatus, errorHandler: errorHandler)
@@ -352,10 +352,9 @@ private func uniffiTraitInterfaceCallWithError<T, E>(
352352
callStatus.pointee.errorBuf = FfiConverterString.lower(String(describing: error))
353353
}
354354
}
355-
fileprivate final class UniffiHandleMap<T>: @unchecked Sendable {
356-
// All mutation happens with this lock held, which is why we implement @unchecked Sendable.
357-
private let lock = NSLock()
355+
fileprivate class UniffiHandleMap<T> {
358356
private var map: [UInt64: T] = [:]
357+
private let lock = NSLock()
359358
private var currentHandle: UInt64 = 1
360359

361360
func insert(obj: T) -> UInt64 {
@@ -393,7 +392,6 @@ fileprivate final class UniffiHandleMap<T>: @unchecked Sendable {
393392
}
394393
}
395394

396-
397395
// Public interface members begin here.
398396

399397

@@ -477,7 +475,7 @@ fileprivate struct FfiConverterString: FfiConverter {
477475
* Each OHTTP request-reply exchange needs to create an OhttpSession
478476
* object to manage encryption state.
479477
*/
480-
public protocol OhttpSessionProtocol: AnyObject {
478+
public protocol OhttpSessionProtocol : AnyObject {
481479

482480
/**
483481
* Decypt and unpack the response from the Relay for the previously
@@ -498,7 +496,8 @@ public protocol OhttpSessionProtocol: AnyObject {
498496
* Each OHTTP request-reply exchange needs to create an OhttpSession
499497
* object to manage encryption state.
500498
*/
501-
open class OhttpSession: OhttpSessionProtocol, @unchecked Sendable {
499+
open class OhttpSession:
500+
OhttpSessionProtocol {
502501
fileprivate let pointer: UnsafeMutableRawPointer!
503502

504503
/// Used to instantiate a [FFIObject] without an actual pointer, for fakes in tests, mostly.
@@ -539,7 +538,7 @@ open class OhttpSession: OhttpSessionProtocol, @unchecked Sendable {
539538
*/
540539
public convenience init(config: [UInt8])throws {
541540
let pointer =
542-
try rustCallWithError(FfiConverterTypeOhttpError_lift) {
541+
try rustCallWithError(FfiConverterTypeOhttpError.lift) {
543542
uniffi_as_ohttp_client_fn_constructor_ohttpsession_new(
544543
FfiConverterSequenceUInt8.lower(config),$0
545544
)
@@ -563,8 +562,8 @@ public convenience init(config: [UInt8])throws {
563562
* encapsulated request. You must use the same OhttpSession that
564563
* generated the request message.
565564
*/
566-
open func decapsulate(encoded: [UInt8])throws -> OhttpResponse {
567-
return try FfiConverterTypeOhttpResponse_lift(try rustCallWithError(FfiConverterTypeOhttpError_lift) {
565+
open func decapsulate(encoded: [UInt8])throws -> OhttpResponse {
566+
return try FfiConverterTypeOhttpResponse.lift(try rustCallWithError(FfiConverterTypeOhttpError.lift) {
568567
uniffi_as_ohttp_client_fn_method_ohttpsession_decapsulate(self.uniffiClonePointer(),
569568
FfiConverterSequenceUInt8.lower(encoded),$0
570569
)
@@ -576,8 +575,8 @@ open func decapsulate(encoded: [UInt8])throws -> OhttpResponse {
576575
* payload using HPKE. The caller is responsible for sending the
577576
* resulting message to the Relay.
578577
*/
579-
open func encapsulate(method: String, scheme: String, server: String, endpoint: String, headers: [String: String], payload: [UInt8])throws -> [UInt8] {
580-
return try FfiConverterSequenceUInt8.lift(try rustCallWithError(FfiConverterTypeOhttpError_lift) {
578+
open func encapsulate(method: String, scheme: String, server: String, endpoint: String, headers: [String: String], payload: [UInt8])throws -> [UInt8] {
579+
return try FfiConverterSequenceUInt8.lift(try rustCallWithError(FfiConverterTypeOhttpError.lift) {
581580
uniffi_as_ohttp_client_fn_method_ohttpsession_encapsulate(self.uniffiClonePointer(),
582581
FfiConverterString.lower(method),
583582
FfiConverterString.lower(scheme),
@@ -592,7 +591,6 @@ open func encapsulate(method: String, scheme: String, server: String, endpoint:
592591

593592
}
594593

595-
596594
#if swift(>=5.8)
597595
@_documentation(visibility: private)
598596
#endif
@@ -628,6 +626,8 @@ public struct FfiConverterTypeOhttpSession: FfiConverter {
628626
}
629627

630628

629+
630+
631631
#if swift(>=5.8)
632632
@_documentation(visibility: private)
633633
#endif
@@ -645,13 +645,11 @@ public func FfiConverterTypeOhttpSession_lower(_ value: OhttpSession) -> UnsafeM
645645

646646

647647

648-
649-
650648
/**
651649
* A testing interface for decrypting and responding to OHTTP messages. This
652650
* should only be used for testing.
653651
*/
654-
public protocol OhttpTestServerProtocol: AnyObject {
652+
public protocol OhttpTestServerProtocol : AnyObject {
655653

656654
/**
657655
* Return the unique encryption key config for this instance of test server.
@@ -667,7 +665,8 @@ public protocol OhttpTestServerProtocol: AnyObject {
667665
* A testing interface for decrypting and responding to OHTTP messages. This
668666
* should only be used for testing.
669667
*/
670-
open class OhttpTestServer: OhttpTestServerProtocol, @unchecked Sendable {
668+
open class OhttpTestServer:
669+
OhttpTestServerProtocol {
671670
fileprivate let pointer: UnsafeMutableRawPointer!
672671

673672
/// Used to instantiate a [FFIObject] without an actual pointer, for fakes in tests, mostly.
@@ -726,33 +725,32 @@ public convenience init() {
726725
/**
727726
* Return the unique encryption key config for this instance of test server.
728727
*/
729-
open func getConfig() -> [UInt8] {
728+
open func getConfig() -> [UInt8] {
730729
return try! FfiConverterSequenceUInt8.lift(try! rustCall() {
731730
uniffi_as_ohttp_client_fn_method_ohttptestserver_get_config(self.uniffiClonePointer(),$0
732731
)
733732
})
734733
}
735734

736-
open func receive(message: [UInt8])throws -> TestServerRequest {
737-
return try FfiConverterTypeTestServerRequest_lift(try rustCallWithError(FfiConverterTypeOhttpError_lift) {
735+
open func receive(message: [UInt8])throws -> TestServerRequest {
736+
return try FfiConverterTypeTestServerRequest.lift(try rustCallWithError(FfiConverterTypeOhttpError.lift) {
738737
uniffi_as_ohttp_client_fn_method_ohttptestserver_receive(self.uniffiClonePointer(),
739738
FfiConverterSequenceUInt8.lower(message),$0
740739
)
741740
})
742741
}
743742

744-
open func respond(response: OhttpResponse)throws -> [UInt8] {
745-
return try FfiConverterSequenceUInt8.lift(try rustCallWithError(FfiConverterTypeOhttpError_lift) {
743+
open func respond(response: OhttpResponse)throws -> [UInt8] {
744+
return try FfiConverterSequenceUInt8.lift(try rustCallWithError(FfiConverterTypeOhttpError.lift) {
746745
uniffi_as_ohttp_client_fn_method_ohttptestserver_respond(self.uniffiClonePointer(),
747-
FfiConverterTypeOhttpResponse_lower(response),$0
746+
FfiConverterTypeOhttpResponse.lower(response),$0
748747
)
749748
})
750749
}
751750

752751

753752
}
754753

755-
756754
#if swift(>=5.8)
757755
@_documentation(visibility: private)
758756
#endif
@@ -788,6 +786,8 @@ public struct FfiConverterTypeOhttpTestServer: FfiConverter {
788786
}
789787

790788

789+
790+
791791
#if swift(>=5.8)
792792
@_documentation(visibility: private)
793793
#endif
@@ -803,8 +803,6 @@ public func FfiConverterTypeOhttpTestServer_lower(_ value: OhttpTestServer) -> U
803803
}
804804

805805

806-
807-
808806
/**
809807
* The decrypted response from the Gateway/Target
810808
*/
@@ -822,9 +820,6 @@ public struct OhttpResponse {
822820
}
823821
}
824822

825-
#if compiler(>=6)
826-
extension OhttpResponse: Sendable {}
827-
#endif
828823

829824

830825
extension OhttpResponse: Equatable, Hashable {
@@ -849,7 +844,6 @@ extension OhttpResponse: Equatable, Hashable {
849844
}
850845

851846

852-
853847
#if swift(>=5.8)
854848
@_documentation(visibility: private)
855849
#endif
@@ -906,9 +900,6 @@ public struct TestServerRequest {
906900
}
907901
}
908902

909-
#if compiler(>=6)
910-
extension TestServerRequest: Sendable {}
911-
#endif
912903

913904

914905
extension TestServerRequest: Equatable, Hashable {
@@ -945,7 +936,6 @@ extension TestServerRequest: Equatable, Hashable {
945936
}
946937

947938

948-
949939
#if swift(>=5.8)
950940
@_documentation(visibility: private)
951941
#endif
@@ -1090,32 +1080,14 @@ public struct FfiConverterTypeOhttpError: FfiConverterRustBuffer {
10901080
}
10911081

10921082

1093-
#if swift(>=5.8)
1094-
@_documentation(visibility: private)
1095-
#endif
1096-
public func FfiConverterTypeOhttpError_lift(_ buf: RustBuffer) throws -> OhttpError {
1097-
return try FfiConverterTypeOhttpError.lift(buf)
1098-
}
1099-
1100-
#if swift(>=5.8)
1101-
@_documentation(visibility: private)
1102-
#endif
1103-
public func FfiConverterTypeOhttpError_lower(_ value: OhttpError) -> RustBuffer {
1104-
return FfiConverterTypeOhttpError.lower(value)
1105-
}
1106-
1107-
11081083
extension OhttpError: Equatable, Hashable {}
11091084

1110-
1111-
11121085
extension OhttpError: Foundation.LocalizedError {
11131086
public var errorDescription: String? {
11141087
String(reflecting: self)
11151088
}
11161089
}
11171090

1118-
11191091
#if swift(>=5.8)
11201092
@_documentation(visibility: private)
11211093
#endif
@@ -1174,9 +1146,9 @@ private enum InitializationResult {
11741146
}
11751147
// Use a global variable to perform the versioning checks. Swift ensures that
11761148
// the code inside is only computed once.
1177-
private let initializationResult: InitializationResult = {
1149+
private var initializationResult: InitializationResult = {
11781150
// Get the bindings contract version from our ComponentInterface
1179-
let bindings_contract_version = 29
1151+
let bindings_contract_version = 26
11801152
// Get the scaffolding contract version by calling the into the dylib
11811153
let scaffolding_contract_version = ffi_as_ohttp_client_uniffi_contract_version()
11821154
if bindings_contract_version != scaffolding_contract_version {
@@ -1197,19 +1169,17 @@ private let initializationResult: InitializationResult = {
11971169
if (uniffi_as_ohttp_client_checksum_method_ohttptestserver_respond() != 21845) {
11981170
return InitializationResult.apiChecksumMismatch
11991171
}
1200-
if (uniffi_as_ohttp_client_checksum_constructor_ohttpsession_new() != 12377) {
1172+
if (uniffi_as_ohttp_client_checksum_constructor_ohttpsession_new() != 63666) {
12011173
return InitializationResult.apiChecksumMismatch
12021174
}
1203-
if (uniffi_as_ohttp_client_checksum_constructor_ohttptestserver_new() != 10284) {
1175+
if (uniffi_as_ohttp_client_checksum_constructor_ohttptestserver_new() != 42944) {
12041176
return InitializationResult.apiChecksumMismatch
12051177
}
12061178

12071179
return InitializationResult.ok
12081180
}()
12091181

1210-
// Make the ensure init function public so that other modules which have external type references to
1211-
// our types can call it.
1212-
public func uniffiEnsureAsOhttpClientInitialized() {
1182+
private func uniffiEnsureInitialized() {
12131183
switch initializationResult {
12141184
case .ok:
12151185
break

0 commit comments

Comments
 (0)