Skip to content

Commit 3689890

Browse files
author
Firefox Sync Engineering
committed
Nightly auto-update (131.0.20240821050323)
1 parent 5f9d1db commit 3689890

File tree

4 files changed

+156
-9
lines changed

4 files changed

+156
-9
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 = "15d6eb9aabc77825799f74af8d735677f63e5072aa6efe0b40fe9b37d252c511"
5-
let version = "131.0.20240815050258"
6-
let url = "https://firefox-ci-tc.services.mozilla.com/api/index/v1/task/project.application-services.v2.swift.131.20240815050258/artifacts/public/build/MozillaRustComponents.xcframework.zip"
4+
let checksum = "0830da14106bd3068c8beb68cf6b4a5e0ce6251d40f31446c812ab18dc244de0"
5+
let version = "131.0.20240821050323"
6+
let url = "https://firefox-ci-tc.services.mozilla.com/api/index/v1/task/project.application-services.v2.swift.131.20240821050323/artifacts/public/build/MozillaRustComponents.xcframework.zip"
77

88
// Focus xcframework
9-
let focusChecksum = "1b122c43171ee2ab45febbba97da1b70f2645a864f1167be200adfdf33604f0e"
10-
let focusUrl = "https://firefox-ci-tc.services.mozilla.com/api/index/v1/task/project.application-services.v2.swift.131.20240815050258/artifacts/public/build/FocusRustComponents.xcframework.zip"
9+
let focusChecksum = "421ed588c823e5906165434e74a30706510689b0c378a4ebb1ef1b049b149c0d"
10+
let focusUrl = "https://firefox-ci-tc.services.mozilla.com/api/index/v1/task/project.application-services.v2.swift.131.20240821050323/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: 8, day: 15, hour: 5, minute: 16, second: 51))
26+
public static let info = BuildInfo(buildDate: DateComponents(calendar: Calendar.current, timeZone: TimeZone(abbreviation: "UTC"), year: 2024, month: 8, day: 21, hour: 5, minute: 13, second: 36))
2727
}
2828

