From e2fc3ea4535686770494659823a23d50918929a0 Mon Sep 17 00:00:00 2001
From: Uwe Klotz <uwe.klotz@gmail.com>
Date: Thu, 13 Jul 2023 17:09:53 +0200
Subject: [PATCH] Upgrade to Rust 1.71

---
 Cargo.lock                                    |  6 ++--
 Cargo.toml                                    |  2 +-
 crates/repo-sqlite/src/lib.rs                 | 33 +++++++++----------
 .../repo-sqlite/src/repo/collection/tests.rs  |  2 +-
 .../src/repo/media/source/tests.rs            |  2 +-
 .../src/repo/media/tracker/tests.rs           |  2 +-
 crates/repo-sqlite/src/repo/playlist/tests.rs |  2 +-
 7 files changed, 24 insertions(+), 25 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index f52f63a2..c466add8 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -3216,7 +3216,7 @@ checksum = "b2eae68fc220f7cf2532e4494aded17545fce192d59cd996e0fe7887f4ceb575"
 dependencies = [
  "aho-corasick",
  "memchr",
- "regex-automata 0.3.2",
+ "regex-automata 0.3.3",
  "regex-syntax 0.7.4",
 ]
 
@@ -3231,9 +3231,9 @@ dependencies = [
 
 [[package]]
 name = "regex-automata"
-version = "0.3.2"
+version = "0.3.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "83d3daa6976cffb758ec878f108ba0e062a45b2d6ca3a2cca965338855476caf"
+checksum = "39354c10dd07468c2e73926b23bb9c2caca74c5501e38a35da70406f1d923310"
 dependencies = [
  "aho-corasick",
  "memchr",
diff --git a/Cargo.toml b/Cargo.toml
index 75b1883e..0d7500f9 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -32,7 +32,7 @@ repository = "https://gitlab.com/uklotzde/aoide-rs"
 version = "0.8.0"
 license = "AGPL-3.0-or-later"
 edition = "2021"
-rust-version = "1.70"
+rust-version = "1.71"
 
 [package]
 name = "aoide"
diff --git a/crates/repo-sqlite/src/lib.rs b/crates/repo-sqlite/src/lib.rs
index 10997e73..7e2f3e29 100644
--- a/crates/repo-sqlite/src/lib.rs
+++ b/crates/repo-sqlite/src/lib.rs
@@ -136,23 +136,6 @@ pub mod prelude {
     pub type RepoTransactionError = DieselTransactionError<RepoError>;
 
     pub(crate) use aoide_repo::RecordId as RowId;
-
-    #[cfg(test)]
-    pub mod tests {
-        use diesel::Connection as _;
-
-        use super::DbConnection;
-
-        pub type TestResult<T> = anyhow::Result<T>;
-
-        pub fn establish_connection() -> TestResult<DbConnection> {
-            let mut connection =
-                DbConnection::establish(":memory:").expect("in-memory database connection");
-            crate::run_migrations(&mut connection)
-                .map_err(|err| anyhow::anyhow!(err.to_string()))?;
-            Ok(connection)
-        }
-    }
 }
 
 pub mod repo;
@@ -191,3 +174,19 @@ const EMBEDDED_MIGRATIONS: EmbeddedMigrations = embed_migrations!("migrations");
 pub fn run_migrations(connection: &mut DbConnection) -> MigrationResult<Vec<MigrationVersion<'_>>> {
     connection.run_pending_migrations(EMBEDDED_MIGRATIONS)
 }
+
+#[cfg(test)]
+pub mod tests {
+    use diesel::Connection as _;
+
+    use super::DbConnection;
+
+    pub type TestResult<T> = anyhow::Result<T>;
+
+    pub fn establish_connection() -> TestResult<DbConnection> {
+        let mut connection =
+            DbConnection::establish(":memory:").expect("in-memory database connection");
+        crate::run_migrations(&mut connection).map_err(|err| anyhow::anyhow!(err.to_string()))?;
+        Ok(connection)
+    }
+}
diff --git a/crates/repo-sqlite/src/repo/collection/tests.rs b/crates/repo-sqlite/src/repo/collection/tests.rs
index e3e06755..fe613fc5 100644
--- a/crates/repo-sqlite/src/repo/collection/tests.rs
+++ b/crates/repo-sqlite/src/repo/collection/tests.rs
@@ -7,7 +7,7 @@ use aoide_core::{
 use test_log::test;
 
 use super::*;
-use crate::prelude::tests::*;
+use crate::tests::*;
 
 struct Fixture {
     db: DbConnection,
diff --git a/crates/repo-sqlite/src/repo/media/source/tests.rs b/crates/repo-sqlite/src/repo/media/source/tests.rs
index fd17b865..6f1f3b82 100644
--- a/crates/repo-sqlite/src/repo/media/source/tests.rs
+++ b/crates/repo-sqlite/src/repo/media/source/tests.rs
@@ -23,7 +23,7 @@ use mime::IMAGE_JPEG;
 use test_log::test;
 
 use super::*;
-use crate::prelude::tests::*;
+use crate::tests::*;
 
 struct Fixture {
     collection_id: CollectionId,
diff --git a/crates/repo-sqlite/src/repo/media/tracker/tests.rs b/crates/repo-sqlite/src/repo/media/tracker/tests.rs
index ddccdb6d..98e78581 100644
--- a/crates/repo-sqlite/src/repo/media/tracker/tests.rs
+++ b/crates/repo-sqlite/src/repo/media/tracker/tests.rs
@@ -14,7 +14,7 @@ use aoide_repo::{
 use test_log::test;
 
 use super::*;
-use crate::prelude::tests::*;
+use crate::tests::*;
 
 struct Fixture {
     db: DbConnection,
diff --git a/crates/repo-sqlite/src/repo/playlist/tests.rs b/crates/repo-sqlite/src/repo/playlist/tests.rs
index 917ef204..b461bada 100644
--- a/crates/repo-sqlite/src/repo/playlist/tests.rs
+++ b/crates/repo-sqlite/src/repo/playlist/tests.rs
@@ -20,7 +20,7 @@ use aoide_repo::{
 use test_log::test;
 
 use super::*;
-use crate::prelude::tests::*;
+use crate::tests::*;
 
 struct Fixture {
     collection_id: CollectionId,