Skip to content

Commit 92a8e75

Browse files
author
Firefox Sync Engineering
committed
Nightly auto-update (118.0.20230809050307)
1 parent f8ea72b commit 92a8e75

File tree

5 files changed

+87
-47
lines changed

5 files changed

+87
-47
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 = "638370943667f3d07acef3aa43169f833822d3393a99b968866d91095872e3e9"
5-
let version = "118.0.20230806050240"
6-
let url = "https://firefox-ci-tc.services.mozilla.com/api/index/v1/task/project.application-services.v2.swift.118.20230806050240/artifacts/public/build/MozillaRustComponents.xcframework.zip"
4+
let checksum = "8e355177206e9f0494bce542b2e8e38216f2952b5cce619533c28b70c73b0ec4"
5+
let version = "118.0.20230809050307"
6+
let url = "https://firefox-ci-tc.services.mozilla.com/api/index/v1/task/project.application-services.v2.swift.118.20230809050307/artifacts/public/build/MozillaRustComponents.xcframework.zip"
77

88
// Focus xcframework
9-
let focusChecksum = "48a4883bdf4e52d6adb6f186962775f2e8d738d67413ed965ac5384029764ada"
10-
let focusUrl = "https://firefox-ci-tc.services.mozilla.com/api/index/v1/task/project.application-services.v2.swift.118.20230806050240/artifacts/public/build/FocusRustComponents.xcframework.zip"
9+
let focusChecksum = "806bfd3d4d2d132c35b977a05f9905bdfd126583ace8ba2b64ab31249d0ec6fe"
10+
let focusUrl = "https://firefox-ci-tc.services.mozilla.com/api/index/v1/task/project.application-services.v2.swift.118.20230809050307/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: 8, day: 6, hour: 5, minute: 16, second: 20))
28+
public static let info = BuildInfo(buildDate: DateComponents(calendar: Calendar.current, timeZone: TimeZone(abbreviation: "UTC"), year: 2023, month: 8, day: 9, hour: 5, minute: 42, second: 24))
2929
}
3030

3131
enum NimbusEvents {

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

Lines changed: 40 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -307,6 +307,27 @@ private struct FfiConverterUInt64: FfiConverterPrimitive {
307307
}
308308
}
309309