2929
enum NimbusEvents {

swift-source/all/Generated/suggest.swift

Lines changed: 149 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1016,12 +1016,14 @@ public func FfiConverterTypeSuggestGlobalConfig_lower(_ value: SuggestGlobalConf
10161016

10171017
public struct SuggestIngestionConstraints {
10181018
public var providers: [SuggestionProvider]?
1019+
public var providerConstraints: SuggestionProviderConstraints?
10191020
public var emptyOnly: Bool
10201021

10211022
// Default memberwise initializers are never public by default, so we
10221023
// declare one manually.
1023-
public init(providers: [SuggestionProvider]? = nil, emptyOnly: Bool = false) {
1024+
public init(providers: [SuggestionProvider]? = nil, providerConstraints: SuggestionProviderConstraints? = nil, emptyOnly: Bool = false) {
10241025
self.providers = providers
1026+
self.providerConstraints = providerConstraints
10251027
self.emptyOnly = emptyOnly
10261028
}
10271029
}
@@ -1033,6 +1035,9 @@ extension SuggestIngestionConstraints: Equatable, Hashable {
10331035
if lhs.providers != rhs.providers {
10341036
return false
10351037
}
1038+
if lhs.providerConstraints != rhs.providerConstraints {
1039+
return false
1040+
}
10361041
if lhs.emptyOnly != rhs.emptyOnly {
10371042
return false
10381043
}
@@ -1041,6 +1046,7 @@ extension SuggestIngestionConstraints: Equatable, Hashable {
10411046

10421047
public func hash(into hasher: inout Hasher) {
10431048
hasher.combine(providers)
1049+
hasher.combine(providerConstraints)
10441050
hasher.combine(emptyOnly)
10451051
}
10461052
}
@@ -1051,12 +1057,14 @@ public struct FfiConverterTypeSuggestIngestionConstraints: FfiConverterRustBuffe
10511057
return
10521058
try SuggestIngestionConstraints(
10531059
providers: FfiConverterOptionSequenceTypeSuggestionProvider.read(from: &buf),
1060+
providerConstraints: FfiConverterOptionTypeSuggestionProviderConstraints.read(from: &buf),
10541061
emptyOnly: FfiConverterBool.read(from: &buf)
10551062
)
10561063
}
10571064

10581065
public static func write(_ value: SuggestIngestionConstraints, into buf: inout [UInt8]) {
10591066
FfiConverterOptionSequenceTypeSuggestionProvider.write(value.providers, into: &buf)
1067+
FfiConverterOptionTypeSuggestionProviderConstraints.write(value.providerConstraints, into: &buf)
10601068
FfiConverterBool.write(value.emptyOnly, into: &buf)
10611069
}
10621070
}
@@ -1128,16 +1136,67 @@ public func FfiConverterTypeSuggestIngestionMetrics_lower(_ value: SuggestIngest
11281136
}
11291137

11301138

1139+
public struct SuggestionProviderConstraints {
1140+
public var exposureSuggestionTypes: [String]?
1141+
1142+
// Default memberwise initializers are never public by default, so we
1143+
// declare one manually.
1144+
public init(exposureSuggestionTypes: [String]? = nil) {
1145+
self.exposureSuggestionTypes = exposureSuggestionTypes
1146+
}
1147+
}
1148+
1149+
1150+
1151+
extension SuggestionProviderConstraints: Equatable, Hashable {
1152+
public static func ==(lhs: SuggestionProviderConstraints, rhs: SuggestionProviderConstraints) -> Bool {
1153+
if lhs.exposureSuggestionTypes != rhs.exposureSuggestionTypes {
1154+
return false
1155+
}
1156+
return true
1157+
}
1158+
1159+
public func hash(into hasher: inout Hasher) {
1160+
hasher.combine(exposureSuggestionTypes)
1161+
}
1162+
}
1163+
1164+
1165+
public struct FfiConverterTypeSuggestionProviderConstraints: FfiConverterRustBuffer {
1166+
public static func read(from buf: inout (data: Data, offset: Data.Index)) throws -> SuggestionProviderConstraints {
1167+
return
1168+
try SuggestionProviderConstraints(
1169+
exposureSuggestionTypes: FfiConverterOptionSequenceString.read(from: &buf)
1170+
)
1171+
}
1172+
1173+
public static func write(_ value: SuggestionProviderConstraints, into buf: inout [UInt8]) {
1174+
FfiConverterOptionSequenceString.write(value.exposureSuggestionTypes, into: &buf)
1175+
}
1176+
}
1177+
1178+
1179+
public func FfiConverterTypeSuggestionProviderConstraints_lift(_ buf: RustBuffer) throws -> SuggestionProviderConstraints {
1180+
return try FfiConverterTypeSuggestionProviderConstraints.lift(buf)
1181+
}
1182+
1183+
public func FfiConverterTypeSuggestionProviderConstraints_lower(_ value: SuggestionProviderConstraints) -> RustBuffer {
1184+
return FfiConverterTypeSuggestionProviderConstraints.lower(value)
1185+
}
1186+
1187+
11311188
public struct SuggestionQuery {
11321189
public var keyword: String
11331190
public var providers: [SuggestionProvider]
1191+
public var providerConstraints: SuggestionProviderConstraints?
11341192
public var limit: Int32?
11351193

11361194
// Default memberwise initializers are never public by default, so we
11371195
// declare one manually.
1138-
public init(keyword: String, providers: [SuggestionProvider], limit: Int32? = nil) {
1196+
public init(keyword: String, providers: [SuggestionProvider], providerConstraints: SuggestionProviderConstraints? = nil, limit: Int32? = nil) {
11391197
self.keyword = keyword
11401198
self.providers = providers
1199+
self.providerConstraints = providerConstraints
11411200
self.limit = limit
11421201
}
11431202
}
@@ -1152,6 +1211,9 @@ extension SuggestionQuery: Equatable, Hashable {
11521211
if lhs.providers != rhs.providers {
11531212
return false
11541213
}
1214+
if lhs.providerConstraints != rhs.providerConstraints {
1215+
return false
1216+
}
11551217
if lhs.limit != rhs.limit {
11561218
return false
11571219
}
@@ -1161,6 +1223,7 @@ extension SuggestionQuery: Equatable, Hashable {
11611223
public func hash(into hasher: inout Hasher) {
11621224
hasher.combine(keyword)
11631225
hasher.combine(providers)
1226+
hasher.combine(providerConstraints)
11641227
hasher.combine(limit)
11651228
}
11661229
}
@@ -1172,13 +1235,15 @@ public struct FfiConverterTypeSuggestionQuery: FfiConverterRustBuffer {
11721235
try SuggestionQuery(
11731236
keyword: FfiConverterString.read(from: &buf),
11741237
providers: FfiConverterSequenceTypeSuggestionProvider.read(from: &buf),
1238+
providerConstraints: FfiConverterOptionTypeSuggestionProviderConstraints.read(from: &buf),
11751239
limit: FfiConverterOptionInt32.read(from: &buf)
11761240
)
11771241
}
11781242

11791243
public static func write(_ value: SuggestionQuery, into buf: inout [UInt8]) {
11801244
FfiConverterString.write(value.keyword, into: &buf)
11811245
FfiConverterSequenceTypeSuggestionProvider.write(value.providers, into: &buf)
1246+
FfiConverterOptionTypeSuggestionProviderConstraints.write(value.providerConstraints, into: &buf)
11821247
FfiConverterOptionInt32.write(value.limit, into: &buf)
11831248
}
11841249
}
@@ -1400,6 +1465,8 @@ public enum Suggestion {
14001465
)
14011466
case fakespot(fakespotGrade: String, productId: String, rating: Double, title: String, totalReviews: Int64, url: String, icon: [UInt8]?, iconMimetype: String?, score: Double
14021467
)
1468+
case exposure(suggestionType: String, score: Double
1469+
)
14031470
}
14041471

14051472

@@ -1434,6 +1501,9 @@ public struct FfiConverterTypeSuggestion: FfiConverterRustBuffer {
14341501
case 8: return .fakespot(fakespotGrade: try FfiConverterString.read(from: &buf), productId: try FfiConverterString.read(from: &buf), rating: try FfiConverterDouble.read(from: &buf), title: try FfiConverterString.read(from: &buf), totalReviews: try FfiConverterInt64.read(from: &buf), url: try FfiConverterString.read(from: &buf), icon: try FfiConverterOptionSequenceUInt8.read(from: &buf), iconMimetype: try FfiConverterOptionString.read(from: &buf), score: try FfiConverterDouble.read(from: &buf)
14351502
)
14361503

1504+
case 9: return .exposure(suggestionType: try FfiConverterString.read(from: &buf), score: try FfiConverterDouble.read(from: &buf)
1505+
)
1506+
14371507
default: throw UniffiInternalError.unexpectedEnumCase
14381508
}
14391509
}
@@ -1525,6 +1595,12 @@ public struct FfiConverterTypeSuggestion: FfiConverterRustBuffer {
15251595
FfiConverterOptionString.write(iconMimetype, into: &buf)
15261596
FfiConverterDouble.write(score, into: &buf)
15271597

1598+
1599+
case let .exposure(suggestionType,score):
1600+
writeInt(&buf, Int32(9))
1601+
FfiConverterString.write(suggestionType, into: &buf)
1602+
FfiConverterDouble.write(score, into: &buf)
1603+
15281604
}
15291605
}
15301606
}
@@ -1558,6 +1634,7 @@ public enum SuggestionProvider {
15581634
case weather
15591635
case ampMobile
15601636
case fakespot
1637+
case exposure
15611638
}
15621639

