Skip to content

Commit d551c5c

Browse files
committed
fix: cargo fmt
1 parent 6b34f5f commit d551c5c

File tree

3 files changed

+30
-34
lines changed

3 files changed

+30
-34
lines changed

examples/postgres/multi-database/accounts/src/lib.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ use sqlx::{Acquire, Executor, PgPool, PgTransaction, Postgres};
55
use std::sync::Arc;
66
use uuid::Uuid;
77

8-
use tokio::sync::Semaphore;
98
use sqlx::postgres::{PgConnectOptions, PgPoolOptions};
9+
use tokio::sync::Semaphore;
1010

1111
#[derive(sqlx::Type, Copy, Clone, Debug, serde::Deserialize, serde::Serialize)]
1212
#[sqlx(transparent)]
@@ -118,7 +118,7 @@ impl AccountsManager {
118118
.max_connections(5)
119119
.connect_with(opts)
120120
.await?;
121-
121+
122122
sqlx::migrate!()
123123
.run(&pool)
124124
.await

examples/postgres/multi-database/payments/src/lib.rs

+17-23
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
use accounts::{AccountId, AccountsManager};
2+
use sqlx::postgres::{PgConnectOptions, PgPoolOptions};
23
use sqlx::{Acquire, PgConnection, PgPool, Postgres};
34
use time::OffsetDateTime;
45
use uuid::Uuid;
5-
use sqlx::postgres::{PgConnectOptions, PgPoolOptions};
66

77
#[derive(sqlx::Type, Copy, Clone, Debug)]
88
#[sqlx(transparent)]
@@ -41,17 +41,13 @@ pub struct PaymentsManager {
4141
}
4242

4343
impl PaymentsManager {
44-
pub async fn setup(
45-
opts: PgConnectOptions,
46-
) -> sqlx::Result<Self> {
44+
pub async fn setup(opts: PgConnectOptions) -> sqlx::Result<Self> {
4745
let pool = PgPoolOptions::new()
4846
.max_connections(5)
4947
.connect_with(opts)
5048
.await?;
5149

52-
sqlx::migrate!()
53-
.run(&pool)
54-
.await?;
50+
sqlx::migrate!().run(&pool).await?;
5551

5652
Ok(Self { pool })
5753
}
@@ -61,8 +57,8 @@ impl PaymentsManager {
6157
pub async fn create(
6258
&self,
6359
account_id: AccountId,
64-
currency: &str,
65-
amount: rust_decimal::Decimal,
60+
currency: &str,
61+
amount: rust_decimal::Decimal,
6662
) -> sqlx::Result<Payment> {
6763
// Check-out a connection to avoid paying the overhead of acquiring one for each call.
6864
let mut conn = self.pool.acquire().await?;
@@ -91,8 +87,8 @@ impl PaymentsManager {
9187
currency,
9288
amount,
9389
)
94-
.fetch_one(&mut *conn)
95-
.await?;
90+
.fetch_one(&mut *conn)
91+
.await?;
9692

9793
// We then create the record with the payment vendor...
9894
let external_payment_id = "foobar1234";
@@ -103,17 +99,17 @@ impl PaymentsManager {
10399
// the order of columns gets baked into the binary, so if it changes between compile time and
104100
// run-time, you may run into errors.
105101
let payment = sqlx::query_as!(
106-
Payment,
107-
"update payment \
102+
Payment,
103+
"update payment \
108104
set status = $1, external_payment_id = $2 \
109105
where payment_id = $3 \
110106
returning *",
111-
PaymentStatus::Created,
112-
external_payment_id,
113-
payment_id.0,
114-
)
115-
.fetch_one(&mut *conn)
116-
.await?;
107+
PaymentStatus::Created,
108+
external_payment_id,
109+
payment_id.0,
110+
)
111+
.fetch_one(&mut *conn)
112+
.await?;
117113

118114
Ok(payment)
119115
}
@@ -125,9 +121,7 @@ impl PaymentsManager {
125121
"select * from payment where payment_id = $1",
126122
payment_id.0
127123
)
128-
.fetch_optional(&self.pool)
129-
.await
124+
.fetch_optional(&self.pool)
125+
.await
130126
}
131127
}
132-
133-

examples/postgres/multi-database/src/main.rs

+11-9
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
use accounts::AccountsManager;
22
use color_eyre::eyre;
33
use color_eyre::eyre::{Context, OptionExt};
4-
use rand::distributions::{Alphanumeric, DistString};
54
use payments::PaymentsManager;
5+
use rand::distributions::{Alphanumeric, DistString};
66
use sqlx::Connection;
77

88
#[tokio::main]
@@ -18,23 +18,24 @@ async fn main() -> eyre::Result<()> {
1818
.await
1919
.wrap_err("could not connect to database")?;
2020

21-
let accounts = AccountsManager::setup(
21+
let accounts = AccountsManager::setup(
2222
dotenvy::var("ACCOUNTS_DATABASE_URL")
2323
.wrap_err("ACCOUNTS_DATABASE_URL must be set")?
2424
.parse()
2525
.wrap_err("error parsing ACCOUNTS_DATABASE_URL")?,
26-
1)
27-
.await
28-
.wrap_err("error initializing AccountsManager")?;
29-
26+
1,
27+
)
28+
.await
29+
.wrap_err("error initializing AccountsManager")?;
30+
3031
let payments = PaymentsManager::setup(
3132
dotenvy::var("PAYMENTS_DATABASE_URL")
3233
.wrap_err("PAYMENTS_DATABASE_URL must be set")?
3334
.parse()
3435
.wrap_err("error parsing PAYMENTS_DATABASE_URL")?,
3536
)
36-
.await
37-
.wrap_err("error initializing PaymentsManager")?;
37+
.await
38+
.wrap_err("error initializing PaymentsManager")?;
3839

3940
// For simplicity's sake, imagine each of these might be invoked by different request routes
4041
// in a web application.
@@ -94,7 +95,8 @@ async fn main() -> eyre::Result<()> {
9495
let purchase_amount: rust_decimal::Decimal = "12.34".parse().unwrap();
9596

9697
// Then, because the user is making a purchase, we record a payment.
97-
let payment = payments.create(account_id, "USD", purchase_amount)
98+
let payment = payments
99+
.create(account_id, "USD", purchase_amount)
98100
.await
99101
.wrap_err("error creating payment")?;
100102

0 commit comments

Comments
 (0)