Version 0.0.8 (#18)

skhamis · web-flow · commit e8d9b4373ced · 2021-10-26T11:45:01.000-10:00
* Version 0.0.8
diff --git a/Package.swift b/Package.swift
@@ -41,8 +41,8 @@ let package = Package(
             // For release artifacts, reference the MozillaRustComponents as a URL with checksum.
             // IMPORTANT: The checksum has to be on the line directly after the `url`
             // this is important for our release script so that all values are updated correctly
-            url: "https://118551-129966583-gh.circle-artifacts.com/0/dist/MozillaRustComponents.xcframework.zip",
-            checksum: "2195ff4b9f942cf8dc66461514af57be56e7c663f37e3e5d5b7f9a3adc5cf71f"
+            url: "https://119127-129966583-gh.circle-artifacts.com/0/dist/MozillaRustComponents.xcframework.zip",
+            checksum: "2cf6f6e5db8e995773560ad3074722b7ec3ed05a6c2d33c6f90bbffce866ed03"
 
             // For local testing, you can point at an (unzipped) XCFramework that's part of the repo.
             // Note that you have to actually check it in and make a tag for it to work correctly.
diff --git a/generate.sh b/generate.sh
@@ -69,6 +69,10 @@ cp -r "$APP_SERVICES_DIR/components/fxa-client/ios/FxAClient" "$FXA_CLIENT_DIR/F
 
 LOGINS_DIR="$THIS_DIR/generated/logins"
 rm -rf "$LOGINS_DIR" && mkdir -p "$LOGINS_DIR"
+# Glean metrics.
+# Run this first, because it appears to delete any other .swift files in the output directory.
+# Also, it wants to be run from inside Xcode, so we set some env vars to fake it out.
+SOURCE_ROOT="$THIS_DIR" PROJECT="logins" "$GLEAN_GENERATOR" -o "$LOGINS_DIR/Generated" "$APP_SERVICES_DIR/components/logins/ios/metrics.yaml"
 # UniFFI bindings.
 "${UNIFFI_BINDGEN[@]}" generate -l swift -o "$LOGINS_DIR/Generated" "$APP_SERVICES_DIR/components/logins/src/logins.udl"
 # Copy the hand-written Swift, since it all needs to be together in one directory.
diff --git a/generated/logins/Generated/Metrics.swift b/generated/logins/Generated/Metrics.swift
@@ -0,0 +1,69 @@
+// -*- mode: Swift -*-
+
+// AUTOGENERATED BY glean_parser. DO NOT EDIT. DO NOT COMMIT.
+
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+
+
+import Glean
+
+// swiftlint:disable superfluous_disable_command
+// swiftlint:disable nesting
+// swiftlint:disable line_length
+// swiftlint:disable identifier_name
+// swiftlint:disable force_try
+
+extension GleanMetrics {
+    enum LoginsStoreMigration {
+        /// The total number of login records processed by the migration
+        static let numProcessed = CounterMetricType( // generated from logins_store_migration.num_processed
+            category: "logins_store_migration",
+            name: "num_processed",
+            sendInPings: ["metrics"],
+            lifetime: .ping,
+            disabled: false
+        )
+
+        /// The total number of login records successfully migrated
+        static let numSucceeded = CounterMetricType( // generated from logins_store_migration.num_succeeded
+            category: "logins_store_migration",
+            name: "num_succeeded",
+            sendInPings: ["metrics"],
+            lifetime: .ping,
+            disabled: false
+        )
+
+        /// The total number of login records which failed to migrate
+        static let numFailed = CounterMetricType( // generated from logins_store_migration.num_failed
+            category: "logins_store_migration",
+            name: "num_failed",
+            sendInPings: ["metrics"],
+            lifetime: .ping,
+            disabled: false
+        )
+
+        /// How long the migration tool
+        static let totalDuration = TimespanMetricType( // generated from logins_store_migration.total_duration
+            category: "logins_store_migration",
+            name: "total_duration",
+            sendInPings: ["metrics"],
+            lifetime: .ping,
+            disabled: false,
+            timeUnit: .millisecond
+        )
+
+        /// Errors discovered in the migration.
+        static let errors = StringListMetricType( // generated from logins_store_migration.errors
+            category: "logins_store_migration",
+            name: "errors",
+            sendInPings: ["metrics"],
+            lifetime: .ping,
+            disabled: false
+        )
+
+    }
+
+}
diff --git a/generated/logins/Generated/logins.swift b/generated/logins/Generated/logins.swift
@@ -14,15 +14,15 @@ private extension RustBuffer {
     // Allocate a new buffer, copying the contents of a `UInt8` array.
     init(bytes: [UInt8]) {
         let rbuf = bytes.withUnsafeBufferPointer { ptr in
-            try! rustCall { ffi_logins_5236_rustbuffer_from_bytes(ForeignBytes(bufferPointer: ptr), $0) }
+            try! rustCall { ffi_logins_42e6_rustbuffer_from_bytes(ForeignBytes(bufferPointer: ptr), $0) }
         }
         self.init(capacity: rbuf.capacity, len: rbuf.len, data: rbuf.data)
     }
 
     // Frees the buffer in place.
     // The buffer must not be used after this is called.
     func deallocate() {
-        try! rustCall { ffi_logins_5236_rustbuffer_free(self, $0) }
+        try! rustCall { ffi_logins_42e6_rustbuffer_free(self, $0) }
     }
 }
 
@@ -273,7 +273,7 @@ extension String: ViaFfi {
 
     fileprivate static func lift(_ v: FfiType) throws -> Self {
         defer {
-            try! rustCall { ffi_logins_5236_rustbuffer_free(v, $0) }
+            try! rustCall { ffi_logins_42e6_rustbuffer_free(v, $0) }
         }
         if v.data == nil {
             return String()
@@ -289,7 +289,7 @@ extension String: ViaFfi {
                 // The swift string gives us a trailing null byte, we don't want it.
                 let buf = UnsafeBufferPointer(rebasing: ptr.prefix(upTo: ptr.count - 1))
                 let bytes = ForeignBytes(bufferPointer: buf)
-                return try! rustCall { ffi_logins_5236_rustbuffer_from_bytes(bytes, $0) }
+                return try! rustCall { ffi_logins_42e6_rustbuffer_from_bytes(bytes, $0) }
             }
         }
     }
@@ -836,7 +836,7 @@ public func createKey() throws -> String {
     let _retval = try
 
         rustCallWithError(LoginsStorageError.self) {
-            logins_5236_create_key($0)
+            logins_42e6_create_key($0)
         }
     return try String.lift(_retval)
 }
@@ -845,7 +845,7 @@ public func decryptLogin(login: EncryptedLogin, encryptionKey: String) throws ->
     let _retval = try
 
         rustCallWithError(LoginsStorageError.self) {
-            logins_5236_decrypt_login(login.lower(), encryptionKey.lower(), $0)
+            logins_42e6_decrypt_login(login.lower(), encryptionKey.lower(), $0)
         }
     return try Login.lift(_retval)
 }
@@ -854,7 +854,7 @@ public func encryptLogin(login: Login, encryptionKey: String) throws -> Encrypte
     let _retval = try
 
         rustCallWithError(LoginsStorageError.self) {
-            logins_5236_encrypt_login(login.lower(), encryptionKey.lower(), $0)
+            logins_42e6_encrypt_login(login.lower(), encryptionKey.lower(), $0)
         }
     return try EncryptedLogin.lift(_retval)
 }
@@ -863,7 +863,7 @@ public func decryptFields(secFields: String, encryptionKey: String) throws -> Se
     let _retval = try
 
         rustCallWithError(LoginsStorageError.self) {
-            logins_5236_decrypt_fields(secFields.lower(), encryptionKey.lower(), $0)
+            logins_42e6_decrypt_fields(secFields.lower(), encryptionKey.lower(), $0)
         }
     return try SecureLoginFields.lift(_retval)
 }
