Skip to content

Commit beb509f

Browse files
committed
rustfmt
1 parent f458847 commit beb509f

File tree

2 files changed

+61
-34
lines changed

2 files changed

+61
-34
lines changed

tokio-postgres/src/copy_in.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,11 @@ use futures::{SinkExt, Stream, StreamExt, TryStream, TryStreamExt};
99
use pin_utils::pin_mut;
1010
use postgres_protocol::message::backend::Message;
1111
use postgres_protocol::message::frontend;
12+
use postgres_protocol::message::frontend::CopyData;
1213
use std::error;
1314
use std::pin::Pin;
1415
use std::sync::Arc;
1516
use std::task::{Context, Poll};
16-
use postgres_protocol::message::frontend::CopyData;
1717

1818
enum CopyInMessage {
1919
Message(FrontendMessage),

tokio-postgres/tests/test/main.rs

+60-33
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
#![warn(rust_2018_idioms)]
22
#![feature(async_await)]
33

4+
use futures::stream;
45
use futures::{join, try_join, FutureExt, TryStreamExt};
56
use std::fmt::Write;
67
use std::time::{Duration, Instant};
7-
use futures::stream;
88
use tokio::net::TcpStream;
99
use tokio::timer::Delay;
1010
use tokio_postgres::error::SqlState;
@@ -324,9 +324,9 @@ async fn transaction_commit() {
324324
client
325325
.batch_execute(
326326
"CREATE TEMPORARY TABLE foo(
327-
id SERIAL,
328-
name TEXT
329-
)",
327+
id SERIAL,
328+
name TEXT
329+
)",
330330
)
331331
.await
332332
.unwrap();
@@ -356,9 +356,9 @@ async fn transaction_rollback() {
356356
client
357357
.batch_execute(
358358
"CREATE TEMPORARY TABLE foo(
359-
id SERIAL,
360-
name TEXT
361-
)",
359+
id SERIAL,
360+
name TEXT
361+
)",
362362
)
363363
.await
364364
.unwrap();
@@ -387,9 +387,9 @@ async fn transaction_rollback_drop() {
387387
client
388388
.batch_execute(
389389
"CREATE TEMPORARY TABLE foo(
390-
id SERIAL,
391-
name TEXT
392-
)",
390+
id SERIAL,
391+
name TEXT
392+
)",
393393
)
394394
.await
395395
.unwrap();
@@ -415,20 +415,34 @@ async fn transaction_rollback_drop() {
415415
async fn copy_in() {
416416
let mut client = connect("user=postgres").await;
417417

418-
client.batch_execute(
419-
"CREATE TEMPORARY TABLE foo (
420-
id INTEGER,\
421-
name TEXT\
422-
)"
423-
).await.unwrap();
418+
client
419+
.batch_execute(
420+
"CREATE TEMPORARY TABLE foo (
421+
id INTEGER,
422+
name TEXT
423+
)",
424+
)
425+
.await
426+
.unwrap();
424427

425428
let stmt = client.prepare("COPY foo FROM STDIN").await.unwrap();
426-
let stream = stream::iter(vec![b"1\tjim\n".to_vec(), b"2\tjoe\n".to_vec()].into_iter().map(Ok::<_, String>));
429+
let stream = stream::iter(
430+
vec![b"1\tjim\n".to_vec(), b"2\tjoe\n".to_vec()]
431+
.into_iter()
432+
.map(Ok::<_, String>),
433+
);
427434
let rows = client.copy_in(&stmt, &[], stream).await.unwrap();
428435
assert_eq!(rows, 2);
429436

430-
let stmt = client.prepare("SELECT id, name FROM foo ORDER BY id").await.unwrap();
431-
let rows = client.query(&stmt, &[]).try_collect::<Vec<_>>().await.unwrap();
437+
let stmt = client
438+
.prepare("SELECT id, name FROM foo ORDER BY id")
439+
.await
440+
.unwrap();
441+
let rows = client
442+
.query(&stmt, &[])
443+
.try_collect::<Vec<_>>()
444+
.await
445+
.unwrap();
432446

433447
assert_eq!(rows.len(), 2);
434448
assert_eq!(rows[0].get::<_, i32>(0), 1);
@@ -441,12 +455,15 @@ async fn copy_in() {
441455
async fn copy_in_large() {
442456
let mut client = connect("user=postgres").await;
443457

444-
client.batch_execute(
445-
"CREATE TEMPORARY TABLE foo (
446-
id INTEGER,\
447-
name TEXT\
448-
)"
449-
).await.unwrap();
458+
client
459+
.batch_execute(
460+
"CREATE TEMPORARY TABLE foo (
461+
id INTEGER,
462+
name TEXT
463+
)",
464+
)
465+
.await
466+
.unwrap();
450467

451468
let stmt = client.prepare("COPY foo FROM STDIN").await.unwrap();
452469

@@ -469,20 +486,30 @@ async fn copy_in_large() {
469486
async fn copy_in_error() {
470487
let mut client = connect("user=postgres").await;
471488

472-
client.batch_execute(
473-
"CREATE TEMPORARY TABLE foo (
474-
id INTEGER,\
475-
name TEXT\
476-
)"
477-
).await.unwrap();
489+
client
490+
.batch_execute(
491+
"CREATE TEMPORARY TABLE foo (
492+
id INTEGER,
493+
name TEXT
494+
)",
495+
)
496+
.await
497+
.unwrap();
478498

479499
let stmt = client.prepare("COPY foo FROM STDIN").await.unwrap();
480500
let stream = stream::iter(vec![Ok(b"1\tjim\n".to_vec()), Err("asdf")]);
481501
let error = client.copy_in(&stmt, &[], stream).await.unwrap_err();
482502
assert!(error.to_string().contains("asdf"));
483503

484-
let stmt = client.prepare("SELECT id, name FROM foo ORDER BY id").await.unwrap();
485-
let rows = client.query(&stmt, &[]).try_collect::<Vec<_>>().await.unwrap();
504+
let stmt = client
505+
.prepare("SELECT id, name FROM foo ORDER BY id")
506+
.await
507+
.unwrap();
508+
let rows = client
509+
.query(&stmt, &[])
510+
.try_collect::<Vec<_>>()
511+
.await
512+
.unwrap();
486513
assert_eq!(rows.len(), 0);
487514
}
488515

0 commit comments

Comments
 (0)