Skip to content

Commit 6ebe2ae

Browse files
author
Firefox Sync Engineering
committed
Nightly auto-update (122.0.20231202050335)
1 parent e3e9438 commit 6ebe2ae

40 files changed

+4112
-1965
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 = "c6db877152238b45ceadc3cd015560e87f6c52d60861423199edfc337e4c0fad"
5-
let version = "122.0.20231201050257"
6-
let url = "https://firefox-ci-tc.services.mozilla.com/api/index/v1/task/project.application-services.v2.swift.122.20231201050257/artifacts/public/build/MozillaRustComponents.xcframework.zip"
4+
let checksum = "1eedf5b8984f77eeb477b34d99aa6fbf0293254524b859b36e9f4f46468465a4"
5+
let version = "122.0.20231202050335"
6+
let url = "https://firefox-ci-tc.services.mozilla.com/api/index/v1/task/project.application-services.v2.swift.122.20231202050335/artifacts/public/build/MozillaRustComponents.xcframework.zip"
77

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

‎swift-source/all/FxAClient/FxAccountManager.swift

Lines changed: 7 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -395,7 +395,7 @@ open class FxAccountManager {
395395
FxALog.info("Initializing device")
396396
requireConstellation().initDevice(
397397
name: deviceConfig.name,
398-
type: deviceConfig.type,
398+
type: deviceConfig.deviceType,
399399
capabilities: deviceConfig.capabilities
400400
)
401401

@@ -421,7 +421,7 @@ open class FxAccountManager {
421421
FxALog.info("Initializing device")
422422
requireConstellation().initDevice(
423423
name: deviceConfig.name,
424-
type: deviceConfig.type,
424+
type: deviceConfig.deviceType,
425425
capabilities: deviceConfig.capabilities
426426
)
427427

@@ -436,7 +436,7 @@ open class FxAccountManager {
436436
FxALog.info("Initializing device")
437437
requireConstellation().initDevice(
438438
name: deviceConfig.name,
439-
type: deviceConfig.type,
439+
type: deviceConfig.deviceType,
440440
capabilities: deviceConfig.capabilities
441441
)
442442

@@ -572,7 +572,7 @@ open class FxAccountManager {
572572
self.deviceConfig = DeviceConfig(
573573
name: localDevice.displayName,
574574
// The other properties are likely to not get modified.
575-
type: self.deviceConfig.type,
575+
type: self.deviceConfig.deviceType,
576576
capabilities: self.deviceConfig.capabilities
577577
)
578578
}
@@ -647,14 +647,8 @@ public struct FxaAuthData {
647647
}
648648
}
649649

650-
public struct DeviceConfig {
651-
let name: String
652-
let type: DeviceType
653-
let capabilities: [DeviceCapability]
654-
655-
public init(name: String, type: DeviceType, capabilities: [DeviceCapability]) {
656-
self.name = name
657-
self.type = type
658-
self.capabilities = capabilities
650+
extension DeviceConfig {
651+
init(name: String, type: DeviceType, capabilities: [DeviceCapability]) {
652+
self.init(name: name, deviceType: type, capabilities: capabilities)
659653
}
660654
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ extension GleanMetrics {
2525
// Intentionally left private, no external user can instantiate a new global object.
2626
}
2727

28-
public static let info = BuildInfo(buildDate: DateComponents(calendar: Calendar.current, timeZone: TimeZone(abbreviation: "UTC"), year: 2023, month: 12, day: 1, hour: 5, minute: 34, second: 40))
28+
public static let info = BuildInfo(buildDate: DateComponents(calendar: Calendar.current, timeZone: TimeZone(abbreviation: "UTC"), year: 2023, month: 12, day: 2, hour: 5, minute: 25, second: 0))
2929
}
3030

3131
enum NimbusEvents {

‎swift-source/all/Generated/as_ohttp_client.swift

Lines changed: 30 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -224,6 +224,7 @@ private enum UniffiInternalError: LocalizedError {
224224
private let CALL_SUCCESS: Int8 = 0
225225
private let CALL_ERROR: Int8 = 1
226226
private let CALL_PANIC: Int8 = 2
227+
private let CALL_CANCELLED: Int8 = 3
227228

228229
private extension RustCallStatus {
229230
init() {
@@ -287,6 +288,9 @@ private func uniffiCheckCallStatus(
287288
throw UniffiInternalError.rustPanic("Rust panic")
288289
}
289290

291+
case CALL_CANCELLED:
292+
throw CancellationError()
293+
290294
default:
291295
throw UniffiInternalError.unexpectedRustCallStatusCode
292296
}
@@ -359,8 +363,8 @@ private struct FfiConverterString: FfiConverter {
359363
}
360364

361365
public protocol OhttpSessionProtocol {
362-
func encapsulate(method: String, scheme: String, server: String, endpoint: String, headers: [String: String], payload: [UInt8]) throws -> [UInt8]
363366
func decapsulate(encoded: [UInt8]) throws -> OhttpResponse
367+
func encapsulate(method: String, scheme: String, server: String, endpoint: String, headers: [String: String], payload: [UInt8]) throws -> [UInt8]
364368
}
365369

366370
public class OhttpSession: OhttpSessionProtocol {
@@ -385,6 +389,15 @@ public class OhttpSession: OhttpSessionProtocol {
385389
try! rustCall { uniffi_as_ohttp_client_fn_free_ohttpsession(pointer, $0) }
386390
}
387391

392+
public func decapsulate(encoded: [UInt8]) throws -> OhttpResponse {
393+
return try FfiConverterTypeOhttpResponse.lift(
394+
rustCallWithError(FfiConverterTypeOhttpError.lift) {
395+
uniffi_as_ohttp_client_fn_method_ohttpsession_decapsulate(self.pointer,
396+
FfiConverterSequenceUInt8.lower(encoded), $0)
397+
}
398+
)
399+
}
400+
388401
public func encapsulate(method: String, scheme: String, server: String, endpoint: String, headers: [String: String], payload: [UInt8]) throws -> [UInt8] {
389402
return try FfiConverterSequenceUInt8.lift(
390403
rustCallWithError(FfiConverterTypeOhttpError.lift) {
@@ -398,15 +411,6 @@ public class OhttpSession: OhttpSessionProtocol {
398411
}
399412
)
400413
}
401-
402-
public func decapsulate(encoded: [UInt8]) throws -> OhttpResponse {
403-
return try FfiConverterTypeOhttpResponse.lift(
404-
rustCallWithError(FfiConverterTypeOhttpError.lift) {
405-
uniffi_as_ohttp_client_fn_method_ohttpsession_decapsulate(self.pointer,
406-
FfiConverterSequenceUInt8.lower(encoded), $0)
407-
}
408-
)
409-
}
410414
}
411415

412416
public struct FfiConverterTypeOhttpSession: FfiConverter {
@@ -755,21 +759,21 @@ public struct FfiConverterTypeOhttpError: FfiConverterRustBuffer {
755759

756760
public static func write(_ value: OhttpError, into buf: inout [UInt8]) {
757761
switch value {
758-
case let .KeyFetchFailed(message):
762+
case .KeyFetchFailed(_ /* message is ignored*/ ):
759763
writeInt(&buf, Int32(1))
760-
case let .MalformedKeyConfig(message):
764+
case .MalformedKeyConfig(_ /* message is ignored*/ ):
761765
writeInt(&buf, Int32(2))
762-
case let .UnsupportedKeyConfig(message):
766+
case .UnsupportedKeyConfig(_ /* message is ignored*/ ):
763767
writeInt(&buf, Int32(3))
764-
case let .InvalidSession(message):
768+
case .InvalidSession(_ /* message is ignored*/ ):
765769
writeInt(&buf, Int32(4))
766-
case let .RelayFailed(message):
770+
case .RelayFailed(_ /* message is ignored*/ ):
767771
writeInt(&buf, Int32(5))
768-
case let .CannotEncodeMessage(message):
772+
case .CannotEncodeMessage(_ /* message is ignored*/ ):
769773
writeInt(&buf, Int32(6))
770-
case let .MalformedMessage(message):
774+
case .MalformedMessage(_ /* message is ignored*/ ):
771775
writeInt(&buf, Int32(7))
772-
case let .DuplicateHeaders(message):
776+
case .DuplicateHeaders(_ /* message is ignored*/ ):
773777
writeInt(&buf, Int32(8))
774778
}
775779
}
@@ -834,31 +838,31 @@ private enum InitializationResult {
834838
// the code inside is only computed once.
835839
private var initializationResult: InitializationResult {
836840
// Get the bindings contract version from our ComponentInterface
837-
let bindings_contract_version = 22
841+
let bindings_contract_version = 24
838842
// Get the scaffolding contract version by calling the into the dylib
839843
let scaffolding_contract_version = ffi_as_ohttp_client_uniffi_contract_version()
840844
if bindings_contract_version != scaffolding_contract_version {
841845
return InitializationResult.contractVersionMismatch
842846
}
843-
if uniffi_as_ohttp_client_checksum_method_ohttpsession_encapsulate() != 13167 {
847+
if uniffi_as_ohttp_client_checksum_method_ohttpsession_decapsulate() != 37380 {
844848
return InitializationResult.apiChecksumMismatch
845849
}
846-
if uniffi_as_ohttp_client_checksum_method_ohttpsession_decapsulate() != 13509 {
850+
if uniffi_as_ohttp_client_checksum_method_ohttpsession_encapsulate() != 55777 {
847851
return InitializationResult.apiChecksumMismatch
848852
}
849-
if uniffi_as_ohttp_client_checksum_method_ohttptestserver_get_config() != 36899 {
853+
if uniffi_as_ohttp_client_checksum_method_ohttptestserver_get_config() != 53454 {
850854
return InitializationResult.apiChecksumMismatch
851855
}
852-
if uniffi_as_ohttp_client_checksum_method_ohttptestserver_receive() != 36846 {
856+
if uniffi_as_ohttp_client_checksum_method_ohttptestserver_receive() != 28467 {
853857
return InitializationResult.apiChecksumMismatch
854858
}
855-
if uniffi_as_ohttp_client_checksum_method_ohttptestserver_respond() != 64449 {
859+
if uniffi_as_ohttp_client_checksum_method_ohttptestserver_respond() != 4346 {
856860
return InitializationResult.apiChecksumMismatch
857861
}
858-
if uniffi_as_ohttp_client_checksum_constructor_ohttpsession_new() != 61712 {
862+
if uniffi_as_ohttp_client_checksum_constructor_ohttpsession_new() != 60874 {
859863
return InitializationResult.apiChecksumMismatch
860864
}
861-
if uniffi_as_ohttp_client_checksum_constructor_ohttptestserver_new() != 22259 {
865+
if uniffi_as_ohttp_client_checksum_constructor_ohttptestserver_new() != 62089 {
862866
return InitializationResult.apiChecksumMismatch
863867
}
864868

‎swift-source/all/Generated/as_ohttp_clientFFI.h

Lines changed: 114 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ typedef struct RustBuffer
3232
typedef int32_t (*ForeignCallback)(uint64_t, int32_t, const uint8_t *_Nonnull, int32_t, RustBuffer *_Nonnull);
3333

3434
// Task defined in Rust that Swift executes
35-
typedef void (*UniFfiRustTaskCallback)(const void * _Nullable);
35+
typedef void (*UniFfiRustTaskCallback)(const void * _Nullable, int8_t);
3636

3737
// Callback to execute Rust tasks using a Swift Task
3838
//
@@ -41,7 +41,7 @@ typedef void (*UniFfiRustTaskCallback)(const void * _Nullable);
4141
// delay: Delay in MS
4242
// task: UniFfiRustTaskCallback to call
4343
// task_data: data to pass the task callback
44-
typedef void (*UniFfiForeignExecutorCallback)(size_t, uint32_t, UniFfiRustTaskCallback _Nullable, const void * _Nullable);
44+
typedef int8_t (*UniFfiForeignExecutorCallback)(size_t, uint32_t, UniFfiRustTaskCallback _Nullable, const void * _Nullable);
4545

4646
typedef struct ForeignBytes
4747
{
@@ -59,20 +59,18 @@ typedef struct RustCallStatus {
5959
// ⚠️ increment the version suffix in all instances of UNIFFI_SHARED_HEADER_V4 in this file. ⚠️
6060
#endif // def UNIFFI_SHARED_H
6161

62-
// Callbacks for UniFFI Futures
63-
typedef void (*UniFfiFutureCallbackUnsafeMutableRawPointer)(const void * _Nonnull, void*_Nonnull, RustCallStatus);
64-
typedef void (*UniFfiFutureCallbackUnsafeMutableRawPointer)(const void * _Nonnull, void*_Nonnull, RustCallStatus);
65-
typedef void (*UniFfiFutureCallbackRustBuffer)(const void * _Nonnull, RustBuffer, RustCallStatus);
62+
// Continuation callback for UniFFI Futures
63+
typedef void (*UniFfiRustFutureContinuation)(void * _Nonnull, int8_t);
6664

6765
// Scaffolding functions
6866
void uniffi_as_ohttp_client_fn_free_ohttpsession(void*_Nonnull ptr, RustCallStatus *_Nonnull out_status
6967
);
7068
void*_Nonnull uniffi_as_ohttp_client_fn_constructor_ohttpsession_new(RustBuffer config, RustCallStatus *_Nonnull out_status
7169
);
72-
RustBuffer uniffi_as_ohttp_client_fn_method_ohttpsession_encapsulate(void*_Nonnull ptr, RustBuffer method, RustBuffer scheme, RustBuffer server, RustBuffer endpoint, RustBuffer headers, RustBuffer payload, RustCallStatus *_Nonnull out_status
73-
);
7470
RustBuffer uniffi_as_ohttp_client_fn_method_ohttpsession_decapsulate(void*_Nonnull ptr, RustBuffer encoded, RustCallStatus *_Nonnull out_status
7571
);
72+
RustBuffer uniffi_as_ohttp_client_fn_method_ohttpsession_encapsulate(void*_Nonnull ptr, RustBuffer method, RustBuffer scheme, RustBuffer server, RustBuffer endpoint, RustBuffer headers, RustBuffer payload, RustCallStatus *_Nonnull out_status
73+
);
7674
void uniffi_as_ohttp_client_fn_free_ohttptestserver(void*_Nonnull ptr, RustCallStatus *_Nonnull out_status
7775
);
7876
void*_Nonnull uniffi_as_ohttp_client_fn_constructor_ohttptestserver_new(RustCallStatus *_Nonnull out_status
@@ -92,11 +90,117 @@ void ffi_as_ohttp_client_rustbuffer_free(RustBuffer buf, RustCallStatus *_Nonnul
9290
);
9391
RustBuffer ffi_as_ohttp_client_rustbuffer_reserve(RustBuffer buf, int32_t additional, RustCallStatus *_Nonnull out_status
9492
);
95-
uint16_t uniffi_as_ohttp_client_checksum_method_ohttpsession_encapsulate(void
96-
93+
void ffi_as_ohttp_client_rust_future_continuation_callback_set(UniFfiRustFutureContinuation _Nonnull callback
94+
);
95+
void ffi_as_ohttp_client_rust_future_poll_u8(void* _Nonnull handle, void* _Nonnull uniffi_callback
96+
);
97+
void ffi_as_ohttp_client_rust_future_cancel_u8(void* _Nonnull handle
98+
);
99+
void ffi_as_ohttp_client_rust_future_free_u8(void* _Nonnull handle
100+
);
101+
uint8_t ffi_as_ohttp_client_rust_future_complete_u8(void* _Nonnull handle, RustCallStatus *_Nonnull out_status
102+
);
103+
void ffi_as_ohttp_client_rust_future_poll_i8(void* _Nonnull handle, void* _Nonnull uniffi_callback
104+
);
105+
void ffi_as_ohttp_client_rust_future_cancel_i8(void* _Nonnull handle
106+
);
107+
void ffi_as_ohttp_client_rust_future_free_i8(void* _Nonnull handle
108+
);
109+
int8_t ffi_as_ohttp_client_rust_future_complete_i8(void* _Nonnull handle, RustCallStatus *_Nonnull out_status
110+
);
111+
void ffi_as_ohttp_client_rust_future_poll_u16(void* _Nonnull handle, void* _Nonnull uniffi_callback
112+
);
113+
void ffi_as_ohttp_client_rust_future_cancel_u16(void* _Nonnull handle
114+
);
115+
void ffi_as_ohttp_client_rust_future_free_u16(void* _Nonnull handle
116+
);
117+
uint16_t ffi_as_ohttp_client_rust_future_complete_u16(void* _Nonnull handle, RustCallStatus *_Nonnull out_status
118+
);
119+
void ffi_as_ohttp_client_rust_future_poll_i16(void* _Nonnull handle, void* _Nonnull uniffi_callback
120+
);
121+
void ffi_as_ohttp_client_rust_future_cancel_i16(void* _Nonnull handle
122+
);
123+
void ffi_as_ohttp_client_rust_future_free_i16(void* _Nonnull handle
124+
);
125+
int16_t ffi_as_ohttp_client_rust_future_complete_i16(void* _Nonnull handle, RustCallStatus *_Nonnull out_status
126+
);
127+
void ffi_as_ohttp_client_rust_future_poll_u32(void* _Nonnull handle, void* _Nonnull uniffi_callback
128+
);
129+
void ffi_as_ohttp_client_rust_future_cancel_u32(void* _Nonnull handle
130+
);
131+
void ffi_as_ohttp_client_rust_future_free_u32(void* _Nonnull handle
132+
);
133+
uint32_t ffi_as_ohttp_client_rust_future_complete_u32(void* _Nonnull handle, RustCallStatus *_Nonnull out_status
134+
);
135+
void ffi_as_ohttp_client_rust_future_poll_i32(void* _Nonnull handle, void* _Nonnull uniffi_callback
136+
);
137+
void ffi_as_ohttp_client_rust_future_cancel_i32(void* _Nonnull handle
138+
);
139+
void ffi_as_ohttp_client_rust_future_free_i32(void* _Nonnull handle
140+
);
141+
int32_t ffi_as_ohttp_client_rust_future_complete_i32(void* _Nonnull handle, RustCallStatus *_Nonnull out_status
142+
);
143+
void ffi_as_ohttp_client_rust_future_poll_u64(void* _Nonnull handle, void* _Nonnull uniffi_callback
144+
);
145+
void ffi_as_ohttp_client_rust_future_cancel_u64(void* _Nonnull handle
146+
);
147+
void ffi_as_ohttp_client_rust_future_free_u64(void* _Nonnull handle
148+
);
149+
uint64_t ffi_as_ohttp_client_rust_future_complete_u64(void* _Nonnull handle, RustCallStatus *_Nonnull out_status
150+
);
151+
void ffi_as_ohttp_client_rust_future_poll_i64(void* _Nonnull handle, void* _Nonnull uniffi_callback
152+
);
153+
void ffi_as_ohttp_client_rust_future_cancel_i64(void* _Nonnull handle
154+
);
155+
void ffi_as_ohttp_client_rust_future_free_i64(void* _Nonnull handle
156+
);
157+
int64_t ffi_as_ohttp_client_rust_future_complete_i64(void* _Nonnull handle, RustCallStatus *_Nonnull out_status
158+
);
159+
void ffi_as_ohttp_client_rust_future_poll_f32(void* _Nonnull handle, void* _Nonnull uniffi_callback
160+
);
161+
void ffi_as_ohttp_client_rust_future_cancel_f32(void* _Nonnull handle
162+
);
163+
void ffi_as_ohttp_client_rust_future_free_f32(void* _Nonnull handle
164+
);
165+
float ffi_as_ohttp_client_rust_future_complete_f32(void* _Nonnull handle, RustCallStatus *_Nonnull out_status
166+
);
167+
void ffi_as_ohttp_client_rust_future_poll_f64(void* _Nonnull handle, void* _Nonnull uniffi_callback
168+
);
169+
void ffi_as_ohttp_client_rust_future_cancel_f64(void* _Nonnull handle
170+
);
171+
void ffi_as_ohttp_client_rust_future_free_f64(void* _Nonnull handle
172+
);
173+
double ffi_as_ohttp_client_rust_future_complete_f64(void* _Nonnull handle, RustCallStatus *_Nonnull out_status
174+
);
175+
void ffi_as_ohttp_client_rust_future_poll_pointer(void* _Nonnull handle, void* _Nonnull uniffi_callback
176+
);
177+
void ffi_as_ohttp_client_rust_future_cancel_pointer(void* _Nonnull handle
178+
);
179+
void ffi_as_ohttp_client_rust_future_free_pointer(void* _Nonnull handle
180+
);
181+
void*_Nonnull ffi_as_ohttp_client_rust_future_complete_pointer(void* _Nonnull handle, RustCallStatus *_Nonnull out_status
182+
);
183+
void ffi_as_ohttp_client_rust_future_poll_rust_buffer(void* _Nonnull handle, void* _Nonnull uniffi_callback
184+
);
185+
void ffi_as_ohttp_client_rust_future_cancel_rust_buffer(void* _Nonnull handle
186+
);
187+
void ffi_as_ohttp_client_rust_future_free_rust_buffer(void* _Nonnull handle
188+
);
189+
RustBuffer ffi_as_ohttp_client_rust_future_complete_rust_buffer(void* _Nonnull handle, RustCallStatus *_Nonnull out_status
190+
);
191+
void ffi_as_ohttp_client_rust_future_poll_void(void* _Nonnull handle, void* _Nonnull uniffi_callback
192+
);
193+
void ffi_as_ohttp_client_rust_future_cancel_void(void* _Nonnull handle
194+
);
195+
void ffi_as_ohttp_client_rust_future_free_void(void* _Nonnull handle
196+
);
197+
void ffi_as_ohttp_client_rust_future_complete_void(void* _Nonnull handle, RustCallStatus *_Nonnull out_status
97198
);
98199
uint16_t uniffi_as_ohttp_client_checksum_method_ohttpsession_decapsulate(void
99200

201+
);
202+
uint16_t uniffi_as_ohttp_client_checksum_method_ohttpsession_encapsulate(void
203+
100204
);
101205
uint16_t uniffi_as_ohttp_client_checksum_method_ohttptestserver_get_config(void
102206

0 commit comments

Comments
 (0)