Skip to content

Commit 9ce2b77

Browse files
committed
Fix deprecation warnings
1 parent 9e46533 commit 9ce2b77

2 files changed

Lines changed: 12 additions & 12 deletions

File tree

tests/test.rs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -88,11 +88,11 @@ fn test_unix_connection() {
8888
panic!("can't test connect_unix; unix_socket_directories is empty");
8989
}
9090

91-
let unix_socket_directory = unix_socket_directories[].split(',').next().unwrap();
91+
let unix_socket_directory = unix_socket_directories.split(',').next().unwrap();
9292

9393
let path = url::utf8_percent_encode(unix_socket_directory, url::USERNAME_ENCODE_SET);
9494
let url = format!("postgres://postgres@{}", path);
95-
let conn = or_panic!(Connection::connect(&url[], &SslMode::None));
95+
let conn = or_panic!(Connection::connect(&url[..], &SslMode::None));
9696
assert!(conn.finish().is_ok());
9797
}
9898

@@ -879,15 +879,15 @@ fn test_prepare_cached() {
879879
or_panic!(conn.execute("INSERT INTO foo (id) VALUES (1), (2)", &[]));
880880

881881
let stmt = or_panic!(conn.prepare_cached("SELECT id FROM foo ORDER BY id"));
882-
assert_eq!(&[1, 2][], or_panic!(stmt.query(&[])).map(|r| r.get(0)).collect::<Vec<i32>>());
882+
assert_eq!(&[1, 2][..], or_panic!(stmt.query(&[])).map(|r| r.get(0)).collect::<Vec<i32>>());
883883
or_panic!(stmt.finish());
884884

885885
let stmt = or_panic!(conn.prepare_cached("SELECT id FROM foo ORDER BY id"));
886-
assert_eq!(&[1, 2][], or_panic!(stmt.query(&[])).map(|r| r.get(0)).collect::<Vec<i32>>());
886+
assert_eq!(&[1, 2][..], or_panic!(stmt.query(&[])).map(|r| r.get(0)).collect::<Vec<i32>>());
887887
or_panic!(stmt.finish());
888888

889889
let stmt = or_panic!(conn.prepare_cached("SELECT id FROM foo ORDER BY id DESC"));
890-
assert_eq!(&[2, 1][], or_panic!(stmt.query(&[])).map(|r| r.get(0)).collect::<Vec<i32>>());
890+
assert_eq!(&[2, 1][..], or_panic!(stmt.query(&[])).map(|r| r.get(0)).collect::<Vec<i32>>());
891891
or_panic!(stmt.finish());
892892
}
893893

tests/types/mod.rs

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,11 @@ fn test_type<T: PartialEq+FromSql+ToSql, S: fmt::Display>(sql_type: &str, checks
1717
let conn = or_panic!(Connection::connect("postgres://postgres@localhost", &SslMode::None));
1818
for &(ref val, ref repr) in checks.iter() {
1919
let stmt = or_panic!(conn.prepare(&*format!("SELECT {}::{}", *repr, sql_type)));
20-
let result = or_panic!(stmt.query(&[])).next().unwrap().get(0us);
20+
let result = or_panic!(stmt.query(&[])).next().unwrap().get(0);
2121
assert!(val == &result);
2222

2323
let stmt = or_panic!(conn.prepare(&*format!("SELECT $1::{}", sql_type)));
24-
let result = or_panic!(stmt.query(&[val])).next().unwrap().get(0us);
24+
let result = or_panic!(stmt.query(&[val])).next().unwrap().get(0);
2525
assert!(val == &result);
2626
}
2727
}
@@ -111,7 +111,7 @@ fn test_bpchar_params() {
111111
let res = or_panic!(stmt.query(&[]));
112112

113113
assert_eq!(vec!(Some("12345".to_string()), Some("123 ".to_string()), None),
114-
res.map(|row| row.get(0us)).collect::<Vec<_>>());
114+
res.map(|row| row.get(0)).collect::<Vec<_>>());
115115
}
116116

117117
#[test]
@@ -126,7 +126,7 @@ fn test_citext_params() {
126126
let stmt = or_panic!(conn.prepare("SELECT id FROM foo WHERE b = 'FOOBAR' ORDER BY id"));
127127
let res = or_panic!(stmt.query(&[]));
128128

129-
assert_eq!(vec!(Some(1i32), Some(2i32)), res.map(|row| row.get(0us)).collect::<Vec<_>>());
129+
assert_eq!(vec!(Some(1i32), Some(2i32)), res.map(|row| row.get(0)).collect::<Vec<_>>());
130130
}
131131

132132
#[test]
@@ -193,13 +193,13 @@ fn test_nan_param<T: Float+ToSql+FromSql>(sql_type: &str) {
193193
let conn = or_panic!(Connection::connect("postgres://postgres@localhost", &SslMode::None));
194194
let stmt = or_panic!(conn.prepare(&*format!("SELECT 'NaN'::{}", sql_type)));
195195
let mut result = or_panic!(stmt.query(&[]));
196-
let val: T = result.next().unwrap().get(0us);
196+
let val: T = result.next().unwrap().get(0);
197197
assert!(val.is_nan());
198198

199199
let nan: T = Float::nan();
200200
let stmt = or_panic!(conn.prepare(&*format!("SELECT $1::{}", sql_type)));
201201
let mut result = or_panic!(stmt.query(&[&nan]));
202-
let val: T = result.next().unwrap().get(0us);
202+
let val: T = result.next().unwrap().get(0);
203203
assert!(val.is_nan())
204204
}
205205

@@ -232,7 +232,7 @@ fn test_slice() {
232232

233233
let stmt = conn.prepare("SELECT f FROM foo WHERE id = ANY($1)").unwrap();
234234
let result = stmt.query(&[&Slice(&[1i32, 3, 4])]).unwrap();
235-
assert_eq!(&["a".to_string(), "c".to_string(), "d".to_string()][],
235+
assert_eq!(&["a".to_string(), "c".to_string(), "d".to_string()][..],
236236
result.map(|r| r.get::<_, String>(0)).collect::<Vec<_>>());
237237
}
238238

0 commit comments

Comments
 (0)