Skip to content

Commit 809bc39

Browse files
committed
Run rustfmt
1 parent ae4fcd1 commit 809bc39

File tree

9 files changed

+24
-33
lines changed

9 files changed

+24
-33
lines changed

sqlx-core/src/io/buf_stream.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
use std::io;
22
use std::ops::{Deref, DerefMut};
33

4-
use crate::runtime::{AsyncRead, AsyncReadExt, AsyncWriteExt, AsyncWrite};
4+
use crate::runtime::{AsyncRead, AsyncReadExt, AsyncWrite, AsyncWriteExt};
55

66
const RBUF_SIZE: usize = 8 * 1024;
77

sqlx-core/src/io/tls.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1+
use std::io;
12
use std::io::{IoSlice, IoSliceMut};
2-
use std::pin::Pin;
33
use std::net::Shutdown;
4-
use std::io;
4+
use std::pin::Pin;
55
use std::task::{Context, Poll};
66

7-
use crate::runtime::{TcpStream, AsyncRead, AsyncWrite};
7+
use crate::runtime::{AsyncRead, AsyncWrite, TcpStream};
88
use crate::url::Url;
99

1010
use self::Inner::*;
@@ -57,7 +57,7 @@ impl MaybeTlsStream {
5757
Ok(())
5858
}
5959

60-
pub fn shutdown(&self, how:Shutdown) -> io::Result<()> {
60+
pub fn shutdown(&self, how: Shutdown) -> io::Result<()> {
6161
match self.inner {
6262
NotTls(ref conn) => conn.shutdown(how),
6363
#[cfg(feature = "tls")]

sqlx-core/src/mysql/connection.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
use std::convert::TryInto;
22
use std::io;
33

4-
use std::net::Shutdown;
54
use byteorder::{ByteOrder, LittleEndian};
65
use futures_core::future::BoxFuture;
76
use sha1::Sha1;
7+
use std::net::Shutdown;
88

99
use crate::cache::StatementCache;
1010
use crate::connection::{Connect, Connection};
@@ -451,8 +451,8 @@ impl MySqlConnection {
451451
ca_file: Option<&str>,
452452
invalid_hostnames: bool,
453453
) -> crate::Result<()> {
454-
use async_native_tls::{Certificate, TlsConnector};
455454
use crate::runtime::fs;
455+
use async_native_tls::{Certificate, TlsConnector};
456456

457457
let mut connector = TlsConnector::new()
458458
.danger_accept_invalid_certs(ca_file.is_none())

sqlx-core/src/pool/inner.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ use std::time::Instant;
66
use crossbeam_queue::{ArrayQueue, SegQueue};
77
use futures_channel::oneshot::{channel, Sender};
88

9-
use crate::runtime::{sleep, spawn, timeout, yield_now};
109
use super::{Idle, Live, Options};
10+
use crate::runtime::{sleep, spawn, timeout, yield_now};
1111
use crate::{
1212
connection::{Connect, Connection},
1313
error::Error,

sqlx-core/src/postgres/connection.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
use std::convert::TryInto;
22

3-
use std::net::Shutdown;
43
use byteorder::NetworkEndian;
54
use futures_core::future::BoxFuture;
65
use hmac::{Hmac, Mac};
76
use rand::Rng;
87
use sha2::{Digest, Sha256};
8+
use std::net::Shutdown;
99

1010
use crate::cache::StatementCache;
1111
use crate::connection::{Connect, Connection};

sqlx-core/src/runtime.rs

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,22 @@
11
#[cfg(feature = "runtime-async-std")]
22
pub use async_std::{
3-
net::TcpStream,
4-
future::timeout,
53
fs,
4+
future::timeout,
5+
io::prelude::{ReadExt as AsyncReadExt, WriteExt as AsyncWriteExt},
6+
io::{Read as AsyncRead, Write as AsyncWrite},
7+
net::TcpStream,
8+
task::sleep,
69
task::spawn,
710
task::yield_now,
8-
task::sleep,
9-
io::{Read as AsyncRead, Write as AsyncWrite},
10-
io::prelude::{ReadExt as AsyncReadExt, WriteExt as AsyncWriteExt}
1111
};
1212

1313
#[cfg(feature = "runtime-tokio")]
1414
pub use tokio::{
15-
io::{AsyncRead, AsyncReadExt, AsyncWrite, AsyncWriteExt},
1615
fs,
17-
time::timeout,
16+
io::{AsyncRead, AsyncReadExt, AsyncWrite, AsyncWriteExt},
1817
net::TcpStream,
1918
task::spawn,
2019
task::yield_now,
2120
time::delay_for as sleep,
21+
time::timeout,
2222
};

sqlx-core/src/transaction.rs

Lines changed: 6 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@ use std::ops::{Deref, DerefMut};
33
use futures_core::future::BoxFuture;
44
use futures_core::stream::BoxStream;
55

6-
use crate::runtime::spawn;
76
use crate::connection::Connection;
87
use crate::database::Database;
98
use crate::describe::Describe;
109
use crate::executor::Executor;
10+
use crate::runtime::spawn;
1111

1212
pub struct Transaction<T>
1313
where
@@ -27,9 +27,7 @@ where
2727
} else {
2828
let stmt = format!("SAVEPOINT _sqlx_savepoint_{}", depth);
2929

30-
inner
31-
.send(&stmt)
32-
.await?;
30+
inner.send(&stmt).await?;
3331
}
3432

3533
Ok(Self {
@@ -51,9 +49,7 @@ where
5149
} else {
5250
let stmt = format!("RELEASE SAVEPOINT _sqlx_savepoint_{}", depth - 1);
5351

54-
inner
55-
.send(&stmt)
56-
.await?;
52+
inner.send(&stmt).await?;
5753
}
5854

5955
Ok(inner)
@@ -66,14 +62,9 @@ where
6662
if depth == 1 {
6763
inner.send("ROLLBACK").await?;
6864
} else {
69-
let stmt = format!(
70-
"ROLLBACK TO SAVEPOINT _sqlx_savepoint_{}",
71-
depth - 1
72-
);
73-
74-
inner
75-
.send(&stmt)
76-
.await?;
65+
let stmt = format!("ROLLBACK TO SAVEPOINT _sqlx_savepoint_{}", depth - 1);
66+
67+
inner.send(&stmt).await?;
7768
}
7869

7970
Ok(inner)

sqlx-macros/src/query_macros/input.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
use std::env;
22

3-
use sqlx::runtime::fs;
43
use proc_macro2::{Ident, Span, TokenStream};
4+
use sqlx::runtime::fs;
55
use syn::parse::{Parse, ParseStream};
66
use syn::punctuated::Punctuated;
77
use syn::spanned::Spanned;

tests/postgres-macros.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
use sqlx::{PgConnection, Connect};
1+
use sqlx::{Connect, PgConnection};
22

33
#[cfg_attr(feature = "runtime-async-std", async_std::test)]
44
#[cfg_attr(feature = "runtime-tokio", tokio::test)]

0 commit comments

Comments
 (0)