Skip to content

Commit e891a64

Browse files
author
Firefox Sync Engineering
committed
Nightly auto-update (133.0.20241027050311)
1 parent fd7fd07 commit e891a64

File tree

7 files changed

+15
-433
lines changed

7 files changed

+15
-433
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 = "342d1512bb69ac29c9b3e59ab5bf59abcfbe8b1da7017e63591cba68e489d2b0"
5-
let version = "133.0.20241026050254"
6-
let url = "https://firefox-ci-tc.services.mozilla.com/api/index/v1/task/project.application-services.v2.swift.133.20241026050254/artifacts/public/build/MozillaRustComponents.xcframework.zip"
4+
let checksum = "39b3d06d4236fa79ffe860a0787ea850b5b40c71bf060aa76b5c18d70e08cb69"
5+
let version = "133.0.20241027050311"
6+
let url = "https://firefox-ci-tc.services.mozilla.com/api/index/v1/task/project.application-services.v2.swift.133.20241027050311/artifacts/public/build/MozillaRustComponents.xcframework.zip"
77

88
// Focus xcframework
9-
let focusChecksum = "9c1300ba20f85d4f29c34b2c4c4f522b2fbaaa79a3723cea42c9404ea82de4bb"
10-
let focusUrl = "https://firefox-ci-tc.services.mozilla.com/api/index/v1/task/project.application-services.v2.swift.133.20241026050254/artifacts/public/build/FocusRustComponents.xcframework.zip"
9+
let focusChecksum = "37b9ef870c798f3ed5e1668c385ee5b00e5dedf7f63f533e04467730db4b9b41"
10+
let focusUrl = "https://firefox-ci-tc.services.mozilla.com/api/index/v1/task/project.application-services.v2.swift.133.20241027050311/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: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -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: 2024, month: 10, day: 26, hour: 5, minute: 16, second: 21))
26+
public static let info = BuildInfo(buildDate: DateComponents(calendar: Calendar.current, timeZone: TimeZone(abbreviation: "UTC"), year: 2024, month: 10, day: 27, hour: 5, minute: 13, second: 18))
2727
}
2828

2929
enum NimbusEvents {

swift-source/all/Generated/nimbus.swift

Lines changed: 0 additions & 160 deletions
Original file line numberDiff line numberDiff line change
@@ -427,22 +427,6 @@ fileprivate struct FfiConverterInt64: FfiConverterPrimitive {
427427
}
428428
}
429429

