fix missed conflicts

Author: Ekleog

src/factory.rs

@@ -1,8 +1,7 @@
 use crate::{
-    database::OwnedDatabase,
     transaction::{unsafe_jar, RunnableTransaction, TransactionResult},
     utils::{non_transaction_request, str_slice_to_array},
-    Database, ObjectStore, Transaction,
+    Database, ObjectStore, OwnedDatabase, Transaction,
 };
 use futures_util::{pin_mut, FutureExt};
 use std::{

src/lib.rs

@@ -18,7 +18,7 @@ mod transaction;
 mod utils;
 
 pub use cursor::{Cursor, CursorBuilder, CursorDirection};
-pub use database::Database;
+pub use database::{Database, OwnedDatabase};
 pub use error::{Error, Result};
 pub use factory::{Factory, ObjectStoreBuilder, VersionChangeEvent};
 pub use index::Index;

tests/common/mod.rs

@@ -1,3 +1,5 @@
+use std::convert::Infallible;
+
 use indexed_db::{Error, Factory};
 use wasm_bindgen_test::wasm_bindgen_test;
 use web_sys::{
@@ -471,20 +473,19 @@ async fn typed_array_keys() {
 
 #[wasm_bindgen_test]
 async fn borrowing_transaction() {
-    let factory = Factory::<()>::get().unwrap();
+    let factory = Factory::get().unwrap();
 
     let db = factory
-        .open("foo42", 1, async move |evt| {
-            let db = evt.database();
-            db.build_object_store("data").create()?;
+        .open::<Infallible>("foo42", 1, async move |evt| {
+            evt.build_object_store("data").create()?;
             Ok(())
         })
         .await
         .unwrap();
     let data_from_outside = String::from("superlargedata");
     db.transaction(&["data"])
         .rw()
-        .run(async |t| {
+        .run::<_, Infallible>(async |t| {
             let data = t.object_store("data")?;
             data.add_kv(
                 &JsString::from("data"),
@@ -496,7 +497,7 @@ async fn borrowing_transaction() {
         .await
         .unwrap();
     db.transaction(&["data"])
-        .run(async |t| {
+        .run::<_, Infallible>(async |t| {
             let data = t.object_store("data")?;
             assert_eq!(
                 data.get(&JsString::from("data"))