Skip to content

Commit c7c6f43

Browse files
author
Firefox Sync Engineering
committed
Nightly auto-update (122.0.20231214050346)
1 parent 5081cba commit c7c6f43

File tree

11 files changed

+29
-215
lines changed

11 files changed

+29
-215
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 = "ff59a0da141da621c8b38805bdcb4583e07b73e5e5320a1ee88ba33f0d5f346f"
5-
let version = "122.0.20231213050241"
6-
let url = "https://firefox-ci-tc.services.mozilla.com/api/index/v1/task/project.application-services.v2.swift.122.20231213050241/artifacts/public/build/MozillaRustComponents.xcframework.zip"
4+
let checksum = "32a412ea4f21fa6f9a3fc9695c26abd337fb31928a63a14f31b631de37e8d114"
5+
let version = "122.0.20231214050346"
6+
let url = "https://firefox-ci-tc.services.mozilla.com/api/index/v1/task/project.application-services.v2.swift.122.20231214050346/artifacts/public/build/MozillaRustComponents.xcframework.zip"
77

88
// Focus xcframework
9-
let focusChecksum = "6a5e76984cb52b0a53e732f5d95f041d35a2d3e61716eba384f4445856c14c69"
10-
let focusUrl = "https://firefox-ci-tc.services.mozilla.com/api/index/v1/task/project.application-services.v2.swift.122.20231213050241/artifacts/public/build/FocusRustComponents.xcframework.zip"
9+
let focusChecksum = "a20bfe01c082bae1eaf86b4d57c694c23d633ab62ecdbf11fcf576d943089edc"
10+
let focusUrl = "https://firefox-ci-tc.services.mozilla.com/api/index/v1/task/project.application-services.v2.swift.122.20231214050346/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
@@ -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: 13, hour: 5, minute: 20, second: 17))
28+
public static let info = BuildInfo(buildDate: DateComponents(calendar: Calendar.current, timeZone: TimeZone(abbreviation: "UTC"), year: 2023, month: 12, day: 14, hour: 5, minute: 35, second: 39))
2929
}
3030

