Skip to content

Commit 40a6bac

Browse files
author
Firefox Sync Engineering
committed
Nightly auto-update (120.0.20231016222808)
1 parent 314c701 commit 40a6bac

File tree

5 files changed

+79
-31
lines changed

5 files changed

+79
-31
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 = "ab662923bad291baca19c355cbd02ec0739a98b25ee40d5a53b70bd4db50b317"
5-
let version = "120.0.20231014050328"
6-
let url = "https://firefox-ci-tc.services.mozilla.com/api/index/v1/task/project.application-services.v2.swift.120.20231014050328/artifacts/public/build/MozillaRustComponents.xcframework.zip"
4+
let checksum = "e2cbdeb742162ac6ffe3703f3381bb2b5d4ad47ebab4625db13a220f06fa75d8"
5+
let version = "120.0.20231016222808"
6+
let url = "https://firefox-ci-tc.services.mozilla.com/api/index/v1/task/project.application-services.v2.swift.120.20231016222808/artifacts/public/build/MozillaRustComponents.xcframework.zip"
77

88
// Focus xcframework
9-
let focusChecksum = "4612cbbf65c3e60858790ca26a7e136f49adce0482d55a200ec45990bedb575a"
10-
let focusUrl = "https://firefox-ci-tc.services.mozilla.com/api/index/v1/task/project.application-services.v2.swift.120.20231014050328/artifacts/public/build/FocusRustComponents.xcframework.zip"
9+
let focusChecksum = "e83067b829da41ab7763648adc56d4af071341b36c63616fe808916f72b72eca"
10+
let focusUrl = "https://firefox-ci-tc.services.mozilla.com/api/index/v1/task/project.application-services.v2.swift.120.20231016222808/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: 10, day: 14, hour: 5, minute: 26, second: 30))
28+
public static let info = BuildInfo(buildDate: DateComponents(calendar: Calendar.current, timeZone: TimeZone(abbreviation: "UTC"), year: 2023, month: 10, day: 16, hour: 23, minute: 10, second: 50))
2929
}
3030

