Skip to content

Commit 8d6304f

Browse files
author
Firefox Sync Engineering
committed
Nightly auto-update (128.0.20240520192211)
1 parent dc26b38 commit 8d6304f

File tree

5 files changed

+96
-12
lines changed

5 files changed

+96
-12
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 = "af7798bf992df0aee1f01be896cc337ce6bba991bc3c2fb9209703c1b9271892"
5-
let version = "128.0.20240518050304"
6-
let url = "https://firefox-ci-tc.services.mozilla.com/api/index/v1/task/project.application-services.v2.swift.128.20240518050304/artifacts/public/build/MozillaRustComponents.xcframework.zip"
4+
let checksum = "61629b4efa1722d57b404c9fb178fcfb452a67743da28fcf266f56f95669b20d"
5+
let version = "128.0.20240520192211"
6+
let url = "https://firefox-ci-tc.services.mozilla.com/api/index/v1/task/project.application-services.v2.swift.128.20240520192211/artifacts/public/build/MozillaRustComponents.xcframework.zip"
77

88
// Focus xcframework
9-
let focusChecksum = "e0e7290613066d5b704f7d97ceb612ae4c8f38133d50305ed9256aa910a57037"
10-
let focusUrl = "https://firefox-ci-tc.services.mozilla.com/api/index/v1/task/project.application-services.v2.swift.128.20240518050304/artifacts/public/build/FocusRustComponents.xcframework.zip"
9+
let focusChecksum = "b8a1817a4e592abd6b2d1260e574cb476519d3c2b111566a8f31a57b571a7a2f"
10+
let focusUrl = "https://firefox-ci-tc.services.mozilla.com/api/index/v1/task/project.application-services.v2.swift.128.20240520192211/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: 5, day: 18, hour: 5, minute: 15, second: 57))
26+
public static let info = BuildInfo(buildDate: DateComponents(calendar: Calendar.current, timeZone: TimeZone(abbreviation: "UTC"), year: 2024, month: 5, day: 20, hour: 19, minute: 38, second: 12))
2727
}
2828