3131
enum NimbusEvents {

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

Lines changed: 6 additions & 88 deletions
Original file line numberDiff line numberDiff line change
@@ -298,19 +298,6 @@ private func uniffiCheckCallStatus(
298298

299299
// Public interface members begin here.
300300

301-
private struct FfiConverterInt8: FfiConverterPrimitive {
302-
typealias FfiType = Int8
303-
typealias SwiftType = Int8
304-
305-
public static func read(from buf: inout (data: Data, offset: Data.Index)) throws -> Int8 {
306-
return try lift(readInt(&buf))
307-
}
308-
309-
public static func write(_ value: Int8, into buf: inout [UInt8]) {
310-
writeInt(&buf, lower(value))
311-
}
312-
}
313-
314301
private struct FfiConverterInt32: FfiConverterPrimitive {
315302
typealias FfiType = Int32
316303
typealias SwiftType = Int32
@@ -419,7 +406,7 @@ public protocol NimbusClientProtocol {
419406
func recordMalformedFeatureConfig(featureId: String, partId: String)
420407
func recordPastEvent(eventId: String, secondsAgo: Int64, count: Int64) throws
421408
func resetEnrollments() throws
422-
func resetTelemetryIdentifiers(newRandomizationUnits: AvailableRandomizationUnits) throws -> [EnrollmentChangeEvent]
409+
func resetTelemetryIdentifiers() throws -> [EnrollmentChangeEvent]
423410
func setExperimentsLocally(experimentsJson: String) throws
424411
func setFetchEnabled(flag: Bool) throws
425412
func setGlobalUserParticipation(optIn: Bool) throws -> [EnrollmentChangeEvent]
@@ -435,14 +422,13 @@ public class NimbusClient: NimbusClientProtocol {
435422
self.pointer = pointer
436423
}
437424

438-
public convenience init(appCtx: AppContext, coenrollingFeatureIds: [String], dbpath: String, remoteSettingsConfig: RemoteSettingsConfig?, availableRandomizationUnits: AvailableRandomizationUnits, metricsHandler: MetricsHandler) throws {
425+
public convenience init(appCtx: AppContext, coenrollingFeatureIds: [String], dbpath: String, remoteSettingsConfig: RemoteSettingsConfig?, metricsHandler: MetricsHandler) throws {
439426
try self.init(unsafeFromRawPointer: rustCallWithError(FfiConverterTypeNimbusError.lift) {
440427
uniffi_nimbus_fn_constructor_nimbusclient_new(
441428
FfiConverterTypeAppContext.lower(appCtx),
442429
FfiConverterSequenceString.lower(coenrollingFeatureIds),
443430
FfiConverterString.lower(dbpath),
444431
FfiConverterOptionTypeRemoteSettingsConfig.lower(remoteSettingsConfig),
445-
FfiConverterTypeAvailableRandomizationUnits.lower(availableRandomizationUnits),
446432
FfiConverterCallbackInterfaceMetricsHandler.lower(metricsHandler), $0
447433
)
448434
})
@@ -636,11 +622,10 @@ public class NimbusClient: NimbusClientProtocol {
636622
}
637623
}
638624

639-
public func resetTelemetryIdentifiers(newRandomizationUnits: AvailableRandomizationUnits) throws -> [EnrollmentChangeEvent] {
625+
public func resetTelemetryIdentifiers() throws -> [EnrollmentChangeEvent] {
640626
return try FfiConverterSequenceTypeEnrollmentChangeEvent.lift(
641627
rustCallWithError(FfiConverterTypeNimbusError.lift) {
642-
uniffi_nimbus_fn_method_nimbusclient_reset_telemetry_identifiers(self.pointer,
643-
FfiConverterTypeAvailableRandomizationUnits.lower(newRandomizationUnits), $0)
628+
uniffi_nimbus_fn_method_nimbusclient_reset_telemetry_identifiers(self.pointer, $0)
644629
}
645630
)
646631
}
@@ -1092,73 +1077,6 @@ public func FfiConverterTypeAvailableExperiment_lower(_ value: AvailableExperime
10921077
return FfiConverterTypeAvailableExperiment.lower(value)
10931078
}
10941079

1095-
public struct AvailableRandomizationUnits {
1096-
public var clientId: String?
1097-
public var userId: String?
1098-
public var nimbusId: String?
1099-
public var dummy: Int8
1100-
1101-
// Default memberwise initializers are never public by default, so we
1102-
// declare one manually.
1103-
public init(clientId: String?, userId: String?, nimbusId: String?, dummy: Int8) {
1104-
self.clientId = clientId
1105-
self.userId = userId
1106-
self.nimbusId = nimbusId
1107-
self.dummy = dummy
1108-
}
1109-
}
1110-
1111-
extension AvailableRandomizationUnits: Equatable, Hashable {
1112-
public static func == (lhs: AvailableRandomizationUnits, rhs: AvailableRandomizationUnits) -> Bool {
1113-
if lhs.clientId != rhs.clientId {
1114-
return false
1115-
}
1116-
if lhs.userId != rhs.userId {
1117-
return false
1118-
}
1119-
if lhs.nimbusId != rhs.nimbusId {
1120-
return false
1121-
}
1122-
if lhs.dummy != rhs.dummy {
1123-
return false
1124-
}
1125-
return true
1126-
}
1127-
1128-
public func hash(into hasher: inout Hasher) {
1129-
hasher.combine(clientId)
1130-
hasher.combine(userId)
1131-
hasher.combine(nimbusId)
1132-
hasher.combine(dummy)
1133-
}
1134-
}
1135-
1136-
public struct FfiConverterTypeAvailableRandomizationUnits: FfiConverterRustBuffer {
1137-
public static func read(from buf: inout (data: Data, offset: Data.Index)) throws -> AvailableRandomizationUnits {
1138-
return try AvailableRandomizationUnits(
1139-
clientId: FfiConverterOptionString.read(from: &buf),
1140-
userId: FfiConverterOptionString.read(from: &buf),
1141-
nimbusId: FfiConverterOptionString.read(from: &buf),
1142-
dummy: FfiConverterInt8.read(from: &buf)
1143-
)
1144-
}
1145-
1146-
public static func write(_ value: AvailableRandomizationUnits, into buf: inout [UInt8]) {
1147-
FfiConverterOptionString.write(value.clientId, into: &buf)
1148-
FfiConverterOptionString.write(value.userId, into: &buf)
1149-
FfiConverterOptionString.write(value.nimbusId, into: &buf)
1150-
FfiConverterInt8.write(value.dummy, into: &buf)
1151-
}
1152-
}
1153-
1154-
public func FfiConverterTypeAvailableRandomizationUnits_lift(_ buf: RustBuffer) throws -> AvailableRandomizationUnits {
1155-
return try FfiConverterTypeAvailableRandomizationUnits.lift(buf)
1156-
}
1157-
1158-
public func FfiConverterTypeAvailableRandomizationUnits_lower(_ value: AvailableRandomizationUnits) -> RustBuffer {
1159-
return FfiConverterTypeAvailableRandomizationUnits.lower(value)
1160-
}
1161-
11621080
public struct EnrolledExperiment {
11631081
public var featureIds: [String]
11641082
public var slug: String
@@ -2446,7 +2364,7 @@ private var initializationResult: InitializationResult {
24462364
if uniffi_nimbus_checksum_method_nimbusclient_reset_enrollments() != 60419 {
24472365
return InitializationResult.apiChecksumMismatch
24482366
}
2449-
if uniffi_nimbus_checksum_method_nimbusclient_reset_telemetry_identifiers() != 40749 {
2367+
if uniffi_nimbus_checksum_method_nimbusclient_reset_telemetry_identifiers() != 39466 {
24502368
return InitializationResult.apiChecksumMismatch
24512369
}
24522370
if uniffi_nimbus_checksum_method_nimbusclient_set_experiments_locally() != 9392 {
@@ -2467,7 +2385,7 @@ private var initializationResult: InitializationResult {
24672385
if uniffi_nimbus_checksum_method_nimbustargetinghelper_eval_jexl() != 1742 {
24682386
return InitializationResult.apiChecksumMismatch
24692387
}
2470-
if uniffi_nimbus_checksum_constructor_nimbusclient_new() != 23579 {
2388+
if uniffi_nimbus_checksum_constructor_nimbusclient_new() != 44070 {
24712389
return InitializationResult.apiChecksumMismatch
24722390
}
24732391
if uniffi_nimbus_checksum_method_metricshandler_record_enrollment_statuses() != 17597 {

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ typedef void (*UniFfiRustFutureContinuation)(void * _Nonnull, int8_t);
6565
// Scaffolding functions
6666
void uniffi_nimbus_fn_free_nimbusclient(void*_Nonnull ptr, RustCallStatus *_Nonnull out_status
6767
);
68-
void*_Nonnull uniffi_nimbus_fn_constructor_nimbusclient_new(RustBuffer app_ctx, RustBuffer coenrolling_feature_ids, RustBuffer dbpath, RustBuffer remote_settings_config, RustBuffer available_randomization_units, uint64_t metrics_handler, RustCallStatus *_Nonnull out_status
68+
void*_Nonnull uniffi_nimbus_fn_constructor_nimbusclient_new(RustBuffer app_ctx, RustBuffer coenrolling_feature_ids, RustBuffer dbpath, RustBuffer remote_settings_config, uint64_t metrics_handler, RustCallStatus *_Nonnull out_status
6969
);
7070
void uniffi_nimbus_fn_method_nimbusclient_advance_event_time(void*_Nonnull ptr, int64_t by_seconds, RustCallStatus *_Nonnull out_status
7171
);
@@ -111,7 +111,7 @@ void uniffi_nimbus_fn_method_nimbusclient_record_past_event(void*_Nonnull ptr, R
111111
);
112112
void uniffi_nimbus_fn_method_nimbusclient_reset_enrollments(void*_Nonnull ptr, RustCallStatus *_Nonnull out_status
113113
);
114-
RustBuffer uniffi_nimbus_fn_method_nimbusclient_reset_telemetry_identifiers(void*_Nonnull ptr, RustBuffer new_randomization_units, RustCallStatus *_Nonnull out_status
114+
RustBuffer uniffi_nimbus_fn_method_nimbusclient_reset_telemetry_identifiers(void*_Nonnull ptr, RustCallStatus *_Nonnull out_status
115115
);
116116
void uniffi_nimbus_fn_method_nimbusclient_set_experiments_locally(void*_Nonnull ptr, RustBuffer experiments_json, RustCallStatus *_Nonnull out_status
117117
);

‎swift-source/all/Nimbus/Nimbus.swift

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -264,8 +264,8 @@ extension Nimbus {
264264
postEnrollmentCalculation(changes)
265265
}
266266

267-
func resetTelemetryIdentifiersOnThisThread(_ identifiers: AvailableRandomizationUnits) throws {
268-
let changes = try nimbusClient.resetTelemetryIdentifiers(newRandomizationUnits: identifiers)
267+
func resetTelemetryIdentifiersOnThisThread() throws {
268+
let changes = try nimbusClient.resetTelemetryIdentifiers()
269269
postEnrollmentCalculation(changes)
270270
}
271271
}
@@ -314,10 +314,7 @@ extension Nimbus: NimbusUserConfiguration {
314314

315315
public func resetTelemetryIdentifiers() {
316316
_ = catchAll(dbQueue) { _ in
317-
// The "dummy" field here is required for obscure reasons when generating code on desktop,
318-
// so we just automatically set it to a dummy value.
319-
let aru = AvailableRandomizationUnits(clientId: nil, userId: nil, nimbusId: nil, dummy: 0)
320-
try self.resetTelemetryIdentifiersOnThisThread(aru)
317+
try self.resetTelemetryIdentifiersOnThisThread()
321318
}
322319
}
323320
}

‎swift-source/all/Nimbus/NimbusCreate.swift

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -102,14 +102,6 @@ public extension Nimbus {
102102
coenrollingFeatureIds: coenrollingFeatureIds,
103103
dbpath: dbPath,
104104
remoteSettingsConfig: remoteSettings,
105-
// The "dummy" field here is required for obscure reasons when generating code on desktop,
106-
// so we just automatically set it to a dummy value.
107-
availableRandomizationUnits: AvailableRandomizationUnits(
108-
clientId: nil,
109-
userId: nil,
110-
nimbusId: nil,
111-
dummy: 0
112-
),
113105
metricsHandler: GleanMetricsHandler()
114106
)
115107

‎swift-source/focus/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: 13, hour: 5, minute: 20, second: 20))
28+
public static let info = BuildInfo(buildDate: DateComponents(calendar: Calendar.current, timeZone: TimeZone(abbreviation: "UTC"), year: 2023, month: 12, day: 14, hour: 5, minute: 35, second: 42))
2929
}
3030

3131
enum NimbusEvents {

‎swift-source/focus/Generated/nimbus.swift

Lines changed: 6 additions & 88 deletions
Original file line numberDiff line numberDiff line change
@@ -298,19 +298,6 @@ private func uniffiCheckCallStatus(
298298

299299
// Public interface members begin here.
300300

301-
private struct FfiConverterInt8: FfiConverterPrimitive {
302-
typealias FfiType = Int8
303-
typealias SwiftType = Int8
304-
305-
public static func read(from buf: inout (data: Data, offset: Data.Index)) throws -> Int8 {
306-
return try lift(readInt(&buf))
307-
}
308-
309-
public static func write(_ value: Int8, into buf: inout [UInt8]) {
310-
writeInt(&buf, lower(value))
311-
}
312-
}
313-
314301
private struct FfiConverterInt32: FfiConverterPrimitive {
315302
typealias FfiType = Int32
316303
typealias SwiftType = Int32
@@ -419,7 +406,7 @@ public protocol NimbusClientProtocol {
419406
func recordMalformedFeatureConfig(featureId: String, partId: String)
420407
func recordPastEvent(eventId: String, secondsAgo: Int64, count: Int64) throws
421408
func resetEnrollments() throws
422-
func resetTelemetryIdentifiers(newRandomizationUnits: AvailableRandomizationUnits) throws -> [EnrollmentChangeEvent]
409+
func resetTelemetryIdentifiers() throws -> [EnrollmentChangeEvent]
423410
func setExperimentsLocally(experimentsJson: String) throws
424411
func setFetchEnabled(flag: Bool) throws
425412
func setGlobalUserParticipation(optIn: Bool) throws -> [EnrollmentChangeEvent]
@@ -435,14 +422,13 @@ public class NimbusClient: NimbusClientProtocol {
435422
self.pointer = pointer
436423
}
437424

438-
public convenience init(appCtx: AppContext, coenrollingFeatureIds: [String], dbpath: String, remoteSettingsConfig: RemoteSettingsConfig?, availableRandomizationUnits: AvailableRandomizationUnits, metricsHandler: MetricsHandler) throws {
425+
public convenience init(appCtx: AppContext, coenrollingFeatureIds: [String], dbpath: String, remoteSettingsConfig: RemoteSettingsConfig?, metricsHandler: MetricsHandler) throws {
439426
try self.init(unsafeFromRawPointer: rustCallWithError(FfiConverterTypeNimbusError.lift) {
440427
uniffi_nimbus_fn_constructor_nimbusclient_new(
441428
FfiConverterTypeAppContext.lower(appCtx),
442429
FfiConverterSequenceString.lower(coenrollingFeatureIds),
443430
FfiConverterString.lower(dbpath),
444431
FfiConverterOptionTypeRemoteSettingsConfig.lower(remoteSettingsConfig),
445-
FfiConverterTypeAvailableRandomizationUnits.lower(availableRandomizationUnits),
446432
FfiConverterCallbackInterfaceMetricsHandler.lower(metricsHandler), $0
447433
)
448434
})
@@ -636,11 +622,10 @@ public class NimbusClient: NimbusClientProtocol {
636622
}
637623
}
638624

639-
public func resetTelemetryIdentifiers(newRandomizationUnits: AvailableRandomizationUnits) throws -> [EnrollmentChangeEvent] {
625+
public func resetTelemetryIdentifiers() throws -> [EnrollmentChangeEvent] {
640626
return try FfiConverterSequenceTypeEnrollmentChangeEvent.lift(
641627
rustCallWithError(FfiConverterTypeNimbusError.lift) {
642-
uniffi_nimbus_fn_method_nimbusclient_reset_telemetry_identifiers(self.pointer,
643-
FfiConverterTypeAvailableRandomizationUnits.lower(newRandomizationUnits), $0)
628+
uniffi_nimbus_fn_method_nimbusclient_reset_telemetry_identifiers(self.pointer, $0)
644629
}
645630
)
646631
}
@@ -1092,73 +1077,6 @@ public func FfiConverterTypeAvailableExperiment_lower(_ value: AvailableExperime
10921077
return FfiConverterTypeAvailableExperiment.lower(value)
10931078
}
10941079

1095-
public struct AvailableRandomizationUnits {
1096-
public var clientId: String?
1097-
public var userId: String?
1098-
public var nimbusId: String?
1099-
public var dummy: Int8
1100-
1101-
// Default memberwise initializers are never public by default, so we
1102-
// declare one manually.
1103-
public init(clientId: String?, userId: String?, nimbusId: String?, dummy: Int8) {
1104-
self.clientId = clientId
1105-
self.userId = userId
1106-
self.nimbusId = nimbusId
1107-
self.dummy = dummy
1108-
}
1109-
}
1110-
1111-
extension AvailableRandomizationUnits: Equatable, Hashable {
1112-
public static func == (lhs: AvailableRandomizationUnits, rhs: AvailableRandomizationUnits) -> Bool {
1113-
if lhs.clientId != rhs.clientId {
1114-
return false
1115-
}
1116-
if lhs.userId != rhs.userId {
1117-
return false
1118-
}
1119-
if lhs.nimbusId != rhs.nimbusId {
1120-
return false
1121-
}
1122-
if lhs.dummy != rhs.dummy {
1123-
return false
1124-
}
1125-
return true
1126-
}
1127-
1128-
public func hash(into hasher: inout Hasher) {
1129-
hasher.combine(clientId)
1130-
hasher.combine(userId)
1131-
hasher.combine(nimbusId)
1132-
hasher.combine(dummy)
1133-
}
1134-
}
1135-
1136-
public struct FfiConverterTypeAvailableRandomizationUnits: FfiConverterRustBuffer {
1137-
public static func read(from buf: inout (data: Data, offset: Data.Index)) throws -> AvailableRandomizationUnits {
1138-
return try AvailableRandomizationUnits(
1139-
clientId: FfiConverterOptionString.read(from: &buf),
1140-
userId: FfiConverterOptionString.read(from: &buf),
1141-
nimbusId: FfiConverterOptionString.read(from: &buf),
1142-
dummy: FfiConverterInt8.read(from: &buf)
1143-
)
1144-
}
1145-
1146-
public static func write(_ value: AvailableRandomizationUnits, into buf: inout [UInt8]) {
1147-
FfiConverterOptionString.write(value.clientId, into: &buf)
1148-
FfiConverterOptionString.write(value.userId, into: &buf)
1149-
FfiConverterOptionString.write(value.nimbusId, into: &buf)
1150-
FfiConverterInt8.write(value.dummy, into: &buf)
1151-
}
1152-
}
1153-
1154-
public func FfiConverterTypeAvailableRandomizationUnits_lift(_ buf: RustBuffer) throws -> AvailableRandomizationUnits {
1155-
return try FfiConverterTypeAvailableRandomizationUnits.lift(buf)
1156-
}
1157-
1158-
public func FfiConverterTypeAvailableRandomizationUnits_lower(_ value: AvailableRandomizationUnits) -> RustBuffer {
1159-
return FfiConverterTypeAvailableRandomizationUnits.lower(value)
1160-
}
1161-
11621080
public struct EnrolledExperiment {
11631081
public var featureIds: [String]
11641082
public var slug: String
@@ -2446,7 +2364,7 @@ private var initializationResult: InitializationResult {
24462364
if uniffi_nimbus_checksum_method_nimbusclient_reset_enrollments() != 60419 {
24472365
return InitializationResult.apiChecksumMismatch
24482366
}
2449-
if uniffi_nimbus_checksum_method_nimbusclient_reset_telemetry_identifiers() != 40749 {
2367+
if uniffi_nimbus_checksum_method_nimbusclient_reset_telemetry_identifiers() != 39466 {
24502368
return InitializationResult.apiChecksumMismatch
24512369
}
24522370
if uniffi_nimbus_checksum_method_nimbusclient_set_experiments_locally() != 9392 {
@@ -2467,7 +2385,7 @@ private var initializationResult: InitializationResult {
24672385
if uniffi_nimbus_checksum_method_nimbustargetinghelper_eval_jexl() != 1742 {
24682386
return InitializationResult.apiChecksumMismatch
24692387
}
2470-
if uniffi_nimbus_checksum_constructor_nimbusclient_new() != 23579 {
2388+
if uniffi_nimbus_checksum_constructor_nimbusclient_new() != 44070 {
24712389
return InitializationResult.apiChecksumMismatch
24722390
}
24732391
if uniffi_nimbus_checksum_method_metricshandler_record_enrollment_statuses() != 17597 {

0 commit comments

Comments
 (0)