theseus-rs · brianheineman · Feb 20, 2025 · Feb 20, 2025
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -17,15 +17,15 @@ resolver = "2"
 [workspace.package]
 authors = ["Brian Heineman <brian.heineman@gmail.com>"]
 categories = ["database"]
-edition = "2021"
+edition = "2024"
 keywords = ["postgresql", "postgres", "embedded", "database", "server"]
 license = "(Apache-2.0 OR MIT) AND PostgreSQL"
 repository = "https://github.com/theseus-rs/postgresql-embedded"
-rust-version = "1.84.0"
+rust-version = "1.85.0"
 version = "0.17.5"
 
 [workspace.dependencies]
-anyhow = "1.0.95"
+anyhow = "1.0.96"
 async-trait = "0.1.86"
 axum = "0.8.1"
 criterion = "0.5.1"
@@ -34,7 +34,6 @@ diesel_migrations = "2.2.0"
 flate2 = "1.0.35"
 futures-util = "0.3.30"
 hex = "0.4.3"
-home = "0.5.11"
 indicatif = "0.17.11"
 indoc = "2.0.5"
 liblzma = "0.3.6"
@@ -57,8 +56,8 @@ sha1 = "0.10.6"
 sha2 = "0.10.8"
 sqlx = { version = "0.8.3", default-features = false, features = ["postgres"] }
 tar = "0.4.43"
-target-triple = "0.1.3"
-tempfile = "3.16.0"
+target-triple = "0.1.4"
+tempfile = "3.17.1"
 test-log = "0.2.17"
 thiserror = "2.0.11"
 tokio = "1.43.0"

diff --git a/examples/archive_async/src/main.rs b/examples/archive_async/src/main.rs
@@ -3,7 +3,7 @@
 #![deny(clippy::pedantic)]
 
 use postgresql_archive::configuration::theseus;
