Cuts v90 for rust-components-swift (#34)

* Upgrades Package.swift

* Version 90.0.0

* remove protobuf from CI and package.swift

Author: Tarik Eshaq

.github/workflows/update-as.yml

@@ -62,8 +62,6 @@ jobs:
         if: env.ALREADY_CREATED == 'false'
         run: |
           brew install swiftformat
-          brew install protobuf
-          brew install swift-protobuf
       # We strip away the `v` in the AS Version and run the make_tag
       # script, which will generate all the code that needs to be generated
       # Note that the tag argument isn't useful here, since we will

Package.swift

@@ -1,8 +1,8 @@
 // swift-tools-version:5.4
 import PackageDescription
 
-let checksum = "f23a1eb4bcb2d5493c4a5d445bf35af41b1a78f201f539edaed4cc2ca990a8f6"
-let version = "v87.2.0"
+let checksum = "397f09236f031fe614bfdbc5ba4b8953bfd98e1df640e442962a5d7e2b96d006"
+let version = "v90.0.0"
 let url = "https://github.com/mozilla/application-services/releases/download/\(version)/MozillaRustComponents.xcframework.zip"
 
 let package = Package(
@@ -24,7 +24,6 @@ let package = Package(
         // TODO: ship Glean via this same bundle?
         .package(name: "Glean", url: "https://github.com/mozilla/glean-swift", from: "43.0.2"),
         .package(name: "SwiftKeychainWrapper", url: "https://github.com/jrendel/SwiftKeychainWrapper", from: "4.0.1"),
-        .package(name: "SwiftProtobuf", url: "https://github.com/apple/swift-protobuf", from: "1.18.0")
     ],
     targets: [
         /*
@@ -104,7 +103,7 @@ let package = Package(
         ),
         .target(
             name: "Places",
-            dependencies: ["MozillaRustComponentsWrapper", "Sync15", "SwiftProtobuf"],
+            dependencies: ["MozillaRustComponentsWrapper", "Sync15"],
             path: "generated/places"
         )
     ]

generate.sh

@@ -122,9 +122,6 @@ rm -rf "$PLACES_DIR" && mkdir -p "$PLACES_DIR"
 # UniFFI bindings.
 "${UNIFFI_BINDGEN[@]}" generate -l swift -o "$PLACES_DIR/Generated" "$APP_SERVICES_DIR/components/places/src/places.udl"
 
-## We need to build the protobuf files and copy them over to the places generated section
-protoc --proto_path="$APP_SERVICES_DIR/components/places/src" --swift_out="$PLACES_DIR/Generated" "places_msg_types.proto"
-
 # Copy the hand-written Swift, since it all needs to be together in one directory.
 cp -r "$APP_SERVICES_DIR/components/places/ios/Places" "$PLACES_DIR/Places"
 

generated/autofill/Generated/autofill.swift

@@ -19,13 +19,13 @@ private extension RustBuffer {
     }
 
     static func from(_ ptr: UnsafeBufferPointer<UInt8>) -> RustBuffer {
-        try! rustCall { ffi_autofill_b5da_rustbuffer_from_bytes(ForeignBytes(bufferPointer: ptr), $0) }
+        try! rustCall { ffi_autofill_8c34_rustbuffer_from_bytes(ForeignBytes(bufferPointer: ptr), $0) }
     }
 
     // Frees the buffer in place.
     // The buffer must not be used after this is called.
     func deallocate() {
-        try! rustCall { ffi_autofill_b5da_rustbuffer_free(self, $0) }
+        try! rustCall { ffi_autofill_8c34_rustbuffer_free(self, $0) }
     }
 }
 
@@ -385,7 +385,7 @@ public func createKey() throws -> String {
     let _retval = try
 
         rustCallWithError(AutofillError.self) {
-            autofill_b5da_create_key($0)
+            autofill_8c34_create_key($0)
         }
     return try String.lift(_retval)
 }
@@ -394,7 +394,7 @@ public func encryptString(key: String, cleartext: String) throws -> String {
     let _retval = try
 
         rustCallWithError(AutofillError.self) {
-            autofill_b5da_encrypt_string(key.lower(), cleartext.lower(), $0)
+            autofill_8c34_encrypt_string(key.lower(), cleartext.lower(), $0)
         }
     return try String.lift(_retval)
 }
@@ -403,7 +403,7 @@ public func decryptString(key: String, ciphertext: String) throws -> String {
     let _retval = try
 
         rustCallWithError(AutofillError.self) {
-            autofill_b5da_decrypt_string(key.lower(), ciphertext.lower(), $0)
+            autofill_8c34_decrypt_string(key.lower(), ciphertext.lower(), $0)
         }
     return try String.lift(_retval)
 }
@@ -439,117 +439,117 @@ public class Store: StoreProtocol {
         self.init(unsafeFromRawPointer: try
 
             rustCallWithError(AutofillError.self) {
-                autofill_b5da_Store_new(dbpath.lower(), $0)
+                autofill_8c34_Store_new(dbpath.lower(), $0)
             })
     }
 
     deinit {
-        try! rustCall { ffi_autofill_b5da_Store_object_free(pointer, $0) }
+        try! rustCall { ffi_autofill_8c34_Store_object_free(pointer, $0) }
     }
 
     public func addCreditCard(cc: UpdatableCreditCardFields) throws -> CreditCard {
         let _retval = try
             rustCallWithError(AutofillError.self) {
-                autofill_b5da_Store_add_credit_card(self.pointer, cc.lower(), $0)
+                autofill_8c34_Store_add_credit_card(self.pointer, cc.lower(), $0)
             }
         return try CreditCard.lift(_retval)
     }
 
     public func getCreditCard(guid: String) throws -> CreditCard {
         let _retval = try
             rustCallWithError(AutofillError.self) {
-                autofill_b5da_Store_get_credit_card(self.pointer, guid.lower(), $0)
+                autofill_8c34_Store_get_credit_card(self.pointer, guid.lower(), $0)
             }
         return try CreditCard.lift(_retval)
     }
 
     public func getAllCreditCards() throws -> [CreditCard] {
         let _retval = try
             rustCallWithError(AutofillError.self) {
-                autofill_b5da_Store_get_all_credit_cards(self.pointer, $0)
+                autofill_8c34_Store_get_all_credit_cards(self.pointer, $0)
             }
         return try FfiConverterSequenceRecordCreditCard.lift(_retval)
     }
 
     public func updateCreditCard(guid: String, cc: UpdatableCreditCardFields) throws {
         try
             rustCallWithError(AutofillError.self) {
-                autofill_b5da_Store_update_credit_card(self.pointer, guid.lower(), cc.lower(), $0)
+                autofill_8c34_Store_update_credit_card(self.pointer, guid.lower(), cc.lower(), $0)
             }
     }
 
     public func deleteCreditCard(guid: String) throws -> Bool {
         let _retval = try
             rustCallWithError(AutofillError.self) {
-                autofill_b5da_Store_delete_credit_card(self.pointer, guid.lower(), $0)
+                autofill_8c34_Store_delete_credit_card(self.pointer, guid.lower(), $0)
             }
         return try Bool.lift(_retval)
     }
 
     public func touchCreditCard(guid: String) throws {
         try
             rustCallWithError(AutofillError.self) {
-                autofill_b5da_Store_touch_credit_card(self.pointer, guid.lower(), $0)
+                autofill_8c34_Store_touch_credit_card(self.pointer, guid.lower(), $0)
             }
     }
 
     public func addAddress(a: UpdatableAddressFields) throws -> Address {
         let _retval = try
             rustCallWithError(AutofillError.self) {
-                autofill_b5da_Store_add_address(self.pointer, a.lower(), $0)
+                autofill_8c34_Store_add_address(self.pointer, a.lower(), $0)
             }
         return try Address.lift(_retval)
     }
 
     public func getAddress(guid: String) throws -> Address {
         let _retval = try
             rustCallWithError(AutofillError.self) {
-                autofill_b5da_Store_get_address(self.pointer, guid.lower(), $0)
+                autofill_8c34_Store_get_address(self.pointer, guid.lower(), $0)
             }
         return try Address.lift(_retval)
     }
 
     public func getAllAddresses() throws -> [Address] {
         let _retval = try
             rustCallWithError(AutofillError.self) {
-                autofill_b5da_Store_get_all_addresses(self.pointer, $0)
+                autofill_8c34_Store_get_all_addresses(self.pointer, $0)
             }
         return try FfiConverterSequenceRecordAddress.lift(_retval)
     }
 
     public func updateAddress(guid: String, a: UpdatableAddressFields) throws {
         try
             rustCallWithError(AutofillError.self) {
-                autofill_b5da_Store_update_address(self.pointer, guid.lower(), a.lower(), $0)
+                autofill_8c34_Store_update_address(self.pointer, guid.lower(), a.lower(), $0)
             }
     }
 
     public func deleteAddress(guid: String) throws -> Bool {
         let _retval = try
             rustCallWithError(AutofillError.self) {
-                autofill_b5da_Store_delete_address(self.pointer, guid.lower(), $0)
+                autofill_8c34_Store_delete_address(self.pointer, guid.lower(), $0)
             }
         return try Bool.lift(_retval)
     }
 
     public func touchAddress(guid: String) throws {
         try
             rustCallWithError(AutofillError.self) {
-                autofill_b5da_Store_touch_address(self.pointer, guid.lower(), $0)
+                autofill_8c34_Store_touch_address(self.pointer, guid.lower(), $0)
             }
     }
 
     public func scrubEncryptedData() throws {
         try
             rustCallWithError(AutofillError.self) {
-                autofill_b5da_Store_scrub_encrypted_data(self.pointer, $0)
+                autofill_8c34_Store_scrub_encrypted_data(self.pointer, $0)
             }
     }
 
     public func registerWithSyncManager() {
         try!
             rustCall {
-                autofill_b5da_Store_register_with_sync_manager(self.pointer, $0)
+                autofill_8c34_Store_register_with_sync_manager(self.pointer, $0)
             }
     }
 }

generated/autofill/Generated/autofillFFI.h

@@ -11,15 +11,15 @@
 // We ensure they are declared exactly once, with a header guard, UNIFFI_SHARED_H.
 #ifdef UNIFFI_SHARED_H
     // We also try to prevent mixing versions of shared uniffi header structs.
-    // If you add anything to the #else block, you must increment the version suffix in UNIFFI_SHARED_HEADER_V3
-    #ifndef UNIFFI_SHARED_HEADER_V3
+    // If you add anything to the #else block, you must increment the version suffix in UNIFFI_SHARED_HEADER_V4
+    #ifndef UNIFFI_SHARED_HEADER_V4
         #error Combining helper code from multiple versions of uniffi is not supported
-    #endif // ndef UNIFFI_SHARED_HEADER_V3
+    #endif // ndef UNIFFI_SHARED_HEADER_V4
 #else
 #define UNIFFI_SHARED_H
-#define UNIFFI_SHARED_HEADER_V3
+#define UNIFFI_SHARED_HEADER_V4
 // ⚠️ Attention: If you change this #else block (ending in `#endif // def UNIFFI_SHARED_H`) you *must* ⚠️
-// ⚠️ increment the version suffix in all instances of UNIFFI_SHARED_HEADER_V3 in this file.           ⚠️
+// ⚠️ increment the version suffix in all instances of UNIFFI_SHARED_HEADER_V4 in this file.           ⚠️
 
 typedef struct RustBuffer
 {
@@ -28,7 +28,7 @@ typedef struct RustBuffer
     uint8_t *_Nullable data;
 } RustBuffer;
 
-typedef RustBuffer (*ForeignCallback)(uint64_t, int32_t, RustBuffer);
+typedef int32_t (*ForeignCallback)(uint64_t, int32_t, RustBuffer, RustBuffer *_Nonnull);
 
 typedef struct ForeignBytes
 {
@@ -43,98 +43,98 @@ typedef struct RustCallStatus {
 } RustCallStatus;
 
 // ⚠️ Attention: If you change this #else block (ending in `#endif // def UNIFFI_SHARED_H`) you *must* ⚠️
-// ⚠️ increment the version suffix in all instances of UNIFFI_SHARED_HEADER_V3 in this file.           ⚠️
+// ⚠️ increment the version suffix in all instances of UNIFFI_SHARED_HEADER_V4 in this file.           ⚠️
 #endif // def UNIFFI_SHARED_H
 
-void ffi_autofill_b5da_Store_object_free(
+void ffi_autofill_8c34_Store_object_free(
       void*_Nonnull ptr,
     RustCallStatus *_Nonnull out_status
     );
-void*_Nonnull autofill_b5da_Store_new(
+void*_Nonnull autofill_8c34_Store_new(
       RustBuffer dbpath,
     RustCallStatus *_Nonnull out_status
     );
-RustBuffer autofill_b5da_Store_add_credit_card(
+RustBuffer autofill_8c34_Store_add_credit_card(
       void*_Nonnull ptr,RustBuffer cc,
     RustCallStatus *_Nonnull out_status
     );
-RustBuffer autofill_b5da_Store_get_credit_card(
+RustBuffer autofill_8c34_Store_get_credit_card(
       void*_Nonnull ptr,RustBuffer guid,
     RustCallStatus *_Nonnull out_status
     );
-RustBuffer autofill_b5da_Store_get_all_credit_cards(
+RustBuffer autofill_8c34_Store_get_all_credit_cards(
       void*_Nonnull ptr,
     RustCallStatus *_Nonnull out_status
     );
-void autofill_b5da_Store_update_credit_card(
+void autofill_8c34_Store_update_credit_card(
       void*_Nonnull ptr,RustBuffer guid,RustBuffer cc,
     RustCallStatus *_Nonnull out_status
     );
-int8_t autofill_b5da_Store_delete_credit_card(
+int8_t autofill_8c34_Store_delete_credit_card(
       void*_Nonnull ptr,RustBuffer guid,
     RustCallStatus *_Nonnull out_status
     );
-void autofill_b5da_Store_touch_credit_card(
+void autofill_8c34_Store_touch_credit_card(
       void*_Nonnull ptr,RustBuffer guid,
     RustCallStatus *_Nonnull out_status
     );
-RustBuffer autofill_b5da_Store_add_address(
+RustBuffer autofill_8c34_Store_add_address(
       void*_Nonnull ptr,RustBuffer a,
     RustCallStatus *_Nonnull out_status
     );
-RustBuffer autofill_b5da_Store_get_address(
+RustBuffer autofill_8c34_Store_get_address(
       void*_Nonnull ptr,RustBuffer guid,
     RustCallStatus *_Nonnull out_status
     );
-RustBuffer autofill_b5da_Store_get_all_addresses(
+RustBuffer autofill_8c34_Store_get_all_addresses(
       void*_Nonnull ptr,
     RustCallStatus *_Nonnull out_status
     );
-void autofill_b5da_Store_update_address(
+void autofill_8c34_Store_update_address(
       void*_Nonnull ptr,RustBuffer guid,RustBuffer a,
     RustCallStatus *_Nonnull out_status
     );
-int8_t autofill_b5da_Store_delete_address(
+int8_t autofill_8c34_Store_delete_address(
       void*_Nonnull ptr,RustBuffer guid,
     RustCallStatus *_Nonnull out_status
     );
-void autofill_b5da_Store_touch_address(
+void autofill_8c34_Store_touch_address(
       void*_Nonnull ptr,RustBuffer guid,
     RustCallStatus *_Nonnull out_status
     );
-void autofill_b5da_Store_scrub_encrypted_data(
+void autofill_8c34_Store_scrub_encrypted_data(
       void*_Nonnull ptr,
     RustCallStatus *_Nonnull out_status
     );
-void autofill_b5da_Store_register_with_sync_manager(
+void autofill_8c34_Store_register_with_sync_manager(
       void*_Nonnull ptr,
     RustCallStatus *_Nonnull out_status
     );
-RustBuffer autofill_b5da_create_key(
+RustBuffer autofill_8c34_create_key(
 
     RustCallStatus *_Nonnull out_status
     );
-RustBuffer autofill_b5da_encrypt_string(
+RustBuffer autofill_8c34_encrypt_string(
       RustBuffer key,RustBuffer cleartext,
     RustCallStatus *_Nonnull out_status
     );
-RustBuffer autofill_b5da_decrypt_string(
+RustBuffer autofill_8c34_decrypt_string(
       RustBuffer key,RustBuffer ciphertext,
     RustCallStatus *_Nonnull out_status
     );
-RustBuffer ffi_autofill_b5da_rustbuffer_alloc(
+RustBuffer ffi_autofill_8c34_rustbuffer_alloc(
       int32_t size,
     RustCallStatus *_Nonnull out_status
     );
-RustBuffer ffi_autofill_b5da_rustbuffer_from_bytes(
+RustBuffer ffi_autofill_8c34_rustbuffer_from_bytes(
       ForeignBytes bytes,
     RustCallStatus *_Nonnull out_status
     );
-void ffi_autofill_b5da_rustbuffer_free(
+void ffi_autofill_8c34_rustbuffer_free(
       RustBuffer buf,
     RustCallStatus *_Nonnull out_status
     );
-RustBuffer ffi_autofill_b5da_rustbuffer_reserve(
+RustBuffer ffi_autofill_8c34_rustbuffer_reserve(
       RustBuffer buf,int32_t additional,
     RustCallStatus *_Nonnull out_status
     );