15631640

@@ -1586,6 +1663,8 @@ public struct FfiConverterTypeSuggestionProvider: FfiConverterRustBuffer {
15861663

15871664
case 9: return .fakespot
15881665

1666+
case 10: return .exposure
1667+
15891668
default: throw UniffiInternalError.unexpectedEnumCase
15901669
}
15911670
}
@@ -1629,6 +1708,10 @@ public struct FfiConverterTypeSuggestionProvider: FfiConverterRustBuffer {
16291708
case .fakespot:
16301709
writeInt(&buf, Int32(9))
16311710

1711+
1712+
case .exposure:
1713+
writeInt(&buf, Int32(10))
1714+
16321715
}
16331716
}
16341717
}
@@ -1690,6 +1773,27 @@ fileprivate struct FfiConverterOptionString: FfiConverterRustBuffer {
16901773
}
16911774
}
16921775

1776+
fileprivate struct FfiConverterOptionTypeSuggestionProviderConstraints: FfiConverterRustBuffer {
1777+
typealias SwiftType = SuggestionProviderConstraints?
1778+
1779+
public static func write(_ value: SwiftType, into buf: inout [UInt8]) {
1780+
guard let value = value else {
1781+
writeInt(&buf, Int8(0))
1782+
return
1783+
}
1784+
writeInt(&buf, Int8(1))
1785+
FfiConverterTypeSuggestionProviderConstraints.write(value, into: &buf)
1786+
}
1787+
1788+
public static func read(from buf: inout (data: Data, offset: Data.Index)) throws -> SwiftType {
1789+
switch try readInt(&buf) as Int8 {
1790+
case 0: return nil
1791+
case 1: return try FfiConverterTypeSuggestionProviderConstraints.read(from: &buf)
1792+
default: throw UniffiInternalError.unexpectedOptionalTag
1793+
}
1794+
}
1795+
}
1796+
16931797
fileprivate struct FfiConverterOptionTypeInterruptKind: FfiConverterRustBuffer {
16941798
typealias SwiftType = InterruptKind?
16951799

@@ -1753,6 +1857,27 @@ fileprivate struct FfiConverterOptionSequenceUInt8: FfiConverterRustBuffer {
17531857
}
17541858
}
17551859