-use postgresql_archive::{extract, get_archive, Result, VersionReq};
+use postgresql_archive::{Result, VersionReq, extract, get_archive};
 
 #[tokio::main]
 async fn main() -> Result<()> {

diff --git a/examples/axum_embedded/src/main.rs b/examples/axum_embedded/src/main.rs
@@ -4,10 +4,10 @@
 
 use anyhow::Result;
 use axum::extract::State;
-use axum::{http::StatusCode, routing::get, Json, Router};
+use axum::{Json, Router, http::StatusCode, routing::get};
 use postgresql_embedded::{PostgreSQL, Settings, VersionReq};
-use sqlx::postgres::PgPoolOptions;
 use sqlx::PgPool;
+use sqlx::postgres::PgPoolOptions;
 use std::env;
 use std::time::Duration;
 use tokio::net::TcpListener;

diff --git a/examples/diesel_embedded/src/main.rs b/examples/diesel_embedded/src/main.rs
@@ -5,7 +5,7 @@
 use crate::models::{NewPost, Post};
 use diesel::r2d2::{ConnectionManager, Pool};
 use diesel::{PgConnection, RunQueryDsl, SelectableHelper};
-use diesel_migrations::{embed_migrations, EmbeddedMigrations, MigrationHarness};
+use diesel_migrations::{EmbeddedMigrations, MigrationHarness, embed_migrations};
 use postgresql_embedded::{PostgreSQL, Result, Settings, VersionReq};
 
 mod models;

diff --git a/examples/download_progress_bar/src/main.rs b/examples/download_progress_bar/src/main.rs
@@ -8,7 +8,7 @@ use postgresql_embedded::{PostgreSQL, Settings, VersionReq};
 use tracing_indicatif::IndicatifLayer;
 use tracing_subscriber::filter::LevelFilter;
 use tracing_subscriber::prelude::*;
-use tracing_subscriber::{fmt, Registry};
+use tracing_subscriber::{Registry, fmt};
 
 /// Example of how to display a progress bar for the postgresql embedded archive download
 #[tokio::main]

diff --git a/examples/embedded_sync/src/main.rs b/examples/embedded_sync/src/main.rs
@@ -2,8 +2,8 @@
 #![forbid(clippy::allow_attributes)]
 #![deny(clippy::pedantic)]
 
-use postgresql_embedded::blocking::PostgreSQL;
 use postgresql_embedded::Result;
+use postgresql_embedded::blocking::PostgreSQL;
 
 fn main() -> Result<()> {
     let mut postgresql = PostgreSQL::default();

diff --git a/examples/sqlx_embedded/src/main.rs b/examples/sqlx_embedded/src/main.rs
@@ -4,8 +4,8 @@
 
 use anyhow::Result;
 use postgresql_embedded::PostgreSQL;
-use sqlx::postgres::PgPool;
 use sqlx::Row;
+use sqlx::postgres::PgPool;
 
 #[tokio::main]
 async fn main() -> Result<()> {

diff --git a/examples/zonky/src/main.rs b/examples/zonky/src/main.rs
@@ -2,8 +2,8 @@
 #![forbid(clippy::allow_attributes)]
 #![deny(clippy::pedantic)]
 
-use postgresql_archive::configuration::zonky;
 use postgresql_archive::VersionReq;
+use postgresql_archive::configuration::zonky;
 use postgresql_embedded::{PostgreSQL, Result, Settings};
 
 #[tokio::main]

diff --git a/postgresql_archive/benches/archive.rs b/postgresql_archive/benches/archive.rs
@@ -1,4 +1,4 @@
-use criterion::{criterion_group, criterion_main, Criterion};
+use criterion::{Criterion, criterion_group, criterion_main};
 use postgresql_archive::blocking::{extract, get_archive};
 use postgresql_archive::configuration::theseus;
 use postgresql_archive::{Result, VersionReq};

diff --git a/postgresql_archive/src/configuration/theseus/extractor.rs b/postgresql_archive/src/configuration/theseus/extractor.rs
@@ -1,6 +1,6 @@
-use crate::extractor::{tar_gz_extract, ExtractDirectories};
 use crate::Error::Unexpected;
 use crate::Result;
+use crate::extractor::{ExtractDirectories, tar_gz_extract};
 use regex_lite::Regex;
 use std::fs::{create_dir_all, remove_dir_all, remove_file, rename};
 use std::path::{Path, PathBuf};

diff --git a/postgresql_archive/src/configuration/zonky/extractor.rs b/postgresql_archive/src/configuration/zonky/extractor.rs
@@ -1,6 +1,6 @@
-use crate::extractor::{tar_xz_extract, ExtractDirectories};
 use crate::Error::Unexpected;
 use crate::Result;
+use crate::extractor::{ExtractDirectories, tar_xz_extract};
 use regex_lite::Regex;
 use std::fs::{create_dir_all, remove_dir_all, remove_file, rename};
 use std::io::Cursor;

diff --git a/postgresql_archive/src/configuration/zonky/repository.rs b/postgresql_archive/src/configuration/zonky/repository.rs
@@ -1,8 +1,8 @@
+use crate::Result;
 use crate::configuration::zonky::matcher::{get_arch, get_os};
+use crate::repository::Archive;
 use crate::repository::maven::repository::Maven;
 use crate::repository::model::Repository;
-use crate::repository::Archive;
-use crate::Result;
 use async_trait::async_trait;
 use semver::{Version, VersionReq};
 use tracing::instrument;

diff --git a/postgresql_archive/src/extractor/registry.rs b/postgresql_archive/src/extractor/registry.rs
@@ -1,10 +1,10 @@
+use crate::Error::{PoisonedLock, UnsupportedExtractor};
+use crate::Result;
 #[cfg(feature = "theseus")]
 use crate::configuration::theseus;
 #[cfg(feature = "zonky")]
 use crate::configuration::zonky;
 use crate::extractor::ExtractDirectories;
-use crate::Error::{PoisonedLock, UnsupportedExtractor};
-use crate::Result;
 use std::path::PathBuf;
 use std::sync::{Arc, LazyLock, Mutex, RwLock};
 

diff --git a/postgresql_archive/src/extractor/tar_gz_extractor.rs b/postgresql_archive/src/extractor/tar_gz_extractor.rs
@@ -1,10 +1,10 @@
-use crate::extractor::ExtractDirectories;
 use crate::Error::Unexpected;
 use crate::Result;
+use crate::extractor::ExtractDirectories;
 use flate2::bufread::GzDecoder;
 use num_format::{Locale, ToFormattedString};
-use std::fs::{create_dir_all, File};
-use std::io::{copy, BufReader, Cursor};
+use std::fs::{File, create_dir_all};
+use std::io::{BufReader, Cursor, copy};
 use std::path::PathBuf;
 use tar::Archive;
 use tracing::{debug, instrument, warn};

diff --git a/postgresql_archive/src/extractor/tar_xz_extractor.rs b/postgresql_archive/src/extractor/tar_xz_extractor.rs
@@ -1,10 +1,10 @@
-use crate::extractor::ExtractDirectories;
 use crate::Error::Unexpected;
 use crate::Result;
+use crate::extractor::ExtractDirectories;
 use liblzma::bufread::XzDecoder;
 use num_format::{Locale, ToFormattedString};
-use std::fs::{create_dir_all, File};
-use std::io::{copy, BufReader, Cursor};
+use std::fs::{File, create_dir_all};
+use std::io::{BufReader, Cursor, copy};
 use std::path::PathBuf;
 use tar::Archive;
 use tracing::{debug, instrument, warn};

diff --git a/postgresql_archive/src/extractor/zip_extractor.rs b/postgresql_archive/src/extractor/zip_extractor.rs
@@ -1,5 +1,5 @@
-use crate::extractor::ExtractDirectories;
 use crate::Result;
+use crate::extractor::ExtractDirectories;
 use num_format::{Locale, ToFormattedString};
 use std::fs::create_dir_all;
 use std::io::Cursor;

diff --git a/postgresql_archive/src/hasher/registry.rs b/postgresql_archive/src/hasher/registry.rs
@@ -1,3 +1,5 @@
+use crate::Error::{PoisonedLock, UnsupportedHasher};
+use crate::Result;
 #[cfg(feature = "theseus")]
 use crate::configuration::theseus;
 #[cfg(feature = "md5")]
@@ -10,8 +12,6 @@ use crate::hasher::sha2_256;
 use crate::hasher::sha2_512;
 #[cfg(feature = "maven")]
 use crate::repository::maven;
-use crate::Error::{PoisonedLock, UnsupportedHasher};
-use crate::Result;
 use std::sync::{Arc, LazyLock, Mutex, RwLock};
 
 static REGISTRY: LazyLock<Arc<Mutex<HasherRegistry>>> =

diff --git a/postgresql_archive/src/matcher/registry.rs b/postgresql_archive/src/matcher/registry.rs
@@ -1,9 +1,9 @@
+use crate::Error::{PoisonedLock, UnsupportedMatcher};
+use crate::Result;
 #[cfg(feature = "theseus")]
 use crate::configuration::theseus;
 #[cfg(feature = "zonky")]
 use crate::configuration::zonky;
-use crate::Error::{PoisonedLock, UnsupportedMatcher};
-use crate::Result;
 use semver::Version;
 use std::sync::{Arc, LazyLock, Mutex, RwLock};
 

diff --git a/postgresql_archive/src/repository/github/repository.rs b/postgresql_archive/src/repository/github/repository.rs
@@ -1,18 +1,18 @@
-use crate::hasher::registry::HasherFn;
-use crate::repository::github::models::{Asset, Release};
-use crate::repository::model::Repository;
-use crate::repository::Archive;
 use crate::Error::{
     ArchiveHashMismatch, AssetHashNotFound, AssetNotFound, RepositoryFailure, VersionNotFound,
 };
-use crate::{hasher, matcher, Result};
+use crate::hasher::registry::HasherFn;
+use crate::repository::Archive;
+use crate::repository::github::models::{Asset, Release};
+use crate::repository::model::Repository;
+use crate::{Result, hasher, matcher};
 use async_trait::async_trait;
 use futures_util::StreamExt;
 use regex_lite::Regex;
 use reqwest::header::HeaderMap;
 use reqwest_middleware::{ClientBuilder, ClientWithMiddleware};
-use reqwest_retry::policies::ExponentialBackoff;
 use reqwest_retry::RetryTransientMiddleware;
+use reqwest_retry::policies::ExponentialBackoff;
 use reqwest_tracing::TracingMiddleware;
 use semver::{Version, VersionReq};
 use std::env;

diff --git a/postgresql_archive/src/repository/maven/repository.rs b/postgresql_archive/src/repository/maven/repository.rs
@@ -1,14 +1,14 @@
+use crate::Error::{ArchiveHashMismatch, ParseError, RepositoryFailure, VersionNotFound};
+use crate::repository::Archive;
 use crate::repository::maven::models::Metadata;
 use crate::repository::model::Repository;
-use crate::repository::Archive;
-use crate::Error::{ArchiveHashMismatch, ParseError, RepositoryFailure, VersionNotFound};
-use crate::{hasher, Result};
+use crate::{Result, hasher};
 use async_trait::async_trait;
 use futures_util::StreamExt;
 use reqwest::header::HeaderMap;
 use reqwest_middleware::{ClientBuilder, ClientWithMiddleware};
-use reqwest_retry::policies::ExponentialBackoff;
 use reqwest_retry::RetryTransientMiddleware;
+use reqwest_retry::policies::ExponentialBackoff;
 use reqwest_tracing::TracingMiddleware;
 use semver::{Version, VersionReq};
 use std::env;

diff --git a/postgresql_archive/src/repository/registry.rs b/postgresql_archive/src/repository/registry.rs
@@ -1,12 +1,12 @@
+use crate::Error::{PoisonedLock, UnsupportedRepository};
+use crate::Result;
 #[cfg(feature = "theseus")]
 use crate::configuration::theseus;
 #[cfg(feature = "zonky")]
 use crate::configuration::zonky;
 #[cfg(feature = "github")]
 use crate::repository::github::repository::GitHub;
 use crate::repository::model::Repository;
-use crate::Error::{PoisonedLock, UnsupportedRepository};
-use crate::Result;
 use std::sync::{Arc, LazyLock, Mutex, RwLock};
 
 static REGISTRY: LazyLock<Arc<Mutex<RepositoryRegistry>>> =

diff --git a/postgresql_archive/tests/blocking.rs b/postgresql_archive/tests/blocking.rs
@@ -1,10 +1,10 @@
 #[cfg(feature = "blocking")]
+use postgresql_archive::VersionReq;
+#[cfg(feature = "blocking")]
 use postgresql_archive::blocking::{extract, get_archive, get_version};
 #[cfg(feature = "blocking")]
 use postgresql_archive::configuration::theseus;
 #[cfg(feature = "blocking")]
-use postgresql_archive::VersionReq;
-#[cfg(feature = "blocking")]
 use std::fs::remove_dir_all;
 #[cfg(feature = "blocking")]
 use test_log::test;

diff --git a/postgresql_commands/src/clusterdb.rs b/postgresql_commands/src/clusterdb.rs
@@ -1,5 +1,5 @@
-use crate::traits::CommandBuilder;
 use crate::Settings;
+use crate::traits::CommandBuilder;
 use std::convert::AsRef;
 use std::ffi::{OsStr, OsString};
 use std::path::PathBuf;
@@ -258,8 +258,8 @@ impl CommandBuilder for ClusterDbBuilder {
 #[cfg(test)]
 mod tests {
     use super::*;
-    use crate::traits::CommandToString;
     use crate::TestSettings;
+    use crate::traits::CommandToString;
     use test_log::test;
 
     #[test]

diff --git a/postgresql_commands/src/createdb.rs b/postgresql_commands/src/createdb.rs
@@ -1,5 +1,5 @@
-use crate::traits::CommandBuilder;
 use crate::Settings;
+use crate::traits::CommandBuilder;
 use std::convert::AsRef;
 use std::ffi::{OsStr, OsString};
 use std::path::PathBuf;
@@ -363,8 +363,8 @@ impl CommandBuilder for CreateDbBuilder {
 #[cfg(test)]
 mod tests {
     use super::*;
-    use crate::traits::CommandToString;
     use crate::TestSettings;
+    use crate::traits::CommandToString;
     use test_log::test;
 
     #[test]

diff --git a/postgresql_commands/src/createuser.rs b/postgresql_commands/src/createuser.rs
@@ -1,5 +1,5 @@
-use crate::traits::CommandBuilder;
 use crate::Settings;
+use crate::traits::CommandBuilder;
 use std::convert::AsRef;
 use std::ffi::{OsStr, OsString};
 use std::path::PathBuf;
@@ -440,8 +440,8 @@ impl CommandBuilder for CreateUserBuilder {
 #[cfg(test)]
 mod tests {
     use super::*;
-    use crate::traits::CommandToString;
     use crate::TestSettings;
+    use crate::traits::CommandToString;
     use test_log::test;
 
     #[test]

diff --git a/postgresql_commands/src/dropdb.rs b/postgresql_commands/src/dropdb.rs
@@ -1,5 +1,5 @@
-use crate::traits::CommandBuilder;
 use crate::Settings;
+use crate::traits::CommandBuilder;
 use std::ffi::{OsStr, OsString};
 use std::path::PathBuf;
 
@@ -243,8 +243,8 @@ impl CommandBuilder for DropDbBuilder {
 #[cfg(test)]
 mod tests {
     use super::*;
-    use crate::traits::CommandToString;
     use crate::TestSettings;
+    use crate::traits::CommandToString;
     use test_log::test;
 
     #[test]