@@ -872,7 +872,7 @@ public func encryptFields(secFields: SecureLoginFields, encryptionKey: String) t
     let _retval = try
 
         rustCallWithError(LoginsStorageError.self) {
-            logins_5236_encrypt_fields(secFields.lower(), encryptionKey.lower(), $0)
+            logins_42e6_encrypt_fields(secFields.lower(), encryptionKey.lower(), $0)
         }
     return try String.lift(_retval)
 }
@@ -881,7 +881,7 @@ public func createCanary(text: String, encryptionKey: String) throws -> String {
     let _retval = try
 
         rustCallWithError(LoginsStorageError.self) {
-            logins_5236_create_canary(text.lower(), encryptionKey.lower(), $0)
+            logins_42e6_create_canary(text.lower(), encryptionKey.lower(), $0)
         }
     return try String.lift(_retval)
 }
@@ -890,7 +890,7 @@ public func checkCanary(canary: String, text: String, encryptionKey: String) thr
     let _retval = try
 
         rustCallWithError(LoginsStorageError.self) {
-            logins_5236_check_canary(canary.lower(), text.lower(), encryptionKey.lower(), $0)
+            logins_42e6_check_canary(canary.lower(), text.lower(), encryptionKey.lower(), $0)
         }
     return try Bool.lift(_retval)
 }