1860+
fileprivate struct FfiConverterOptionSequenceString: FfiConverterRustBuffer {
1861+
typealias SwiftType = [String]?
1862+
1863+
public static func write(_ value: SwiftType, into buf: inout [UInt8]) {
1864+
guard let value = value else {
1865+
writeInt(&buf, Int8(0))
1866+
return
1867+
}
1868+
writeInt(&buf, Int8(1))
1869+
FfiConverterSequenceString.write(value, into: &buf)
1870+
}
1871+
1872+
public static func read(from buf: inout (data: Data, offset: Data.Index)) throws -> SwiftType {
1873+
switch try readInt(&buf) as Int8 {
1874+
case 0: return nil
1875+
case 1: return try FfiConverterSequenceString.read(from: &buf)
1876+
default: throw UniffiInternalError.unexpectedOptionalTag
1877+
}
1878+
}
1879+
}
1880+
17561881
fileprivate struct FfiConverterOptionSequenceTypeSuggestionProvider: FfiConverterRustBuffer {
17571882
typealias SwiftType = [SuggestionProvider]?
17581883

@@ -1817,6 +1942,28 @@ fileprivate struct FfiConverterSequenceUInt8: FfiConverterRustBuffer {
18171942
}
18181943
}
18191944

1945+
fileprivate struct FfiConverterSequenceString: FfiConverterRustBuffer {
1946+
typealias SwiftType = [String]
1947+
1948+
public static func write(_ value: [String], into buf: inout [UInt8]) {
1949+
let len = Int32(value.count)
1950+
writeInt(&buf, len)
1951+
for item in value {
1952+
FfiConverterString.write(item, into: &buf)
1953+
}
1954+
}
1955+
1956+
public static func read(from buf: inout (data: Data, offset: Data.Index)) throws -> [String] {
1957+
let len: Int32 = try readInt(&buf)
1958+
var seq = [String]()
1959+
seq.reserveCapacity(Int(len))
1960+
for _ in 0 ..< len {
1961+
seq.append(try FfiConverterString.read(from: &buf))
1962+
}
1963+
return seq
1964+
}
1965+
}
1966+
18201967
fileprivate struct FfiConverterSequenceTypeLabeledTimingSample: FfiConverterRustBuffer {
18211968
typealias SwiftType = [LabeledTimingSample]
18221969

swift-source/focus/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: 8, day: 15, hour: 5, minute: 16, second: 54))
26+
public static let info = BuildInfo(buildDate: DateComponents(calendar: Calendar.current, timeZone: TimeZone(abbreviation: "UTC"), year: 2024, month: 8, day: 21, hour: 5, minute: 13, second: 38))
2727
}
2828

2929
enum NimbusEvents {

0 commit comments

Comments
 (0)