3131
enum NimbusEvents {

swift-source/all/Generated/places.swift

Lines changed: 28 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1843,14 +1843,14 @@ public struct HistoryVisitInfo {
18431843
public var url: Url
18441844
public var title: String?
18451845
public var timestamp: PlacesTimestamp
1846-
public var visitType: VisitTransition
1846+
public var visitType: VisitType
18471847
public var isHidden: Bool
18481848
public var previewImageUrl: Url?
18491849
public var isRemote: Bool
18501850

18511851
// Default memberwise initializers are never public by default, so we
18521852
// declare one manually.
1853-
public init(url: Url, title: String?, timestamp: PlacesTimestamp, visitType: VisitTransition, isHidden: Bool, previewImageUrl: Url?, isRemote: Bool) {
1853+
public init(url: Url, title: String?, timestamp: PlacesTimestamp, visitType: VisitType, isHidden: Bool, previewImageUrl: Url?, isRemote: Bool) {
18541854
self.url = url
18551855
self.title = title
18561856
self.timestamp = timestamp
@@ -1904,7 +1904,7 @@ public struct FfiConverterTypeHistoryVisitInfo: FfiConverterRustBuffer {
19041904
url: FfiConverterTypeUrl.read(from: &buf),
19051905
title: FfiConverterOptionString.read(from: &buf),
19061906
timestamp: FfiConverterTypePlacesTimestamp.read(from: &buf),
1907-
visitType: FfiConverterTypeVisitTransition.read(from: &buf),
1907+
visitType: FfiConverterTypeVisitType.read(from: &buf),
19081908
isHidden: FfiConverterBool.read(from: &buf),
19091909
previewImageUrl: FfiConverterOptionTypeUrl.read(from: &buf),
19101910
isRemote: FfiConverterBool.read(from: &buf)
@@ -1915,7 +1915,7 @@ public struct FfiConverterTypeHistoryVisitInfo: FfiConverterRustBuffer {
19151915
FfiConverterTypeUrl.write(value.url, into: &buf)
19161916
FfiConverterOptionString.write(value.title, into: &buf)
19171917
FfiConverterTypePlacesTimestamp.write(value.timestamp, into: &buf)
1918-
FfiConverterTypeVisitTransition.write(value.visitType, into: &buf)
1918+
FfiConverterTypeVisitType.write(value.visitType, into: &buf)
19191919
FfiConverterBool.write(value.isHidden, into: &buf)
19201920
FfiConverterOptionTypeUrl.write(value.previewImageUrl, into: &buf)
19211921
FfiConverterBool.write(value.isRemote, into: &buf)
@@ -2426,7 +2426,7 @@ public func FfiConverterTypeTopFrecentSiteInfo_lower(_ value: TopFrecentSiteInfo
24262426
public struct VisitObservation {
24272427
public var url: Url
24282428
public var title: String?
2429-
public var visitType: VisitTransition?
2429+
public var visitType: VisitType?
24302430
public var isError: Bool?
24312431
public var isRedirectSource: Bool?
24322432
public var isPermanentRedirectSource: Bool?
@@ -2437,7 +2437,7 @@ public struct VisitObservation {
24372437

24382438
// Default memberwise initializers are never public by default, so we
24392439
// declare one manually.
2440-
public init(url: Url, title: String? = nil, visitType: VisitTransition?, isError: Bool? = nil, isRedirectSource: Bool? = nil, isPermanentRedirectSource: Bool? = nil, at: PlacesTimestamp? = nil, referrer: Url? = nil, isRemote: Bool? = nil, previewImageUrl: Url? = nil) {
2440+
public init(url: Url, title: String? = nil, visitType: VisitType?, isError: Bool? = nil, isRedirectSource: Bool? = nil, isPermanentRedirectSource: Bool? = nil, at: PlacesTimestamp? = nil, referrer: Url? = nil, isRemote: Bool? = nil, previewImageUrl: Url? = nil) {
24412441
self.url = url
24422442
self.title = title
24432443
self.visitType = visitType
@@ -2505,7 +2505,7 @@ public struct FfiConverterTypeVisitObservation: FfiConverterRustBuffer {
25052505
return try VisitObservation(
25062506
url: FfiConverterTypeUrl.read(from: &buf),
25072507
title: FfiConverterOptionString.read(from: &buf),
2508-
visitType: FfiConverterOptionTypeVisitTransition.read(from: &buf),
2508+
visitType: FfiConverterOptionTypeVisitType.read(from: &buf),
25092509
isError: FfiConverterOptionBool.read(from: &buf),
25102510
isRedirectSource: FfiConverterOptionBool.read(from: &buf),
25112511
isPermanentRedirectSource: FfiConverterOptionBool.read(from: &buf),
@@ -2519,7 +2519,7 @@ public struct FfiConverterTypeVisitObservation: FfiConverterRustBuffer {
25192519
public static func write(_ value: VisitObservation, into buf: inout [UInt8]) {
25202520
FfiConverterTypeUrl.write(value.url, into: &buf)
25212521
FfiConverterOptionString.write(value.title, into: &buf)
2522-
FfiConverterOptionTypeVisitTransition.write(value.visitType, into: &buf)
2522+
FfiConverterOptionTypeVisitType.write(value.visitType, into: &buf)
25232523
FfiConverterOptionBool.write(value.isError, into: &buf)
25242524
FfiConverterOptionBool.write(value.isRedirectSource, into: &buf)
25252525
FfiConverterOptionBool.write(value.isPermanentRedirectSource, into: &buf)
@@ -2972,7 +2972,7 @@ extension PlacesApiError: Error {}
29722972

29732973
// Note that we don't yet support `indirect` for enums.
29742974
// See https://github.com/mozilla/uniffi-rs/issues/396 for further discussion.
2975-
public enum VisitTransition {
2975+
public enum VisitType {
29762976
case link
29772977
case typed
29782978
case bookmark
@@ -2982,12 +2982,13 @@ public enum VisitTransition {
29822982
case download
29832983
case framedLink
29842984
case reload
2985+
case updatePlace
29852986
}
29862987

2987-
public struct FfiConverterTypeVisitTransition: FfiConverterRustBuffer {
2988-
typealias SwiftType = VisitTransition
2988+
public struct FfiConverterTypeVisitType: FfiConverterRustBuffer {
2989+
typealias SwiftType = VisitType
29892990

2990-
public static func read(from buf: inout (data: Data, offset: Data.Index)) throws -> VisitTransition {
2991+
public static func read(from buf: inout (data: Data, offset: Data.Index)) throws -> VisitType {
29912992
let variant: Int32 = try readInt(&buf)
29922993
switch variant {
29932994
case 1: return .link
@@ -3008,11 +3009,13 @@ public struct FfiConverterTypeVisitTransition: FfiConverterRustBuffer {
30083009

30093010
case 9: return .reload
30103011

3012+
case 10: return .updatePlace
3013+
30113014
default: throw UniffiInternalError.unexpectedEnumCase
30123015
}
30133016
}
30143017

3015-
public static func write(_ value: VisitTransition, into buf: inout [UInt8]) {
3018+
public static func write(_ value: VisitType, into buf: inout [UInt8]) {
30163019
switch value {
30173020
case .link:
30183021
writeInt(&buf, Int32(1))
@@ -3040,19 +3043,22 @@ public struct FfiConverterTypeVisitTransition: FfiConverterRustBuffer {
30403043

30413044
case .reload:
30423045
writeInt(&buf, Int32(9))
3046+
3047+
case .updatePlace:
3048+
writeInt(&buf, Int32(10))
30433049
}
30443050
}
30453051
}
30463052

3047-
public func FfiConverterTypeVisitTransition_lift(_ buf: RustBuffer) throws -> VisitTransition {
3048-
return try FfiConverterTypeVisitTransition.lift(buf)
3053+
public func FfiConverterTypeVisitType_lift(_ buf: RustBuffer) throws -> VisitType {
3054+
return try FfiConverterTypeVisitType.lift(buf)
30493055
}
30503056

3051-
public func FfiConverterTypeVisitTransition_lower(_ value: VisitTransition) -> RustBuffer {
3052-
return FfiConverterTypeVisitTransition.lower(value)
3057+
public func FfiConverterTypeVisitType_lower(_ value: VisitType) -> RustBuffer {
3058+
return FfiConverterTypeVisitType.lower(value)
30533059
}
30543060

3055-
extension VisitTransition: Equatable, Hashable {}
3061+
extension VisitType: Equatable, Hashable {}
30563062

30573063
private struct FfiConverterOptionUInt32: FfiConverterRustBuffer {
30583064
typealias SwiftType = UInt32?
@@ -3201,22 +3207,22 @@ private struct FfiConverterOptionTypeDocumentType: FfiConverterRustBuffer {
32013207
}
32023208
}
32033209

3204-
private struct FfiConverterOptionTypeVisitTransition: FfiConverterRustBuffer {
3205-
typealias SwiftType = VisitTransition?
3210+
private struct FfiConverterOptionTypeVisitType: FfiConverterRustBuffer {
3211+
typealias SwiftType = VisitType?
32063212

32073213
public static func write(_ value: SwiftType, into buf: inout [UInt8]) {
32083214
guard let value = value else {
32093215
writeInt(&buf, Int8(0))
32103216
return
32113217
}
32123218
writeInt(&buf, Int8(1))
3213-
FfiConverterTypeVisitTransition.write(value, into: &buf)
3219+
FfiConverterTypeVisitType.write(value, into: &buf)
32143220
}
32153221

32163222
public static func read(from buf: inout (data: Data, offset: Data.Index)) throws -> SwiftType {
32173223
switch try readInt(&buf) as Int8 {
32183224
case 0: return nil
3219-
case 1: return try FfiConverterTypeVisitTransition.read(from: &buf)
3225+
case 1: return try FfiConverterTypeVisitType.read(from: &buf)
32203226
default: throw UniffiInternalError.unexpectedOptionalTag
32213227
}
32223228
}

swift-source/all/Generated/suggest.swift

Lines changed: 44 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -306,6 +306,19 @@ fileprivate struct FfiConverterUInt8: FfiConverterPrimitive {
306306
}
307307
}
308308

309+
fileprivate struct FfiConverterInt32: FfiConverterPrimitive {
310+
typealias FfiType = Int32
311+
typealias SwiftType = Int32
312+
313+
public static func read(from buf: inout (data: Data, offset: Data.Index)) throws -> Int32 {
314+
return try lift(readInt(&buf))
315+
}
316+
317+
public static func write(_ value: Int32, into buf: inout [UInt8]) {
318+
writeInt(&buf, lower(value))
319+
}
320+
}
321+
309322
fileprivate struct FfiConverterUInt64: FfiConverterPrimitive {
310323
typealias FfiType = UInt64
311324
typealias SwiftType = UInt64
@@ -567,12 +580,14 @@ public func FfiConverterTypeSuggestIngestionConstraints_lower(_ value: SuggestIn
567580
public struct SuggestionQuery {
568581
public var `keyword`: String
569582
public var `providers`: [SuggestionProvider]
583+
public var `limit`: Int32?
570584

571585
// Default memberwise initializers are never public by default, so we
572586
// declare one manually.
573-
public init(`keyword`: String, `providers`: [SuggestionProvider]) {
587+
public init(`keyword`: String, `providers`: [SuggestionProvider], `limit`: Int32? = nil) {
574588
self.`keyword` = `keyword`
575589
self.`providers` = `providers`
590+
self.`limit` = `limit`
576591
}
577592
}
578593

@@ -585,12 +600,16 @@ extension SuggestionQuery: Equatable, Hashable {
585600
if lhs.`providers` != rhs.`providers` {
586601
return false
587602
}
603+
if lhs.`limit` != rhs.`limit` {
604+
return false
605+
}
588606
return true
589607
}
590608

591609
public func hash(into hasher: inout Hasher) {
592610
hasher.combine(`keyword`)
593611
hasher.combine(`providers`)
612+
hasher.combine(`limit`)
594613
}
595614
}
596615

@@ -599,13 +618,15 @@ public struct FfiConverterTypeSuggestionQuery: FfiConverterRustBuffer {
599618
public static func read(from buf: inout (data: Data, offset: Data.Index)) throws -> SuggestionQuery {
600619
return try SuggestionQuery(
601620
`keyword`: FfiConverterString.read(from: &buf),
602-
`providers`: FfiConverterSequenceTypeSuggestionProvider.read(from: &buf)
621+
`providers`: FfiConverterSequenceTypeSuggestionProvider.read(from: &buf),
622+
`limit`: FfiConverterOptionInt32.read(from: &buf)
603623
)
604624
}
605625

606626
public static func write(_ value: SuggestionQuery, into buf: inout [UInt8]) {
607627
FfiConverterString.write(value.`keyword`, into: &buf)
608628
FfiConverterSequenceTypeSuggestionProvider.write(value.`providers`, into: &buf)
629+
FfiConverterOptionInt32.write(value.`limit`, into: &buf)
609630
}
610631
}
611632

@@ -858,6 +879,27 @@ extension SuggestionProvider: Equatable, Hashable {}
858879

859880

860881

882+
fileprivate struct FfiConverterOptionInt32: FfiConverterRustBuffer {
883+
typealias SwiftType = Int32?
884+
885+
public static func write(_ value: SwiftType, into buf: inout [UInt8]) {
886+
guard let value = value else {
887+
writeInt(&buf, Int8(0))
888+
return
889+
}
890+
writeInt(&buf, Int8(1))
891+
FfiConverterInt32.write(value, into: &buf)
892+
}
893+
894+
public static func read(from buf: inout (data: Data, offset: Data.Index)) throws -> SwiftType {
895+
switch try readInt(&buf) as Int8 {
896+
case 0: return nil
897+
case 1: return try FfiConverterInt32.read(from: &buf)
898+
default: throw UniffiInternalError.unexpectedOptionalTag
899+
}
900+
}
901+
}
902+
861903
fileprivate struct FfiConverterOptionUInt64: FfiConverterRustBuffer {
862904
typealias SwiftType = UInt64?
863905

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

3131
enum NimbusEvents {

0 commit comments

Comments
 (0)