430-
#if swift(>=5.8)
431-
@_documentation(visibility: private)
432-
#endif
433-
fileprivate struct FfiConverterDouble: FfiConverterPrimitive {
434-
typealias FfiType = Double
435-
typealias SwiftType = Double
436-
437-
public static func read(from buf: inout (data: Data, offset: Data.Index)) throws -> Double {
438-
return try lift(readDouble(&buf))
439-
}
440-
441-
public static func write(_ value: Double, into buf: inout [UInt8]) {
442-
writeDouble(&buf, lower(value))
443-
}
444-
}
445-
446430
#if swift(>=5.8)
447431
@_documentation(visibility: private)
448432
#endif
@@ -1398,12 +1382,8 @@ public func FfiConverterTypeNimbusTargetingHelper_lower(_ value: NimbusTargeting
13981382

13991383
public protocol RecordedContext : AnyObject {
14001384

1401-
func getEventQueries() -> [String: String]
1402-
14031385
func record()
14041386

1405-
func setEventQueryValues(eventQueryValues: [String: Double])
1406-
14071387
func toJson() -> JsonObject
14081388

14091389
}
@@ -1457,26 +1437,12 @@ open class RecordedContextImpl:
14571437

14581438

14591439

1460-
open func getEventQueries() -> [String: String] {
1461-
return try! FfiConverterDictionaryStringString.lift(try! rustCall() {
1462-
uniffi_nimbus_fn_method_recordedcontext_get_event_queries(self.uniffiClonePointer(),$0
1463-
)
1464-
})
1465-
}
1466-
14671440
open func record() {try! rustCall() {
14681441
uniffi_nimbus_fn_method_recordedcontext_record(self.uniffiClonePointer(),$0
14691442
)
14701443
}
14711444
}
14721445

1473-
open func setEventQueryValues(eventQueryValues: [String: Double]) {try! rustCall() {
1474-
uniffi_nimbus_fn_method_recordedcontext_set_event_query_values(self.uniffiClonePointer(),
1475-
FfiConverterDictionaryStringDouble.lower(eventQueryValues),$0
1476-
)
1477-
}
1478-
}
1479-
14801446
open func toJson() -> JsonObject {
14811447
return try! FfiConverterTypeJsonObject.lift(try! rustCall() {
14821448
uniffi_nimbus_fn_method_recordedcontext_to_json(self.uniffiClonePointer(),$0
@@ -1500,28 +1466,6 @@ fileprivate struct UniffiCallbackInterfaceRecordedContext {
15001466
// Create the VTable using a series of closures.
15011467
// Swift automatically converts these into C callback functions.
15021468
static var vtable: UniffiVTableCallbackInterfaceRecordedContext = UniffiVTableCallbackInterfaceRecordedContext(
1503-
getEventQueries: { (
1504-
uniffiHandle: UInt64,
1505-
uniffiOutReturn: UnsafeMutablePointer<RustBuffer>,
1506-
uniffiCallStatus: UnsafeMutablePointer<RustCallStatus>
1507-
) in
1508-
let makeCall = {
1509-
() throws -> [String: String] in
1510-
guard let uniffiObj = try? FfiConverterTypeRecordedContext.handleMap.get(handle: uniffiHandle) else {
1511-
throw UniffiInternalError.unexpectedStaleHandle
1512-
}
1513-
return uniffiObj.getEventQueries(
1514-
)
1515-
}
1516-
1517-
1518-
let writeReturn = { uniffiOutReturn.pointee = FfiConverterDictionaryStringString.lower($0) }
1519-
uniffiTraitInterfaceCall(
1520-
callStatus: uniffiCallStatus,
1521-
makeCall: makeCall,
1522-
writeReturn: writeReturn
1523-
)
1524-
},
15251469
record: { (
15261470
uniffiHandle: UInt64,
15271471
uniffiOutReturn: UnsafeMutableRawPointer,
@@ -1537,30 +1481,6 @@ fileprivate struct UniffiCallbackInterfaceRecordedContext {
15371481
}
15381482

15391483

1540-
let writeReturn = { () }
1541-
uniffiTraitInterfaceCall(
1542-
callStatus: uniffiCallStatus,
1543-
makeCall: makeCall,
1544-
writeReturn: writeReturn
1545-
)
1546-
},
1547-
setEventQueryValues: { (
1548-
uniffiHandle: UInt64,
1549-
eventQueryValues: RustBuffer,
1550-
uniffiOutReturn: UnsafeMutableRawPointer,
1551-
uniffiCallStatus: UnsafeMutablePointer<RustCallStatus>
1552-
) in
1553-
let makeCall = {
1554-
() throws -> () in
1555-
guard let uniffiObj = try? FfiConverterTypeRecordedContext.handleMap.get(handle: uniffiHandle) else {
1556-
throw UniffiInternalError.unexpectedStaleHandle
1557-
}
1558-
return uniffiObj.setEventQueryValues(
1559-
eventQueryValues: try FfiConverterDictionaryStringDouble.lift(eventQueryValues)
1560-
)
1561-
}
1562-
1563-
15641484
let writeReturn = { () }
15651485
uniffiTraitInterfaceCall(
15661486
callStatus: uniffiCallStatus,
@@ -2558,8 +2478,6 @@ public enum NimbusError {
25582478

25592479
case UniFfiCallbackError(message: String)
25602480

2561-
case RegexError(message: String)
2562-
25632481
}
25642482

25652483

@@ -2676,10 +2594,6 @@ public struct FfiConverterTypeNimbusError: FfiConverterRustBuffer {
26762594
message: try FfiConverterString.read(from: &buf)
26772595
)
26782596

2679-
case 26: return .RegexError(
2680-
message: try FfiConverterString.read(from: &buf)
2681-
)
2682-
26832597

26842598
default: throw UniffiInternalError.unexpectedEnumCase
26852599
}
@@ -2741,8 +2655,6 @@ public struct FfiConverterTypeNimbusError: FfiConverterRustBuffer {
27412655
writeInt(&buf, Int32(24))
27422656
case .UniFfiCallbackError(_ /* message is ignored*/):
27432657
writeInt(&buf, Int32(25))
2744-
case .RegexError(_ /* message is ignored*/):
2745-
writeInt(&buf, Int32(26))
27462658

27472659

27482660
}
@@ -3208,58 +3120,6 @@ fileprivate struct FfiConverterSequenceTypeExperimentBranch: FfiConverterRustBuf
32083120
}
32093121
}
32103122

3211-
#if swift(>=5.8)
3212-
@_documentation(visibility: private)
3213-
#endif
3214-
fileprivate struct FfiConverterDictionaryStringDouble: FfiConverterRustBuffer {
3215-
public static func write(_ value: [String: Double], into buf: inout [UInt8]) {
3216-
let len = Int32(value.count)
3217-
writeInt(&buf, len)
3218-
for (key, value) in value {
3219-
FfiConverterString.write(key, into: &buf)
3220-
FfiConverterDouble.write(value, into: &buf)
3221-
}
3222-
}
3223-
3224-
public static func read(from buf: inout (data: Data, offset: Data.Index)) throws -> [String: Double] {
3225-
let len: Int32 = try readInt(&buf)
3226-
var dict = [String: Double]()
3227-
dict.reserveCapacity(Int(len))
3228-
for _ in 0..<len {
3229-
let key = try FfiConverterString.read(from: &buf)
3230-
let value = try FfiConverterDouble.read(from: &buf)
3231-
dict[key] = value
3232-
}
3233-
return dict
3234-
}
3235-
}
3236-
3237-
#if swift(>=5.8)
3238-
@_documentation(visibility: private)
3239-
#endif
3240-
fileprivate struct FfiConverterDictionaryStringString: FfiConverterRustBuffer {
3241-
public static func write(_ value: [String: String], into buf: inout [UInt8]) {
3242-
let len = Int32(value.count)
3243-
writeInt(&buf, len)
3244-
for (key, value) in value {
3245-
FfiConverterString.write(key, into: &buf)
3246-
FfiConverterString.write(value, into: &buf)
3247-
}
3248-
}
3249-
3250-
public static func read(from buf: inout (data: Data, offset: Data.Index)) throws -> [String: String] {
3251-
let len: Int32 = try readInt(&buf)
3252-
var dict = [String: String]()
3253-
dict.reserveCapacity(Int(len))
3254-
for _ in 0..<len {
3255-
let key = try FfiConverterString.read(from: &buf)
3256-
let value = try FfiConverterString.read(from: &buf)
3257-
dict[key] = value
3258-
}
3259-
return dict
3260-
}
3261-
}
3262-
32633123

32643124

32653125

@@ -3304,17 +3164,6 @@ public func FfiConverterTypeJsonObject_lift(_ value: RustBuffer) throws -> JsonO
33043164
public func FfiConverterTypeJsonObject_lower(_ value: JsonObject) -> RustBuffer {
33053165
return FfiConverterTypeJsonObject.lower(value)
33063166
}
3307-
/**
3308-
* A test utility used to validate event queries against the jexl evaluator.
3309-
*
3310-
* This method should only be used in tests.
3311-
*/
3312-
public func validateEventQueries(recordedContext: RecordedContext)throws {try rustCallWithError(FfiConverterTypeNimbusError.lift) {
3313-
uniffi_nimbus_fn_func_validate_event_queries(
3314-
FfiConverterTypeRecordedContext.lower(recordedContext),$0
3315-
)
3316-
}
3317-
}
33183167

33193168
private enum InitializationResult {
33203169
case ok
@@ -3331,9 +3180,6 @@ private var initializationResult: InitializationResult = {
33313180
if bindings_contract_version != scaffolding_contract_version {
33323181
return InitializationResult.contractVersionMismatch
33333182
}
3334-
if (uniffi_nimbus_checksum_func_validate_event_queries() != 42746) {
3335-
return InitializationResult.apiChecksumMismatch
3336-
}
33373183
if (uniffi_nimbus_checksum_method_nimbusclient_advance_event_time() != 40755) {
33383184
return InitializationResult.apiChecksumMismatch
33393185
}
@@ -3421,15 +3267,9 @@ private var initializationResult: InitializationResult = {
34213267
if (uniffi_nimbus_checksum_method_nimbustargetinghelper_eval_jexl() != 42395) {
34223268
return InitializationResult.apiChecksumMismatch
34233269
}
3424-
if (uniffi_nimbus_checksum_method_recordedcontext_get_event_queries() != 28844) {
3425-
return InitializationResult.apiChecksumMismatch
3426-
}
34273270
if (uniffi_nimbus_checksum_method_recordedcontext_record() != 5916) {
34283271
return InitializationResult.apiChecksumMismatch
34293272
}
3430-
if (uniffi_nimbus_checksum_method_recordedcontext_set_event_query_values() != 40199) {
3431-
return InitializationResult.apiChecksumMismatch
3432-
}
34333273
if (uniffi_nimbus_checksum_method_recordedcontext_to_json() != 530) {
34343274
return InitializationResult.apiChecksumMismatch
34353275
}

swift-source/all/Generated/nimbusFFI.h

Lines changed: 4 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -281,28 +281,14 @@ typedef void (*UniffiCallbackInterfaceMetricsHandlerMethod3)(uint64_t, RustBuffe
281281
#endif
282282
#ifndef UNIFFI_FFIDEF_CALLBACK_INTERFACE_RECORDED_CONTEXT_METHOD0
283283
#define UNIFFI_FFIDEF_CALLBACK_INTERFACE_RECORDED_CONTEXT_METHOD0
284-
typedef void (*UniffiCallbackInterfaceRecordedContextMethod0)(uint64_t, RustBuffer* _Nonnull,
284+
typedef void (*UniffiCallbackInterfaceRecordedContextMethod0)(uint64_t, void* _Nonnull,
285285
RustCallStatus *_Nonnull uniffiCallStatus
286286
);
287287

288288
#endif
289289
#ifndef UNIFFI_FFIDEF_CALLBACK_INTERFACE_RECORDED_CONTEXT_METHOD1
290290
#define UNIFFI_FFIDEF_CALLBACK_INTERFACE_RECORDED_CONTEXT_METHOD1
291-
typedef void (*UniffiCallbackInterfaceRecordedContextMethod1)(uint64_t, void* _Nonnull,
292-
RustCallStatus *_Nonnull uniffiCallStatus
293-
);
294-
295-
#endif
296-
#ifndef UNIFFI_FFIDEF_CALLBACK_INTERFACE_RECORDED_CONTEXT_METHOD2
297-
#define UNIFFI_FFIDEF_CALLBACK_INTERFACE_RECORDED_CONTEXT_METHOD2
298-
typedef void (*UniffiCallbackInterfaceRecordedContextMethod2)(uint64_t, RustBuffer, void* _Nonnull,
299-
RustCallStatus *_Nonnull uniffiCallStatus
300-
);
301-
302-
#endif
303-
#ifndef UNIFFI_FFIDEF_CALLBACK_INTERFACE_RECORDED_CONTEXT_METHOD3
304-
#define UNIFFI_FFIDEF_CALLBACK_INTERFACE_RECORDED_CONTEXT_METHOD3
305-
typedef void (*UniffiCallbackInterfaceRecordedContextMethod3)(uint64_t, RustBuffer* _Nonnull,
291+
typedef void (*UniffiCallbackInterfaceRecordedContextMethod1)(uint64_t, RustBuffer* _Nonnull,
306292
RustCallStatus *_Nonnull uniffiCallStatus
307293
);
308294

@@ -321,10 +307,8 @@ typedef struct UniffiVTableCallbackInterfaceMetricsHandler {
321307
#ifndef UNIFFI_FFIDEF_V_TABLE_CALLBACK_INTERFACE_RECORDED_CONTEXT
322308
#define UNIFFI_FFIDEF_V_TABLE_CALLBACK_INTERFACE_RECORDED_CONTEXT
323309
typedef struct UniffiVTableCallbackInterfaceRecordedContext {
324-
UniffiCallbackInterfaceRecordedContextMethod0 _Nonnull getEventQueries;
325-
UniffiCallbackInterfaceRecordedContextMethod1 _Nonnull record;
326-
UniffiCallbackInterfaceRecordedContextMethod2 _Nonnull setEventQueryValues;
327-
UniffiCallbackInterfaceRecordedContextMethod3 _Nonnull toJson;
310+
UniffiCallbackInterfaceRecordedContextMethod0 _Nonnull record;
311+
UniffiCallbackInterfaceRecordedContextMethod1 _Nonnull toJson;
328312
UniffiCallbackInterfaceFree _Nonnull uniffiFree;
329313
} UniffiVTableCallbackInterfaceRecordedContext;
330314

@@ -524,21 +508,11 @@ void uniffi_nimbus_fn_free_recordedcontext(void*_Nonnull ptr, RustCallStatus *_N
524508
void uniffi_nimbus_fn_init_callback_vtable_recordedcontext(UniffiVTableCallbackInterfaceRecordedContext* _Nonnull vtable
525509
);
526510
#endif
527-
#ifndef UNIFFI_FFIDEF_UNIFFI_NIMBUS_FN_METHOD_RECORDEDCONTEXT_GET_EVENT_QUERIES
528-
#define UNIFFI_FFIDEF_UNIFFI_NIMBUS_FN_METHOD_RECORDEDCONTEXT_GET_EVENT_QUERIES
529-
RustBuffer uniffi_nimbus_fn_method_recordedcontext_get_event_queries(void*_Nonnull ptr, RustCallStatus *_Nonnull out_status
530-
);
531-
#endif
532511
#ifndef UNIFFI_FFIDEF_UNIFFI_NIMBUS_FN_METHOD_RECORDEDCONTEXT_RECORD
533512
#define UNIFFI_FFIDEF_UNIFFI_NIMBUS_FN_METHOD_RECORDEDCONTEXT_RECORD
534513
void uniffi_nimbus_fn_method_recordedcontext_record(void*_Nonnull ptr, RustCallStatus *_Nonnull out_status
535514
);
536515
#endif
537-
#ifndef UNIFFI_FFIDEF_UNIFFI_NIMBUS_FN_METHOD_RECORDEDCONTEXT_SET_EVENT_QUERY_VALUES
538-
#define UNIFFI_FFIDEF_UNIFFI_NIMBUS_FN_METHOD_RECORDEDCONTEXT_SET_EVENT_QUERY_VALUES
539-
void uniffi_nimbus_fn_method_recordedcontext_set_event_query_values(void*_Nonnull ptr, RustBuffer event_query_values, RustCallStatus *_Nonnull out_status
540-
);
541-
#endif
542516
#ifndef UNIFFI_FFIDEF_UNIFFI_NIMBUS_FN_METHOD_RECORDEDCONTEXT_TO_JSON
543517
#define UNIFFI_FFIDEF_UNIFFI_NIMBUS_FN_METHOD_RECORDEDCONTEXT_TO_JSON
544518
RustBuffer uniffi_nimbus_fn_method_recordedcontext_to_json(void*_Nonnull ptr, RustCallStatus *_Nonnull out_status
@@ -549,11 +523,6 @@ RustBuffer uniffi_nimbus_fn_method_recordedcontext_to_json(void*_Nonnull ptr, Ru
549523
void uniffi_nimbus_fn_init_callback_vtable_metricshandler(UniffiVTableCallbackInterfaceMetricsHandler* _Nonnull vtable
550524
);
551525
#endif
552-
#ifndef UNIFFI_FFIDEF_UNIFFI_NIMBUS_FN_FUNC_VALIDATE_EVENT_QUERIES
553-
#define UNIFFI_FFIDEF_UNIFFI_NIMBUS_FN_FUNC_VALIDATE_EVENT_QUERIES
554-
void uniffi_nimbus_fn_func_validate_event_queries(void*_Nonnull recorded_context, RustCallStatus *_Nonnull out_status
555-
);
556-
#endif
557526
#ifndef UNIFFI_FFIDEF_FFI_NIMBUS_RUSTBUFFER_ALLOC
558527
#define UNIFFI_FFIDEF_FFI_NIMBUS_RUSTBUFFER_ALLOC
559528
RustBuffer ffi_nimbus_rustbuffer_alloc(uint64_t size, RustCallStatus *_Nonnull out_status
@@ -832,12 +801,6 @@ void ffi_nimbus_rust_future_free_void(uint64_t handle
832801
#ifndef UNIFFI_FFIDEF_FFI_NIMBUS_RUST_FUTURE_COMPLETE_VOID
833802
#define UNIFFI_FFIDEF_FFI_NIMBUS_RUST_FUTURE_COMPLETE_VOID
834803
void ffi_nimbus_rust_future_complete_void(uint64_t handle, RustCallStatus *_Nonnull out_status
835-
);
836-
#endif
837-
#ifndef UNIFFI_FFIDEF_UNIFFI_NIMBUS_CHECKSUM_FUNC_VALIDATE_EVENT_QUERIES
838-
#define UNIFFI_FFIDEF_UNIFFI_NIMBUS_CHECKSUM_FUNC_VALIDATE_EVENT_QUERIES
839-
uint16_t uniffi_nimbus_checksum_func_validate_event_queries(void
840-
841804
);
842805
#endif
843806
#ifndef UNIFFI_FFIDEF_UNIFFI_NIMBUS_CHECKSUM_METHOD_NIMBUSCLIENT_ADVANCE_EVENT_TIME
@@ -1012,24 +975,12 @@ uint16_t uniffi_nimbus_checksum_method_nimbusstringhelper_string_format(void
1012975
#define UNIFFI_FFIDEF_UNIFFI_NIMBUS_CHECKSUM_METHOD_NIMBUSTARGETINGHELPER_EVAL_JEXL
1013976
uint16_t uniffi_nimbus_checksum_method_nimbustargetinghelper_eval_jexl(void
1014977

1015-
);
1016-
#endif
1017-
#ifndef UNIFFI_FFIDEF_UNIFFI_NIMBUS_CHECKSUM_METHOD_RECORDEDCONTEXT_GET_EVENT_QUERIES
1018-
#define UNIFFI_FFIDEF_UNIFFI_NIMBUS_CHECKSUM_METHOD_RECORDEDCONTEXT_GET_EVENT_QUERIES
1019-
uint16_t uniffi_nimbus_checksum_method_recordedcontext_get_event_queries(void
1020-
1021978
);
1022979
#endif
1023980
#ifndef UNIFFI_FFIDEF_UNIFFI_NIMBUS_CHECKSUM_METHOD_RECORDEDCONTEXT_RECORD
1024981
#define UNIFFI_FFIDEF_UNIFFI_NIMBUS_CHECKSUM_METHOD_RECORDEDCONTEXT_RECORD
1025982
uint16_t uniffi_nimbus_checksum_method_recordedcontext_record(void
1026983

1027-
);
1028-
#endif
1029-
#ifndef UNIFFI_FFIDEF_UNIFFI_NIMBUS_CHECKSUM_METHOD_RECORDEDCONTEXT_SET_EVENT_QUERY_VALUES
1030-
#define UNIFFI_FFIDEF_UNIFFI_NIMBUS_CHECKSUM_METHOD_RECORDEDCONTEXT_SET_EVENT_QUERY_VALUES
1031-
uint16_t uniffi_nimbus_checksum_method_recordedcontext_set_event_query_values(void
1032-
1033984
);
1034985
#endif
1035986
#ifndef UNIFFI_FFIDEF_UNIFFI_NIMBUS_CHECKSUM_METHOD_RECORDEDCONTEXT_TO_JSON

0 commit comments

Comments
 (0)