@@ -899,13 +899,12 @@ public func migrateLogins(path: String, newEncryptionKey: String, sqlcipherPath:
     let _retval = try
 
         rustCallWithError(LoginsStorageError.self) {
-            logins_5236_migrate_logins(path.lower(), newEncryptionKey.lower(), sqlcipherPath.lower(), sqlcipherKey.lower(), salt.lower(), $0)
+            logins_42e6_migrate_logins(path.lower(), newEncryptionKey.lower(), sqlcipherPath.lower(), sqlcipherKey.lower(), salt.lower(), $0)
         }
     return try String.lift(_retval)
 }
 
 public protocol LoginStoreProtocol {
-    func checkValidWithNoDupes(id: String, login: LoginEntry, encryptionKey: String) throws
     func add(login: LoginEntry, encryptionKey: String) throws -> EncryptedLogin
     func update(id: String, login: LoginEntry, encryptionKey: String) throws -> EncryptedLogin
     func addOrUpdate(login: LoginEntry, encryptionKey: String) throws -> EncryptedLogin
@@ -917,7 +916,6 @@ public protocol LoginStoreProtocol {
     func list() throws -> [EncryptedLogin]
     func getByBaseDomain(baseDomain: String) throws -> [EncryptedLogin]
     func findLoginToUpdate(look: LoginEntry, encryptionKey: String) throws -> Login?
-    func potentialDupesIgnoringUsername(id: String, login: LoginEntry) throws -> [EncryptedLogin]
     func get(id: String) throws -> EncryptedLogin?
     func importMultiple(login: [Login], encryptionKey: String) throws -> String
     func registerWithSyncManager()
@@ -938,140 +936,125 @@ public class LoginStore: LoginStoreProtocol {
         self.init(unsafeFromRawPointer: try
 
             rustCallWithError(LoginsStorageError.self) {
-                logins_5236_LoginStore_new(path.lower(), $0)
+                logins_42e6_LoginStore_new(path.lower(), $0)
             })
     }
 
     deinit {
-        try! rustCall { ffi_logins_5236_LoginStore_object_free(pointer, $0) }
-    }
-
-    public func checkValidWithNoDupes(id: String, login: LoginEntry, encryptionKey: String) throws {
-        try
-            rustCallWithError(LoginsStorageError.self) {
-                logins_5236_LoginStore_check_valid_with_no_dupes(self.pointer, id.lower(), login.lower(), encryptionKey.lower(), $0)
-            }
+        try! rustCall { ffi_logins_42e6_LoginStore_object_free(pointer, $0) }
     }
 
     public func add(login: LoginEntry, encryptionKey: String) throws -> EncryptedLogin {
         let _retval = try
             rustCallWithError(LoginsStorageError.self) {
-                logins_5236_LoginStore_add(self.pointer, login.lower(), encryptionKey.lower(), $0)
+                logins_42e6_LoginStore_add(self.pointer, login.lower(), encryptionKey.lower(), $0)
             }
         return try EncryptedLogin.lift(_retval)
     }
 
     public func update(id: String, login: LoginEntry, encryptionKey: String) throws -> EncryptedLogin {
         let _retval = try
             rustCallWithError(LoginsStorageError.self) {
-                logins_5236_LoginStore_update(self.pointer, id.lower(), login.lower(), encryptionKey.lower(), $0)
+                logins_42e6_LoginStore_update(self.pointer, id.lower(), login.lower(), encryptionKey.lower(), $0)
             }
         return try EncryptedLogin.lift(_retval)
     }
 
     public func addOrUpdate(login: LoginEntry, encryptionKey: String) throws -> EncryptedLogin {
         let _retval = try
             rustCallWithError(LoginsStorageError.self) {
-                logins_5236_LoginStore_add_or_update(self.pointer, login.lower(), encryptionKey.lower(), $0)
+                logins_42e6_LoginStore_add_or_update(self.pointer, login.lower(), encryptionKey.lower(), $0)
             }
         return try EncryptedLogin.lift(_retval)
     }
 
     public func delete(id: String) throws -> Bool {
         let _retval = try
             rustCallWithError(LoginsStorageError.self) {
-                logins_5236_LoginStore_delete(self.pointer, id.lower(), $0)
+                logins_42e6_LoginStore_delete(self.pointer, id.lower(), $0)
             }
         return try Bool.lift(_retval)
     }
 
     public func wipe() throws {
         try
             rustCallWithError(LoginsStorageError.self) {
-                logins_5236_LoginStore_wipe(self.pointer, $0)
+                logins_42e6_LoginStore_wipe(self.pointer, $0)
             }
     }
 
     public func wipeLocal() throws {
         try
             rustCallWithError(LoginsStorageError.self) {
-                logins_5236_LoginStore_wipe_local(self.pointer, $0)
+                logins_42e6_LoginStore_wipe_local(self.pointer, $0)
             }
     }
 
     public func reset() throws {
         try
             rustCallWithError(LoginsStorageError.self) {
-                logins_5236_LoginStore_reset(self.pointer, $0)
+                logins_42e6_LoginStore_reset(self.pointer, $0)
             }
     }
 
     public func touch(id: String) throws {
         try
             rustCallWithError(LoginsStorageError.self) {
-                logins_5236_LoginStore_touch(self.pointer, id.lower(), $0)
+                logins_42e6_LoginStore_touch(self.pointer, id.lower(), $0)
             }
     }
 
     public func list() throws -> [EncryptedLogin] {
         let _retval = try
             rustCallWithError(LoginsStorageError.self) {
-                logins_5236_LoginStore_list(self.pointer, $0)
+                logins_42e6_LoginStore_list(self.pointer, $0)
             }
         return try [EncryptedLogin].lift(_retval)
     }
 
     public func getByBaseDomain(baseDomain: String) throws -> [EncryptedLogin] {
         let _retval = try
             rustCallWithError(LoginsStorageError.self) {
-                logins_5236_LoginStore_get_by_base_domain(self.pointer, baseDomain.lower(), $0)
+                logins_42e6_LoginStore_get_by_base_domain(self.pointer, baseDomain.lower(), $0)
             }
         return try [EncryptedLogin].lift(_retval)
     }
 
     public func findLoginToUpdate(look: LoginEntry, encryptionKey: String) throws -> Login? {
         let _retval = try
             rustCallWithError(LoginsStorageError.self) {
-                logins_5236_LoginStore_find_login_to_update(self.pointer, look.lower(), encryptionKey.lower(), $0)
+                logins_42e6_LoginStore_find_login_to_update(self.pointer, look.lower(), encryptionKey.lower(), $0)
             }
         return try Login?.lift(_retval)
     }
 
-    public func potentialDupesIgnoringUsername(id: String, login: LoginEntry) throws -> [EncryptedLogin] {
-        let _retval = try
-            rustCallWithError(LoginsStorageError.self) {
-                logins_5236_LoginStore_potential_dupes_ignoring_username(self.pointer, id.lower(), login.lower(), $0)
-            }
-        return try [EncryptedLogin].lift(_retval)
-    }
-
     public func get(id: String) throws -> EncryptedLogin? {
         let _retval = try
             rustCallWithError(LoginsStorageError.self) {
-                logins_5236_LoginStore_get(self.pointer, id.lower(), $0)
+                logins_42e6_LoginStore_get(self.pointer, id.lower(), $0)
             }
         return try EncryptedLogin?.lift(_retval)
     }
 
     public func importMultiple(login: [Login], encryptionKey: String) throws -> String {
         let _retval = try
             rustCallWithError(LoginsStorageError.self) {
-                logins_5236_LoginStore_import_multiple(self.pointer, login.lower(), encryptionKey.lower(), $0)
+                logins_42e6_LoginStore_import_multiple(self.pointer, login.lower(), encryptionKey.lower(), $0)
             }
         return try String.lift(_retval)
     }
 
     public func registerWithSyncManager() {
         try!
             rustCall {
-                logins_5236_LoginStore_register_with_sync_manager(self.pointer, $0)
+                logins_42e6_LoginStore_register_with_sync_manager(self.pointer, $0)
             }
     }
 
     public func sync(keyId: String, accessToken: String, syncKey: String, tokenserverUrl: String, localEncryptionKey: String) throws -> String {
         let _retval = try
             rustCallWithError(LoginsStorageError.self) {
-                logins_5236_LoginStore_sync(self.pointer, keyId.lower(), accessToken.lower(), syncKey.lower(), tokenserverUrl.lower(), localEncryptionKey.lower(), $0)
+                logins_42e6_LoginStore_sync(self.pointer, keyId.lower(), accessToken.lower(), syncKey.lower(), tokenserverUrl.lower(), localEncryptionKey.lower(), $0)
             }
         return try String.lift(_retval)
     }
diff --git a/generated/logins/Generated/loginsFFI.h b/generated/logins/Generated/loginsFFI.h

Original file line number	Diff line number	Diff line change
`@@ -14,15 +14,15 @@ private extension RustBuffer {`
`14`	`14`	// Allocate a new buffer, copying the contents of a `UInt8` array.
`15`	`15`	`init(bytes: [UInt8]) {`
`16`	`16`	`let rbuf = bytes.withUnsafeBufferPointer { ptr in`
`17`		`- try! rustCall { ffi_logins_5236_rustbuffer_from_bytes(ForeignBytes(bufferPointer: ptr), $0) }`
	`17`	`+ try! rustCall { ffi_logins_42e6_rustbuffer_from_bytes(ForeignBytes(bufferPointer: ptr), $0) }`
`18`	`18`	`}`
`19`	`19`	`self.init(capacity: rbuf.capacity, len: rbuf.len, data: rbuf.data)`
`20`	`20`	`}`
`21`	`21`
`22`	`22`	`// Frees the buffer in place.`
`23`	`23`	`// The buffer must not be used after this is called.`
`24`	`24`	`func deallocate() {`
`25`		`- try! rustCall { ffi_logins_5236_rustbuffer_free(self, $0) }`
	`25`	`+ try! rustCall { ffi_logins_42e6_rustbuffer_free(self, $0) }`
`26`	`26`	`}`
`27`	`27`	`}`
`28`	`28`
`@@ -273,7 +273,7 @@ extension String: ViaFfi {`
`273`	`273`
`274`	`274`	`fileprivate static func lift(_ v: FfiType) throws -> Self {`
`275`	`275`	`defer {`
`276`		`- try! rustCall { ffi_logins_5236_rustbuffer_free(v, $0) }`
	`276`	`+ try! rustCall { ffi_logins_42e6_rustbuffer_free(v, $0) }`
`277`	`277`	`}`
`278`	`278`	`if v.data == nil {`
`279`	`279`	`return String()`
`@@ -289,7 +289,7 @@ extension String: ViaFfi {`
`289`	`289`	`// The swift string gives us a trailing null byte, we don't want it.`
`290`	`290`	`let buf = UnsafeBufferPointer(rebasing: ptr.prefix(upTo: ptr.count - 1))`
`291`	`291`	`let bytes = ForeignBytes(bufferPointer: buf)`
`292`		`- return try! rustCall { ffi_logins_5236_rustbuffer_from_bytes(bytes, $0) }`
	`292`	`+ return try! rustCall { ffi_logins_42e6_rustbuffer_from_bytes(bytes, $0) }`
`293`	`293`	`}`
`294`	`294`	`}`
`295`	`295`	`}`
`@@ -836,7 +836,7 @@ public func createKey() throws -> String {`
`836`	`836`	`let _retval = try`
`837`	`837`
`838`	`838`	`rustCallWithError(LoginsStorageError.self) {`
`839`		`- logins_5236_create_key($0)`
	`839`	`+ logins_42e6_create_key($0)`
`840`	`840`	`}`
`841`	`841`	`return try String.lift(_retval)`
`842`	`842`	`}`
`@@ -845,7 +845,7 @@ public func decryptLogin(login: EncryptedLogin, encryptionKey: String) throws ->`
`845`	`845`	`let _retval = try`
`846`	`846`
`847`	`847`	`rustCallWithError(LoginsStorageError.self) {`
`848`		`- logins_5236_decrypt_login(login.lower(), encryptionKey.lower(), $0)`
	`848`	`+ logins_42e6_decrypt_login(login.lower(), encryptionKey.lower(), $0)`
`849`	`849`	`}`
`850`	`850`	`return try Login.lift(_retval)`
`851`	`851`	`}`
`@@ -854,7 +854,7 @@ public func encryptLogin(login: Login, encryptionKey: String) throws -> Encrypte`
`854`	`854`	`let _retval = try`
`855`	`855`
`856`	`856`	`rustCallWithError(LoginsStorageError.self) {`
`857`		`- logins_5236_encrypt_login(login.lower(), encryptionKey.lower(), $0)`
	`857`	`+ logins_42e6_encrypt_login(login.lower(), encryptionKey.lower(), $0)`
`858`	`858`	`}`
`859`	`859`	`return try EncryptedLogin.lift(_retval)`
`860`	`860`	`}`
`@@ -863,7 +863,7 @@ public func decryptFields(secFields: String, encryptionKey: String) throws -> Se`
`863`	`863`	`let _retval = try`
`864`	`864`
`865`	`865`	`rustCallWithError(LoginsStorageError.self) {`
`866`		`- logins_5236_decrypt_fields(secFields.lower(), encryptionKey.lower(), $0)`
	`866`	`+ logins_42e6_decrypt_fields(secFields.lower(), encryptionKey.lower(), $0)`
`867`	`867`	`}`
`868`	`868`	`return try SecureLoginFields.lift(_retval)`
`869`	`869`	`}`
`@@ -872,7 +872,7 @@ public func encryptFields(secFields: SecureLoginFields, encryptionKey: String) t`
`872`	`872`	`let _retval = try`
`873`	`873`
`874`	`874`	`rustCallWithError(LoginsStorageError.self) {`
`875`		`- logins_5236_encrypt_fields(secFields.lower(), encryptionKey.lower(), $0)`
	`875`	`+ logins_42e6_encrypt_fields(secFields.lower(), encryptionKey.lower(), $0)`
`876`	`876`	`}`
`877`	`877`	`return try String.lift(_retval)`
`878`	`878`	`}`
`@@ -881,7 +881,7 @@ public func createCanary(text: String, encryptionKey: String) throws -> String {`
`881`	`881`	`let _retval = try`
`882`	`882`
`883`	`883`	`rustCallWithError(LoginsStorageError.self) {`
`884`		`- logins_5236_create_canary(text.lower(), encryptionKey.lower(), $0)`
	`884`	`+ logins_42e6_create_canary(text.lower(), encryptionKey.lower(), $0)`
`885`	`885`	`}`
`886`	`886`	`return try String.lift(_retval)`
`887`	`887`	`}`
`@@ -890,7 +890,7 @@ public func checkCanary(canary: String, text: String, encryptionKey: String) thr`
`890`	`890`	`let _retval = try`
`891`	`891`
`892`	`892`	`rustCallWithError(LoginsStorageError.self) {`
`893`		`- logins_5236_check_canary(canary.lower(), text.lower(), encryptionKey.lower(), $0)`
	`893`	`+ logins_42e6_check_canary(canary.lower(), text.lower(), encryptionKey.lower(), $0)`
`894`	`894`	`}`
`895`	`895`	`return try Bool.lift(_retval)`
`896`	`896`	`}`
`@@ -899,13 +899,12 @@ public func migrateLogins(path: String, newEncryptionKey: String, sqlcipherPath:`
`899`	`899`	`let _retval = try`
`900`	`900`
`901`	`901`	`rustCallWithError(LoginsStorageError.self) {`
`902`		`- logins_5236_migrate_logins(path.lower(), newEncryptionKey.lower(), sqlcipherPath.lower(), sqlcipherKey.lower(), salt.lower(), $0)`
	`902`	`+ logins_42e6_migrate_logins(path.lower(), newEncryptionKey.lower(), sqlcipherPath.lower(), sqlcipherKey.lower(), salt.lower(), $0)`
`903`	`903`	`}`
`904`	`904`	`return try String.lift(_retval)`
`905`	`905`	`}`
`906`	`906`
`907`	`907`	`public protocol LoginStoreProtocol {`
`908`		`- func checkValidWithNoDupes(id: String, login: LoginEntry, encryptionKey: String) throws`
`909`	`908`	`func add(login: LoginEntry, encryptionKey: String) throws -> EncryptedLogin`
`910`	`909`	`func update(id: String, login: LoginEntry, encryptionKey: String) throws -> EncryptedLogin`
`911`	`910`	`func addOrUpdate(login: LoginEntry, encryptionKey: String) throws -> EncryptedLogin`
`@@ -917,7 +916,6 @@ public protocol LoginStoreProtocol {`
`917`	`916`	`func list() throws -> [EncryptedLogin]`
`918`	`917`	`func getByBaseDomain(baseDomain: String) throws -> [EncryptedLogin]`
`919`	`918`	`func findLoginToUpdate(look: LoginEntry, encryptionKey: String) throws -> Login?`
`920`		`- func potentialDupesIgnoringUsername(id: String, login: LoginEntry) throws -> [EncryptedLogin]`
`921`	`919`	`func get(id: String) throws -> EncryptedLogin?`
`922`	`920`	`func importMultiple(login: [Login], encryptionKey: String) throws -> String`
`923`	`921`	`func registerWithSyncManager()`
`@@ -938,140 +936,125 @@ public class LoginStore: LoginStoreProtocol {`
`938`	`936`	`self.init(unsafeFromRawPointer: try`
`939`	`937`
`940`	`938`	`rustCallWithError(LoginsStorageError.self) {`
`941`		`- logins_5236_LoginStore_new(path.lower(), $0)`
	`939`	`+ logins_42e6_LoginStore_new(path.lower(), $0)`
`942`	`940`	`})`
`943`	`941`	`}`
`944`	`942`
`945`	`943`	`deinit {`
`946`		`- try! rustCall { ffi_logins_5236_LoginStore_object_free(pointer, $0) }`
`947`		`- }`
`948`		`-`
`949`		`- public func checkValidWithNoDupes(id: String, login: LoginEntry, encryptionKey: String) throws {`
`950`		`- try`
`951`		`- rustCallWithError(LoginsStorageError.self) {`
`952`		`- logins_5236_LoginStore_check_valid_with_no_dupes(self.pointer, id.lower(), login.lower(), encryptionKey.lower(), $0)`
`953`		`- }`
	`944`	`+ try! rustCall { ffi_logins_42e6_LoginStore_object_free(pointer, $0) }`
`954`	`945`	`}`
`955`	`946`
`956`	`947`	`public func add(login: LoginEntry, encryptionKey: String) throws -> EncryptedLogin {`
`957`	`948`	`let _retval = try`
`958`	`949`	`rustCallWithError(LoginsStorageError.self) {`
`959`		`- logins_5236_LoginStore_add(self.pointer, login.lower(), encryptionKey.lower(), $0)`
	`950`	`+ logins_42e6_LoginStore_add(self.pointer, login.lower(), encryptionKey.lower(), $0)`
`960`	`951`	`}`
`961`	`952`	`return try EncryptedLogin.lift(_retval)`
`962`	`953`	`}`
`963`	`954`
`964`	`955`	`public func update(id: String, login: LoginEntry, encryptionKey: String) throws -> EncryptedLogin {`
`965`	`956`	`let _retval = try`
`966`	`957`	`rustCallWithError(LoginsStorageError.self) {`
`967`		`- logins_5236_LoginStore_update(self.pointer, id.lower(), login.lower(), encryptionKey.lower(), $0)`
	`958`	`+ logins_42e6_LoginStore_update(self.pointer, id.lower(), login.lower(), encryptionKey.lower(), $0)`
`968`	`959`	`}`
`969`	`960`	`return try EncryptedLogin.lift(_retval)`
`970`	`961`	`}`
`971`	`962`
`972`	`963`	`public func addOrUpdate(login: LoginEntry, encryptionKey: String) throws -> EncryptedLogin {`
`973`	`964`	`let _retval = try`
`974`	`965`	`rustCallWithError(LoginsStorageError.self) {`
`975`		`- logins_5236_LoginStore_add_or_update(self.pointer, login.lower(), encryptionKey.lower(), $0)`
	`966`	`+ logins_42e6_LoginStore_add_or_update(self.pointer, login.lower(), encryptionKey.lower(), $0)`
`976`	`967`	`}`
`977`	`968`	`return try EncryptedLogin.lift(_retval)`
`978`	`969`	`}`
`979`	`970`
`980`	`971`	`public func delete(id: String) throws -> Bool {`
`981`	`972`	`let _retval = try`
`982`	`973`	`rustCallWithError(LoginsStorageError.self) {`
`983`		`- logins_5236_LoginStore_delete(self.pointer, id.lower(), $0)`
	`974`	`+ logins_42e6_LoginStore_delete(self.pointer, id.lower(), $0)`
`984`	`975`	`}`
`985`	`976`	`return try Bool.lift(_retval)`
`986`	`977`	`}`
`987`	`978`
`988`	`979`	`public func wipe() throws {`
`989`	`980`	`try`
`990`	`981`	`rustCallWithError(LoginsStorageError.self) {`
`991`		`- logins_5236_LoginStore_wipe(self.pointer, $0)`
	`982`	`+ logins_42e6_LoginStore_wipe(self.pointer, $0)`
`992`	`983`	`}`
`993`	`984`	`}`
`994`	`985`
`995`	`986`	`public func wipeLocal() throws {`
`996`	`987`	`try`
`997`	`988`	`rustCallWithError(LoginsStorageError.self) {`
`998`		`- logins_5236_LoginStore_wipe_local(self.pointer, $0)`
	`989`	`+ logins_42e6_LoginStore_wipe_local(self.pointer, $0)`
`999`	`990`	`}`
`1000`	`991`	`}`
`1001`	`992`
`1002`	`993`	`public func reset() throws {`
`1003`	`994`	`try`
`1004`	`995`	`rustCallWithError(LoginsStorageError.self) {`
`1005`		`- logins_5236_LoginStore_reset(self.pointer, $0)`
	`996`	`+ logins_42e6_LoginStore_reset(self.pointer, $0)`
`1006`	`997`	`}`
`1007`	`998`	`}`
`1008`	`999`
`1009`	`1000`	`public func touch(id: String) throws {`
`1010`	`1001`	`try`
`1011`	`1002`	`rustCallWithError(LoginsStorageError.self) {`
`1012`		`- logins_5236_LoginStore_touch(self.pointer, id.lower(), $0)`
	`1003`	`+ logins_42e6_LoginStore_touch(self.pointer, id.lower(), $0)`
`1013`	`1004`	`}`
`1014`	`1005`	`}`
`1015`	`1006`
`1016`	`1007`	`public func list() throws -> [EncryptedLogin] {`
`1017`	`1008`	`let _retval = try`
`1018`	`1009`	`rustCallWithError(LoginsStorageError.self) {`
`1019`		`- logins_5236_LoginStore_list(self.pointer, $0)`
	`1010`	`+ logins_42e6_LoginStore_list(self.pointer, $0)`
`1020`	`1011`	`}`
`1021`	`1012`	`return try [EncryptedLogin].lift(_retval)`
`1022`	`1013`	`}`
`1023`	`1014`
`1024`	`1015`	`public func getByBaseDomain(baseDomain: String) throws -> [EncryptedLogin] {`
`1025`	`1016`	`let _retval = try`
`1026`	`1017`	`rustCallWithError(LoginsStorageError.self) {`
`1027`		`- logins_5236_LoginStore_get_by_base_domain(self.pointer, baseDomain.lower(), $0)`
	`1018`	`+ logins_42e6_LoginStore_get_by_base_domain(self.pointer, baseDomain.lower(), $0)`
`1028`	`1019`	`}`
`1029`	`1020`	`return try [EncryptedLogin].lift(_retval)`
`1030`	`1021`	`}`
`1031`	`1022`
`1032`	`1023`	`public func findLoginToUpdate(look: LoginEntry, encryptionKey: String) throws -> Login? {`
`1033`	`1024`	`let _retval = try`
`1034`	`1025`	`rustCallWithError(LoginsStorageError.self) {`
`1035`		`- logins_5236_LoginStore_find_login_to_update(self.pointer, look.lower(), encryptionKey.lower(), $0)`
	`1026`	`+ logins_42e6_LoginStore_find_login_to_update(self.pointer, look.lower(), encryptionKey.lower(), $0)`
`1036`	`1027`	`}`
`1037`	`1028`	`return try Login?.lift(_retval)`
`1038`	`1029`	`}`
`1039`	`1030`
`1040`		`- public func potentialDupesIgnoringUsername(id: String, login: LoginEntry) throws -> [EncryptedLogin] {`
`1041`		`- let _retval = try`
`1042`		`- rustCallWithError(LoginsStorageError.self) {`
`1043`		`- logins_5236_LoginStore_potential_dupes_ignoring_username(self.pointer, id.lower(), login.lower(), $0)`
`1044`		`- }`
`1045`		`- return try [EncryptedLogin].lift(_retval)`
`1046`		`- }`
`1047`		`-`
`1048`	`1031`	`public func get(id: String) throws -> EncryptedLogin? {`
`1049`	`1032`	`let _retval = try`
`1050`	`1033`	`rustCallWithError(LoginsStorageError.self) {`
`1051`		`- logins_5236_LoginStore_get(self.pointer, id.lower(), $0)`
	`1034`	`+ logins_42e6_LoginStore_get(self.pointer, id.lower(), $0)`
`1052`	`1035`	`}`
`1053`	`1036`	`return try EncryptedLogin?.lift(_retval)`
`1054`	`1037`	`}`
`1055`	`1038`
`1056`	`1039`	`public func importMultiple(login: [Login], encryptionKey: String) throws -> String {`
`1057`	`1040`	`let _retval = try`
`1058`	`1041`	`rustCallWithError(LoginsStorageError.self) {`
`1059`		`- logins_5236_LoginStore_import_multiple(self.pointer, login.lower(), encryptionKey.lower(), $0)`
	`1042`	`+ logins_42e6_LoginStore_import_multiple(self.pointer, login.lower(), encryptionKey.lower(), $0)`
`1060`	`1043`	`}`
`1061`	`1044`	`return try String.lift(_retval)`
`1062`	`1045`	`}`
`1063`	`1046`
`1064`	`1047`	`public func registerWithSyncManager() {`
`1065`	`1048`	`try!`
`1066`	`1049`	`rustCall {`
`1067`		`- logins_5236_LoginStore_register_with_sync_manager(self.pointer, $0)`
	`1050`	`+ logins_42e6_LoginStore_register_with_sync_manager(self.pointer, $0)`
`1068`	`1051`	`}`
`1069`	`1052`	`}`
`1070`	`1053`
`1071`	`1054`	`public func sync(keyId: String, accessToken: String, syncKey: String, tokenserverUrl: String, localEncryptionKey: String) throws -> String {`
`1072`	`1055`	`let _retval = try`
`1073`	`1056`	`rustCallWithError(LoginsStorageError.self) {`
`1074`		`- logins_5236_LoginStore_sync(self.pointer, keyId.lower(), accessToken.lower(), syncKey.lower(), tokenserverUrl.lower(), localEncryptionKey.lower(), $0)`
	`1057`	`+ logins_42e6_LoginStore_sync(self.pointer, keyId.lower(), accessToken.lower(), syncKey.lower(), tokenserverUrl.lower(), localEncryptionKey.lower(), $0)`
`1075`	`1058`	`}`
`1076`	`1059`	`return try String.lift(_retval)`
`1077`	`1060`	`}`