310+
private struct FfiConverterBool: FfiConverter {
311+
typealias FfiType = Int8
312+
typealias SwiftType = Bool
313+
314+
public static func lift(_ value: Int8) throws -> Bool {
315+
return value != 0
316+
}
317+
318+
public static func lower(_ value: Bool) -> Int8 {
319+
return value ? 1 : 0
320+
}
321+
322+
public static func read(from buf: inout (data: Data, offset: Data.Index)) throws -> Bool {
323+
return try lift(readInt(&buf))
324+
}
325+
326+
public static func write(_ value: Bool, into buf: inout [UInt8]) {
327+
writeInt(&buf, lower(value))
328+
}
329+
}
330+
310331
private struct FfiConverterString: FfiConverter {
311332
typealias SwiftType = String
312333
typealias FfiType = RustBuffer
@@ -575,14 +596,16 @@ public func FfiConverterTypeRemoteSettingsConfig_lower(_ value: RemoteSettingsCo
575596
public struct RemoteSettingsRecord {
576597
public var id: String
577598
public var lastModified: UInt64
599+
public var deleted: Bool
578600
public var attachment: Attachment?
579601
public var fields: RsJsonObject
580602

581603
// Default memberwise initializers are never public by default, so we
582604
// declare one manually.
583-
public init(id: String, lastModified: UInt64, attachment: Attachment?, fields: RsJsonObject) {
605+
public init(id: String, lastModified: UInt64, deleted: Bool, attachment: Attachment?, fields: RsJsonObject) {
584606
self.id = id
585607
self.lastModified = lastModified
608+
self.deleted = deleted
586609
self.attachment = attachment
587610
self.fields = fields
588611
}
@@ -596,6 +619,9 @@ extension RemoteSettingsRecord: Equatable, Hashable {
596619
if lhs.lastModified != rhs.lastModified {
597620
return false
598621
}
622+
if lhs.deleted != rhs.deleted {
623+
return false
624+
}
599625
if lhs.attachment != rhs.attachment {
600626
return false
601627
}
@@ -608,6 +634,7 @@ extension RemoteSettingsRecord: Equatable, Hashable {
608634
public func hash(into hasher: inout Hasher) {
609635
hasher.combine(id)
610636
hasher.combine(lastModified)
637+
hasher.combine(deleted)
611638
hasher.combine(attachment)
612639
hasher.combine(fields)
613640
}
@@ -618,6 +645,7 @@ public struct FfiConverterTypeRemoteSettingsRecord: FfiConverterRustBuffer {
618645
return try RemoteSettingsRecord(
619646
id: FfiConverterString.read(from: &buf),
620647
lastModified: FfiConverterUInt64.read(from: &buf),
648+
deleted: FfiConverterBool.read(from: &buf),
621649
attachment: FfiConverterOptionTypeAttachment.read(from: &buf),
622650
fields: FfiConverterTypeRsJsonObject.read(from: &buf)
623651
)
@@ -626,6 +654,7 @@ public struct FfiConverterTypeRemoteSettingsRecord: FfiConverterRustBuffer {
626654
public static func write(_ value: RemoteSettingsRecord, into buf: inout [UInt8]) {
627655
FfiConverterString.write(value.id, into: &buf)
628656
FfiConverterUInt64.write(value.lastModified, into: &buf)
657+
FfiConverterBool.write(value.deleted, into: &buf)
629658
FfiConverterOptionTypeAttachment.write(value.attachment, into: &buf)
630659
FfiConverterTypeRsJsonObject.write(value.fields, into: &buf)
631660
}
@@ -697,9 +726,6 @@ public enum RemoteSettingsError {
697726
// Simple error enums only carry a message
698727
case FileError(message: String)
699728

700-
// Simple error enums only carry a message
701-
case ParseIntError(message: String)
702-
703729
// Simple error enums only carry a message
704730
case RequestError(message: String)
705731

@@ -734,27 +760,23 @@ public struct FfiConverterTypeRemoteSettingsError: FfiConverterRustBuffer {
734760
message: FfiConverterString.read(from: &buf)
735761
)
736762

737-
case 3: return try .ParseIntError(
738-
message: FfiConverterString.read(from: &buf)
739-
)
740-
741-
case 4: return try .RequestError(
763+
case 3: return try .RequestError(
742764
message: FfiConverterString.read(from: &buf)
743765
)
744766

745-
case 5: return try .UrlParsingError(
767+
case 4: return try .UrlParsingError(
746768
message: FfiConverterString.read(from: &buf)
747769
)
748770

749-
case 6: return try .BackoffError(
771+
case 5: return try .BackoffError(
750772
message: FfiConverterString.read(from: &buf)
751773
)
752774

753-
case 7: return try .ResponseError(
775+
case 6: return try .ResponseError(
754776
message: FfiConverterString.read(from: &buf)
755777
)
756778

757-
case 8: return try .AttachmentsUnsupportedError(
779+
case 7: return try .AttachmentsUnsupportedError(
758780
message: FfiConverterString.read(from: &buf)
759781
)
760782

@@ -768,18 +790,16 @@ public struct FfiConverterTypeRemoteSettingsError: FfiConverterRustBuffer {
768790
writeInt(&buf, Int32(1))
769791
case let .FileError(message):
770792
writeInt(&buf, Int32(2))
771-
case let .ParseIntError(message):
772-
writeInt(&buf, Int32(3))
773793
case let .RequestError(message):
774-
writeInt(&buf, Int32(4))
794+
writeInt(&buf, Int32(3))
775795
case let .UrlParsingError(message):
776-
writeInt(&buf, Int32(5))
796+
writeInt(&buf, Int32(4))
777797
case let .BackoffError(message):
778-
writeInt(&buf, Int32(6))
798+
writeInt(&buf, Int32(5))
779799
case let .ResponseError(message):
780-
writeInt(&buf, Int32(7))
800+
writeInt(&buf, Int32(6))
781801
case let .AttachmentsUnsupportedError(message):
782-
writeInt(&buf, Int32(8))
802+
writeInt(&buf, Int32(7))
783803
}
784804
}
785805
}

‎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: 8, day: 6, hour: 5, minute: 16, second: 23))
28+
public static let info = BuildInfo(buildDate: DateComponents(calendar: Calendar.current, timeZone: TimeZone(abbreviation: "UTC"), year: 2023, month: 8, day: 9, hour: 5, minute: 42, second: 26))
2929
}
3030

3131
enum NimbusEvents {

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

Lines changed: 40 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -307,6 +307,27 @@ private struct FfiConverterUInt64: FfiConverterPrimitive {
307307
}
308308
}
309309

310+
private struct FfiConverterBool: FfiConverter {
311+
typealias FfiType = Int8
312+
typealias SwiftType = Bool
313+
314+
public static func lift(_ value: Int8) throws -> Bool {
315+
return value != 0
316+
}
317+
318+
public static func lower(_ value: Bool) -> Int8 {
319+
return value ? 1 : 0
320+
}
321+
322+
public static func read(from buf: inout (data: Data, offset: Data.Index)) throws -> Bool {
323+
return try lift(readInt(&buf))
324+
}
325+
326+
public static func write(_ value: Bool, into buf: inout [UInt8]) {
327+
writeInt(&buf, lower(value))
328+
}
329+
}
330+
310331
private struct FfiConverterString: FfiConverter {
311332
typealias SwiftType = String
312333
typealias FfiType = RustBuffer
@@ -575,14 +596,16 @@ public func FfiConverterTypeRemoteSettingsConfig_lower(_ value: RemoteSettingsCo
575596
public struct RemoteSettingsRecord {
576597
public var id: String
577598
public var lastModified: UInt64
599+
public var deleted: Bool
578600
public var attachment: Attachment?
579601
public var fields: RsJsonObject
580602

581603
// Default memberwise initializers are never public by default, so we
582604
// declare one manually.
583-
public init(id: String, lastModified: UInt64, attachment: Attachment?, fields: RsJsonObject) {
605+
public init(id: String, lastModified: UInt64, deleted: Bool, attachment: Attachment?, fields: RsJsonObject) {
584606
self.id = id
585607
self.lastModified = lastModified
608+
self.deleted = deleted
586609
self.attachment = attachment
587610
self.fields = fields
588611
}
@@ -596,6 +619,9 @@ extension RemoteSettingsRecord: Equatable, Hashable {
596619
if lhs.lastModified != rhs.lastModified {
597620
return false
598621
}
622+
if lhs.deleted != rhs.deleted {
623+
return false
624+
}
599625
if lhs.attachment != rhs.attachment {
600626
return false
601627
}
@@ -608,6 +634,7 @@ extension RemoteSettingsRecord: Equatable, Hashable {
608634
public func hash(into hasher: inout Hasher) {
609635
hasher.combine(id)
610636
hasher.combine(lastModified)
637+
hasher.combine(deleted)
611638
hasher.combine(attachment)
612639
hasher.combine(fields)
613640
}
@@ -618,6 +645,7 @@ public struct FfiConverterTypeRemoteSettingsRecord: FfiConverterRustBuffer {
618645
return try RemoteSettingsRecord(
619646
id: FfiConverterString.read(from: &buf),
620647
lastModified: FfiConverterUInt64.read(from: &buf),
648+
deleted: FfiConverterBool.read(from: &buf),
621649
attachment: FfiConverterOptionTypeAttachment.read(from: &buf),
622650
fields: FfiConverterTypeRsJsonObject.read(from: &buf)
623651
)
@@ -626,6 +654,7 @@ public struct FfiConverterTypeRemoteSettingsRecord: FfiConverterRustBuffer {
626654
public static func write(_ value: RemoteSettingsRecord, into buf: inout [UInt8]) {
627655
FfiConverterString.write(value.id, into: &buf)
628656
FfiConverterUInt64.write(value.lastModified, into: &buf)
657+
FfiConverterBool.write(value.deleted, into: &buf)
629658
FfiConverterOptionTypeAttachment.write(value.attachment, into: &buf)
630659
FfiConverterTypeRsJsonObject.write(value.fields, into: &buf)
631660
}
@@ -697,9 +726,6 @@ public enum RemoteSettingsError {
697726
// Simple error enums only carry a message
698727
case FileError(message: String)
699728

700-
// Simple error enums only carry a message
701-
case ParseIntError(message: String)
702-
703729
// Simple error enums only carry a message
704730
case RequestError(message: String)
705731

@@ -734,27 +760,23 @@ public struct FfiConverterTypeRemoteSettingsError: FfiConverterRustBuffer {
734760
message: FfiConverterString.read(from: &buf)
735761
)
736762

737-
case 3: return try .ParseIntError(
738-
message: FfiConverterString.read(from: &buf)
739-
)
740-
741-
case 4: return try .RequestError(
763+
case 3: return try .RequestError(
742764
message: FfiConverterString.read(from: &buf)
743765
)
744766

745-
case 5: return try .UrlParsingError(
767+
case 4: return try .UrlParsingError(
746768
message: FfiConverterString.read(from: &buf)
747769
)
748770

749-
case 6: return try .BackoffError(
771+
case 5: return try .BackoffError(
750772
message: FfiConverterString.read(from: &buf)
751773
)
752774

753-
case 7: return try .ResponseError(
775+
case 6: return try .ResponseError(
754776
message: FfiConverterString.read(from: &buf)
755777
)
756778

757-
case 8: return try .AttachmentsUnsupportedError(
779+
case 7: return try .AttachmentsUnsupportedError(
758780
message: FfiConverterString.read(from: &buf)
759781
)
760782

@@ -768,18 +790,16 @@ public struct FfiConverterTypeRemoteSettingsError: FfiConverterRustBuffer {
768790
writeInt(&buf, Int32(1))
769791
case let .FileError(message):
770792
writeInt(&buf, Int32(2))
771-
case let .ParseIntError(message):
772-
writeInt(&buf, Int32(3))
773793
case let .RequestError(message):
774-
writeInt(&buf, Int32(4))
794+
writeInt(&buf, Int32(3))
775795
case let .UrlParsingError(message):
776-
writeInt(&buf, Int32(5))
796+
writeInt(&buf, Int32(4))
777797
case let .BackoffError(message):
778-
writeInt(&buf, Int32(6))
798+
writeInt(&buf, Int32(5))
779799
case let .ResponseError(message):
780-
writeInt(&buf, Int32(7))
800+
writeInt(&buf, Int32(6))
781801
case let .AttachmentsUnsupportedError(message):
782-
writeInt(&buf, Int32(8))
802+
writeInt(&buf, Int32(7))
783803
}
784804
}
785805
}

0 commit comments

Comments
 (0)