Skip to content

Commit 49553a1

Browse files
brianheinemanbrianheineman
authored
Merge pull request #166 from theseus-rs/update-to-2024-edition
feat: update to Rust 2024 edition
2 parents a47d8e9 + a691c22 commit 49553a1

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

75 files changed

+913
-323
lines changed

‎Cargo.lock

Lines changed: 6 additions & 7 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Cargo.toml

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,15 +17,15 @@ resolver = "2"
1717
[workspace.package]
1818
authors = ["Brian Heineman <brian.heineman@gmail.com>"]
1919
categories = ["database"]
20-
edition = "2021"
20+
edition = "2024"
2121
keywords = ["postgresql", "postgres", "embedded", "database", "server"]
2222
license = "(Apache-2.0 OR MIT) AND PostgreSQL"
2323
repository = "https://github.com/theseus-rs/postgresql-embedded"
24-
rust-version = "1.84.0"
24+
rust-version = "1.85.0"
2525
version = "0.17.5"
2626

2727
[workspace.dependencies]
28-
anyhow = "1.0.95"
28+
anyhow = "1.0.96"
2929
async-trait = "0.1.86"
3030
axum = "0.8.1"
3131
criterion = "0.5.1"
@@ -34,7 +34,6 @@ diesel_migrations = "2.2.0"
3434
flate2 = "1.0.35"
3535
futures-util = "0.3.30"
3636
hex = "0.4.3"
37-
home = "0.5.11"
3837
indicatif = "0.17.11"
3938
indoc = "2.0.5"
4039
liblzma = "0.3.6"
@@ -57,8 +56,8 @@ sha1 = "0.10.6"
5756
sha2 = "0.10.8"
5857
sqlx = { version = "0.8.3", default-features = false, features = ["postgres"] }
5958
tar = "0.4.43"
60-
target-triple = "0.1.3"
61-
tempfile = "3.16.0"
59+
target-triple = "0.1.4"
60+
tempfile = "3.17.1"
6261
test-log = "0.2.17"
6362
thiserror = "2.0.11"
6463
tokio = "1.43.0"

‎examples/archive_async/src/main.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
#![deny(clippy::pedantic)]
44

55
use postgresql_archive::configuration::theseus;
6-
use postgresql_archive::{extract, get_archive, Result, VersionReq};
6+
use postgresql_archive::{Result, VersionReq, extract, get_archive};
77

88
#[tokio::main]
99
async fn main() -> Result<()> {

‎examples/axum_embedded/src/main.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@
44

55
use anyhow::Result;
66
use axum::extract::State;
7-
use axum::{http::StatusCode, routing::get, Json, Router};
7+
use axum::{Json, Router, http::StatusCode, routing::get};
88
use postgresql_embedded::{PostgreSQL, Settings, VersionReq};
9-
use sqlx::postgres::PgPoolOptions;
109
use sqlx::PgPool;
10+
use sqlx::postgres::PgPoolOptions;
1111
use std::env;
1212
use std::time::Duration;
1313
use tokio::net::TcpListener;

‎examples/diesel_embedded/src/main.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
use crate::models::{NewPost, Post};
66
use diesel::r2d2::{ConnectionManager, Pool};
77
use diesel::{PgConnection, RunQueryDsl, SelectableHelper};
8-
use diesel_migrations::{embed_migrations, EmbeddedMigrations, MigrationHarness};
8+
use diesel_migrations::{EmbeddedMigrations, MigrationHarness, embed_migrations};
99
use postgresql_embedded::{PostgreSQL, Result, Settings, VersionReq};
1010

1111
mod models;

‎examples/download_progress_bar/src/main.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ use postgresql_embedded::{PostgreSQL, Settings, VersionReq};
88
use tracing_indicatif::IndicatifLayer;
99
use tracing_subscriber::filter::LevelFilter;
1010
use tracing_subscriber::prelude::*;
11-
use tracing_subscriber::{fmt, Registry};
11+
use tracing_subscriber::{Registry, fmt};
1212

1313
/// Example of how to display a progress bar for the postgresql embedded archive download
1414
#[tokio::main]

‎examples/embedded_sync/src/main.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
#![forbid(clippy::allow_attributes)]
33
#![deny(clippy::pedantic)]
44

5-
use postgresql_embedded::blocking::PostgreSQL;
65
use postgresql_embedded::Result;
6+
use postgresql_embedded::blocking::PostgreSQL;
77

88
fn main() -> Result<()> {
99
let mut postgresql = PostgreSQL::default();

‎examples/sqlx_embedded/src/main.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44

55
use anyhow::Result;
66
use postgresql_embedded::PostgreSQL;
7-
use sqlx::postgres::PgPool;
87
use sqlx::Row;
8+
use sqlx::postgres::PgPool;
99

1010
#[tokio::main]
1111
async fn main() -> Result<()> {

‎examples/zonky/src/main.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
#![forbid(clippy::allow_attributes)]
33
#![deny(clippy::pedantic)]
44

5-
use postgresql_archive::configuration::zonky;
65
use postgresql_archive::VersionReq;
6+
use postgresql_archive::configuration::zonky;
77
use postgresql_embedded::{PostgreSQL, Result, Settings};
88

99
#[tokio::main]

‎postgresql_archive/benches/archive.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
use criterion::{criterion_group, criterion_main, Criterion};
1+
use criterion::{Criterion, criterion_group, criterion_main};
22
use postgresql_archive::blocking::{extract, get_archive};
33
use postgresql_archive::configuration::theseus;
44
use postgresql_archive::{Result, VersionReq};

0 commit comments

Comments
 (0)