Skip to content

Commit 7bcb8fb

Browse files
committed
Fix most warnings
Blocked on rust-lang/rust#23734 on the last
1 parent 44d4733 commit 7bcb8fb

File tree

3 files changed

+20
-21
lines changed

3 files changed

+20
-21
lines changed

src/error.rs

+5-5
Original file line numberDiff line numberDiff line change
@@ -65,9 +65,9 @@ impl error::Error for ConnectError {
6565

6666
fn cause(&self) -> Option<&error::Error> {
6767
match *self {
68-
ConnectError::DbError(ref err) => Some(err as &error::Error),
69-
ConnectError::SslError(ref err) => Some(err as &error::Error),
70-
ConnectError::IoError(ref err) => Some(err as &error::Error),
68+
ConnectError::DbError(ref err) => Some(err),
69+
ConnectError::SslError(ref err) => Some(err),
70+
ConnectError::IoError(ref err) => Some(err),
7171
_ => None
7272
}
7373
}
@@ -159,8 +159,8 @@ impl error::Error for Error {
159159

160160
fn cause(&self) -> Option<&error::Error> {
161161
match *self {
162-
Error::DbError(ref err) => Some(err as &error::Error),
163-
Error::IoError(ref err) => Some(err as &error::Error),
162+
Error::DbError(ref err) => Some(err),
163+
Error::IoError(ref err) => Some(err),
164164
_ => None
165165
}
166166
}

src/url.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ fn decode_inner(c: &str, full_url: bool) -> DecodeResult<String> {
120120
Some(b) => match b as char {
121121
'%' => {
122122
let bytes = match (iter.next(), iter.next()) {
123-
(Some(one), Some(two)) => [one as u8, two as u8],
123+
(Some(one), Some(two)) => [one, two],
124124
_ => return Err(format!("Malformed input: found '%' \
125125
without two trailing bytes")),
126126
};

tests/test.rs

+14-15
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ use postgres::{HandleNotice,
1717
SslMode,
1818
Type,
1919
Kind,
20-
ToSql,
2120
Error,
2221
ConnectError,
2322
DbError,
@@ -761,8 +760,8 @@ fn test_copy_in() {
761760
let stmt = or_panic!(conn.prepare_copy_in("foo", &["id", "name"]));
762761

763762
let data = (0i32..2).map(|i| {
764-
VecStreamIterator::new(vec![Box::new(i) as Box<ToSql>,
765-
Box::new(format!("{}", i)) as Box<ToSql>])
763+
VecStreamIterator::new(vec![Box::new(i),
764+
Box::new(format!("{}", i))])
766765
});
767766

768767
assert_eq!(Ok(2), stmt.execute(data));
@@ -779,9 +778,9 @@ fn test_copy_in_bad_column_count() {
779778

780779
let stmt = or_panic!(conn.prepare_copy_in("foo", &["id", "name"]));
781780
let data = vec![
782-
VecStreamIterator::new(vec![Box::new(1i32) as Box<ToSql>,
783-
Box::new("Steven".to_string()) as Box<ToSql>]),
784-
VecStreamIterator::new(vec![Box::new(2i32) as Box<ToSql>]),
781+
VecStreamIterator::new(vec![Box::new(1i32),
782+
Box::new("Steven".to_string())]),
783+
VecStreamIterator::new(vec![Box::new(2i32)]),
785784
].into_iter();
786785

787786
let res = stmt.execute(data);
@@ -792,11 +791,11 @@ fn test_copy_in_bad_column_count() {
792791
}
793792

794793
let data = vec![
795-
VecStreamIterator::new(vec![Box::new(1i32) as Box<ToSql>,
796-
Box::new("Steven".to_string()) as Box<ToSql>]),
797-
VecStreamIterator::new(vec![Box::new(2i32) as Box<ToSql>,
798-
Box::new("Steven".to_string()) as Box<ToSql>,
799-
Box::new(3i64) as Box<ToSql>]),
794+
VecStreamIterator::new(vec![Box::new(1i32),
795+
Box::new("Steven".to_string())]),
796+
VecStreamIterator::new(vec![Box::new(2i32),
797+
Box::new("Steven".to_string()),
798+
Box::new(3i64)]),
800799
].into_iter();
801800

802801
let res = stmt.execute(data);
@@ -817,10 +816,10 @@ fn test_copy_in_bad_type() {
817816
let stmt = or_panic!(conn.prepare_copy_in("foo", &["id", "name"]));
818817

819818
let data = vec![
820-
VecStreamIterator::new(vec![Box::new(1i32) as Box<ToSql>,
821-
Box::new("Steven".to_string()) as Box<ToSql>]),
822-
VecStreamIterator::new(vec![Box::new(2i32) as Box<ToSql>,
823-
Box::new(1i32) as Box<ToSql>]),
819+
VecStreamIterator::new(vec![Box::new(1i32),
820+
Box::new("Steven".to_string())]),
821+
VecStreamIterator::new(vec![Box::new(2i32),
822+
Box::new(1i32)]),
824823
].into_iter();
825824

826825
let res = stmt.execute(data);

0 commit comments

Comments
 (0)