2929
enum NimbusEvents {

swift-source/all/Generated/suggest.swift

Lines changed: 88 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -521,7 +521,7 @@ public protocol SuggestStoreProtocol : AnyObject {
521521

522522
func ingest(constraints: SuggestIngestionConstraints) throws
523523

524-
func interrupt()
524+
func interrupt(kind: InterruptKind?)
525525

526526
func query(query: SuggestionQuery) throws -> [Suggestion]
527527

@@ -617,8 +617,9 @@ open func ingest(constraints: SuggestIngestionConstraints)throws {try rustCallW
617617
}
618618
}
619619

620-
open func interrupt() {try! rustCall() {
621-
uniffi_suggest_fn_method_suggeststore_interrupt(self.uniffiClonePointer(),$0
620+
open func interrupt(kind: InterruptKind? = nil) {try! rustCall() {
621+
uniffi_suggest_fn_method_suggeststore_interrupt(self.uniffiClonePointer(),
622+
FfiConverterOptionTypeInterruptKind.lower(kind),$0
622623
)
623624
}
624625
}
@@ -1003,6 +1004,68 @@ public func FfiConverterTypeSuggestionQuery_lower(_ value: SuggestionQuery) -> R
10031004
return FfiConverterTypeSuggestionQuery.lower(value)
10041005
}
10051006

1007+
// Note that we don't yet support `indirect` for enums.
1008+
// See https://github.com/mozilla/uniffi-rs/issues/396 for further discussion.
1009+
1010+
public enum InterruptKind {
1011+
1012+
case read
1013+
case write
1014+
case readWrite
1015+
}
1016+
1017+
1018+
public struct FfiConverterTypeInterruptKind: FfiConverterRustBuffer {
1019+
typealias SwiftType = InterruptKind
1020+
1021+
public static func read(from buf: inout (data: Data, offset: Data.Index)) throws -> InterruptKind {
1022+
let variant: Int32 = try readInt(&buf)
1023+
switch variant {
1024+
1025+
case 1: return .read
1026+
1027+
case 2: return .write
1028+
1029+
case 3: return .readWrite
1030+
1031+
default: throw UniffiInternalError.unexpectedEnumCase
1032+
}
1033+
}
1034+
1035+
public static func write(_ value: InterruptKind, into buf: inout [UInt8]) {
1036+
switch value {
1037+
1038+
1039+
case .read:
1040+
writeInt(&buf, Int32(1))
1041+
1042+
1043+
case .write:
1044+
writeInt(&buf, Int32(2))
1045+
1046+
1047+
case .readWrite:
1048+
writeInt(&buf, Int32(3))
1049+
1050+
}
1051+
}
1052+
}
1053+
1054+
1055+
public func FfiConverterTypeInterruptKind_lift(_ buf: RustBuffer) throws -> InterruptKind {
1056+
return try FfiConverterTypeInterruptKind.lift(buf)
1057+
}
1058+
1059+
public func FfiConverterTypeInterruptKind_lower(_ value: InterruptKind) -> RustBuffer {
1060+
return FfiConverterTypeInterruptKind.lower(value)
1061+
}
1062+
1063+
1064+
1065+
extension InterruptKind: Equatable, Hashable {}
1066+
1067+
1068+
10061069

10071070
public enum SuggestApiError {
10081071

@@ -1435,6 +1498,27 @@ fileprivate struct FfiConverterOptionString: FfiConverterRustBuffer {
14351498
}
14361499
}
14371500

1501+
fileprivate struct FfiConverterOptionTypeInterruptKind: FfiConverterRustBuffer {
1502+
typealias SwiftType = InterruptKind?
1503+
1504+
public static func write(_ value: SwiftType, into buf: inout [UInt8]) {
1505+
guard let value = value else {
1506+
writeInt(&buf, Int8(0))
1507+
return
1508+
}
1509+
writeInt(&buf, Int8(1))
1510+
FfiConverterTypeInterruptKind.write(value, into: &buf)
1511+
}
1512+
1513+
public static func read(from buf: inout (data: Data, offset: Data.Index)) throws -> SwiftType {
1514+
switch try readInt(&buf) as Int8 {
1515+
case 0: return nil
1516+
case 1: return try FfiConverterTypeInterruptKind.read(from: &buf)
1517+
default: throw UniffiInternalError.unexpectedOptionalTag
1518+
}
1519+
}
1520+
}
1521+
14381522
fileprivate struct FfiConverterOptionTypeSuggestProviderConfig: FfiConverterRustBuffer {
14391523
typealias SwiftType = SuggestProviderConfig?
14401524

@@ -1633,7 +1717,7 @@ private var initializationResult: InitializationResult {
16331717
if (uniffi_suggest_checksum_method_suggeststore_ingest() != 4478) {
16341718
return InitializationResult.apiChecksumMismatch
16351719
}
1636-
if (uniffi_suggest_checksum_method_suggeststore_interrupt() != 11751) {
1720+
if (uniffi_suggest_checksum_method_suggeststore_interrupt() != 17785) {
16371721
return InitializationResult.apiChecksumMismatch
16381722
}
16391723
if (uniffi_suggest_checksum_method_suggeststore_query() != 12875) {

swift-source/all/Generated/suggestFFI.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -298,7 +298,7 @@ void uniffi_suggest_fn_method_suggeststore_ingest(void*_Nonnull ptr, RustBuffer
298298
#endif
299299
#ifndef UNIFFI_FFIDEF_UNIFFI_SUGGEST_FN_METHOD_SUGGESTSTORE_INTERRUPT
300300
#define UNIFFI_FFIDEF_UNIFFI_SUGGEST_FN_METHOD_SUGGESTSTORE_INTERRUPT
301-
void uniffi_suggest_fn_method_suggeststore_interrupt(void*_Nonnull ptr, RustCallStatus *_Nonnull out_status
301+
void uniffi_suggest_fn_method_suggeststore_interrupt(void*_Nonnull ptr, RustBuffer kind, RustCallStatus *_Nonnull out_status
302302
);
303303
#endif
304304
#ifndef UNIFFI_FFIDEF_UNIFFI_SUGGEST_FN_METHOD_SUGGESTSTORE_QUERY

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: 5, day: 18, hour: 5, minute: 16, second: 0))
26+
public static let info = BuildInfo(buildDate: DateComponents(calendar: Calendar.current, timeZone: TimeZone(abbreviation: "UTC"), year: 2024, month: 5, day: 20, hour: 19, minute: 38, second: 15))
2727
}
2828

2929
enum NimbusEvents {

0 commit comments

Comments
 (0)