Skip to content

Commit 886f24e

Browse files
committed
Get rid of literal type specifiers
Yay trait reform!
1 parent 4751787 commit 886f24e

3 files changed

Lines changed: 23 additions & 23 deletions

File tree

README.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -49,10 +49,10 @@ fn main() {
4949
.unwrap();
5050
for row in stmt.query([]).unwrap() {
5151
let person = Person {
52-
id: row.get(0u),
53-
name: row.get(1u),
54-
time_created: row.get(2u),
55-
data: row.get(3u)
52+
id: row.get(0),
53+
name: row.get(1),
54+
time_created: row.get(2),
55+
data: row.get(3)
5656
};
5757
println!("Found person {}", person.name);
5858
}

src/lib.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -41,10 +41,10 @@
4141
//! .unwrap();
4242
//! for row in stmt.query([]).unwrap() {
4343
//! let person = Person {
44-
//! id: row.get(0u),
45-
//! name: row.get(1u),
46-
//! time_created: row.get(2u),
47-
//! data: row.get(3u)
44+
//! id: row.get(0),
45+
//! name: row.get(1),
46+
//! time_created: row.get(2),
47+
//! data: row.get(3)
4848
//! };
4949
//! println!("Found person {}", person.name);
5050
//! }

tests/test.rs

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ fn test_unix_connection() {
9090
let conn = or_fail!(PostgresConnection::connect("postgres://postgres@localhost", &NoSsl));
9191
let stmt = or_fail!(conn.prepare("SHOW unix_socket_directories"));
9292
let result = or_fail!(stmt.query([]));
93-
let unix_socket_directories: String = result.map(|row| row.get(0u)).next().unwrap();
93+
let unix_socket_directories: String = result.map(|row| row.get(0)).next().unwrap();
9494

9595
if unix_socket_directories.is_empty() {
9696
fail!("can't test connect_unix; unix_socket_directories is empty");
@@ -116,7 +116,7 @@ fn test_transaction_commit() {
116116
let stmt = or_fail!(conn.prepare("SELECT * FROM foo"));
117117
let result = or_fail!(stmt.query([]));
118118

119-
assert_eq!(vec![1i32], result.map(|row| row.get(0u)).collect());
119+
assert_eq!(vec![1i32], result.map(|row| row.get(0)).collect());
120120
}
121121

122122
#[test]
@@ -132,7 +132,7 @@ fn test_transaction_commit_finish() {
132132
let stmt = or_fail!(conn.prepare("SELECT * FROM foo"));
133133
let result = or_fail!(stmt.query([]));
134134

135-
assert_eq!(vec![1i32], result.map(|row| row.get(0u)).collect());
135+
assert_eq!(vec![1i32], result.map(|row| row.get(0)).collect());
136136
}
137137

138138
#[test]
@@ -147,7 +147,7 @@ fn test_transaction_commit_method() {
147147
let stmt = or_fail!(conn.prepare("SELECT * FROM foo"));
148148
let result = or_fail!(stmt.query([]));
149149

150-
assert_eq!(vec![1i32], result.map(|row| row.get(0u)).collect());
150+
assert_eq!(vec![1i32], result.map(|row| row.get(0)).collect());
151151
}
152152

153153
#[test]
@@ -164,7 +164,7 @@ fn test_transaction_rollback() {
164164
let stmt = or_fail!(conn.prepare("SELECT * FROM foo"));
165165
let result = or_fail!(stmt.query([]));
166166

167-
assert_eq!(vec![1i32], result.map(|row| row.get(0u)).collect());
167+
assert_eq!(vec![1i32], result.map(|row| row.get(0)).collect());
168168
}
169169

170170
#[test]
@@ -181,7 +181,7 @@ fn test_transaction_rollback_finish() {
181181
let stmt = or_fail!(conn.prepare("SELECT * FROM foo"));
182182
let result = or_fail!(stmt.query([]));
183183

184-
assert_eq!(vec![1i32], result.map(|row| row.get(0u)).collect());
184+
assert_eq!(vec![1i32], result.map(|row| row.get(0)).collect());
185185
}
186186

187187
#[test]
@@ -221,13 +221,13 @@ fn test_nested_transactions() {
221221
let stmt = or_fail!(trans1.prepare("SELECT * FROM foo ORDER BY id"));
222222
let result = or_fail!(stmt.query([]));
223223

224-
assert_eq!(vec![1i32, 2, 4, 6], result.map(|row| row.get(0u)).collect());
224+
assert_eq!(vec![1i32, 2, 4, 6], result.map(|row| row.get(0)).collect());
225225
}
226226

227227
let stmt = or_fail!(conn.prepare("SELECT * FROM foo ORDER BY id"));
228228
let result = or_fail!(stmt.query([]));
229229

230-
assert_eq!(vec![1i32], result.map(|row| row.get(0u)).collect());
230+
assert_eq!(vec![1i32], result.map(|row| row.get(0)).collect());
231231
}
232232

233233
#[test]
@@ -273,7 +273,7 @@ fn test_nested_transactions_finish() {
273273
let stmt = or_fail!(trans1.prepare("SELECT * FROM foo ORDER BY id"));
274274
let result = or_fail!(stmt.query([]));
275275

276-
assert_eq!(vec![1i32, 2, 4, 6], result.map(|row| row.get(0u)).collect());
276+
assert_eq!(vec![1i32, 2, 4, 6], result.map(|row| row.get(0)).collect());
277277
}
278278

279279
assert!(trans1.finish().is_ok());
@@ -282,7 +282,7 @@ fn test_nested_transactions_finish() {
282282
let stmt = or_fail!(conn.prepare("SELECT * FROM foo ORDER BY id"));
283283
let result = or_fail!(stmt.query([]));
284284

285-
assert_eq!(vec![1i32], result.map(|row| row.get(0u)).collect());
285+
assert_eq!(vec![1i32], result.map(|row| row.get(0)).collect());
286286
}
287287

288288
#[test]
@@ -336,7 +336,7 @@ fn test_batch_execute() {
336336
let stmt = or_fail!(conn.prepare("SELECT * from foo ORDER BY id"));
337337
let result = or_fail!(stmt.query([]));
338338

339-
assert_eq!(vec![10i64], result.map(|row| row.get(0u)).collect());
339+
assert_eq!(vec![10i64], result.map(|row| row.get(0)).collect());
340340
}
341341

342342
#[test]
@@ -366,7 +366,7 @@ fn test_transaction_batch_execute() {
366366
let stmt = or_fail!(trans.prepare("SELECT * from foo ORDER BY id"));
367367
let result = or_fail!(stmt.query([]));
368368

369-
assert_eq!(vec![10i64], result.map(|row| row.get(0u)).collect());
369+
assert_eq!(vec![10i64], result.map(|row| row.get(0)).collect());
370370
}
371371

372372
#[test]
@@ -378,7 +378,7 @@ fn test_query() {
378378
let stmt = or_fail!(conn.prepare("SELECT * from foo ORDER BY id"));
379379
let result = or_fail!(stmt.query([]));
380380

381-
assert_eq!(vec![1i64, 2], result.map(|row| row.get(0u)).collect());
381+
assert_eq!(vec![1i64, 2], result.map(|row| row.get(0)).collect());
382382
}
383383

384384
#[test]
@@ -420,7 +420,7 @@ fn test_lazy_query() {
420420
}
421421
let stmt = or_fail!(trans.prepare("SELECT id FROM foo ORDER BY id"));
422422
let result = or_fail!(trans.lazy_query(&stmt, [], 2));
423-
assert_eq!(values, result.map(|row| row.unwrap().get(0u)).collect());
423+
assert_eq!(values, result.map(|row| row.unwrap().get(0)).collect());
424424
}
425425

426426
#[test]
@@ -722,7 +722,7 @@ fn test_copy_in() {
722722

723723
let stmt = or_fail!(conn.prepare("SELECT id, name FROM foo ORDER BY id"));
724724
assert_eq!(vec![(0i32, Some("Steven".to_string())), (1, None)],
725-
or_fail!(stmt.query([])).map(|r| (r.get(0u), r.get(1u))).collect());
725+
or_fail!(stmt.query([])).map(|r| (r.get(0), r.get(1))).collect());
726726
}
727727

728728
#[test]

0 commit comments

Comments
 (0)