dnim/rust-postgres
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix clippy

Browse Source
This commit is contained in:
Steven Fackler 2019-01-29 19:40:49 -08:00
parent df84dd8fd0
commit e57a2976e9
3 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
postgres/src/query.rs
View File

@ -23,7 +23,7 @@ impl<'a> Query<'a> {
}
/// A convenience API which collects the resulting rows into a `Vec` and returns them.
pub fn to_vec(self) -> Result<Vec<Row>, Error> {
pub fn into_vec(self) -> Result<Vec<Row>, Error> {
self.collect()
}
}

2
postgres/src/query_portal.rs
View File

@ -23,7 +23,7 @@ impl<'a> QueryPortal<'a> {
}
/// A convenience API which collects the resulting rows into a `Vec` and returns them.
pub fn to_vec(self) -> Result<Vec<Row>, Error> {
pub fn into_vec(self) -> Result<Vec<Row>, Error> {
self.collect()
}
}

24
postgres/src/test.rs
View File

@ -20,7 +20,11 @@ fn query_prepared() {
let mut client = Client::connect("host=localhost port=5433 user=postgres", NoTls).unwrap();
let stmt = client.prepare("SELECT $1::TEXT").unwrap();
let rows = client.query(&stmt, &[&"hello"]).unwrap().to_vec().unwrap();
let rows = client
.query(&stmt, &[&"hello"])
.unwrap()
.into_vec()
.unwrap();
assert_eq!(rows.len(), 1);
assert_eq!(rows[0].get::<_, &str>(0), "hello");
}
@ -32,7 +36,7 @@ fn query_unprepared() {
let rows = client
.query("SELECT $1::TEXT", &[&"hello"])
.unwrap()
.to_vec()
.into_vec()
.unwrap();
assert_eq!(rows.len(), 1);
assert_eq!(rows[0].get::<_, &str>(0), "hello");
@ -57,7 +61,7 @@ fn transaction_commit() {
let rows = client
.query("SELECT * FROM foo", &[])
.unwrap()
.to_vec()
.into_vec()
.unwrap();
assert_eq!(rows.len(), 1);
assert_eq!(rows[0].get::<_, i32>(0), 1);
@ -82,7 +86,7 @@ fn transaction_rollback() {
let rows = client
.query("SELECT * FROM foo", &[])
.unwrap()
.to_vec()
.into_vec()
.unwrap();
assert_eq!(rows.len(), 0);
}
@ -106,7 +110,7 @@ fn transaction_drop() {
let rows = client
.query("SELECT * FROM foo", &[])
.unwrap()
.to_vec()
.into_vec()
.unwrap();
assert_eq!(rows.len(), 0);
}
@ -136,7 +140,7 @@ fn nested_transactions() {
let rows = transaction
.query("SELECT id FROM foo ORDER BY id", &[])
.unwrap()
.to_vec()
.into_vec()
.unwrap();
assert_eq!(rows.len(), 1);
assert_eq!(rows[0].get::<_, i32>(0), 1);
@ -160,7 +164,7 @@ fn nested_transactions() {
let rows = client
.query("SELECT id FROM foo ORDER BY id", &[])
.unwrap()
.to_vec()
.into_vec()
.unwrap();
assert_eq!(rows.len(), 3);
assert_eq!(rows[0].get::<_, i32>(0), 1);
@ -187,7 +191,7 @@ fn copy_in() {
let rows = client
.query("SELECT id, name FROM foo ORDER BY id", &[])
.unwrap()
.to_vec()
.into_vec()
.unwrap();
assert_eq!(rows.len(), 2);
@ -246,7 +250,7 @@ fn portal() {
let rows = transaction
.query_portal(&portal, 2)
.unwrap()
.to_vec()
.into_vec()
.unwrap();
assert_eq!(rows.len(), 2);
assert_eq!(rows[0].get::<_, i32>(0), 1);
@ -255,7 +259,7 @@ fn portal() {
let rows = transaction
.query_portal(&portal, 2)
.unwrap()
.to_vec()
.into_vec()
.unwrap();
assert_eq!(rows.len(), 1);
assert_eq!(rows[0].get::<_, i32>(0), 3);