Skip to content

Commit 9e46533

Browse files
committed
Merge pull request rust-postgres#101 from jmesmon/nightly-fixes
Nightly fixes
2 parents ca75540 + 1648b3e commit 9e46533

2 files changed

Lines changed: 6 additions & 6 deletions

File tree

src/lib.rs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ use serialize::hex::ToHex;
6969
use std::borrow::ToOwned;
7070
use std::cell::{Cell, RefCell};
7171
use std::cmp::max;
72-
use std::collections::{RingBuf, HashMap};
72+
use std::collections::{VecDeque, HashMap};
7373
use std::fmt;
7474
use std::old_io::{BufferedStream, IoResult, IoError, IoErrorKind};
7575
use std::old_io::net::ip::Port;
@@ -392,7 +392,7 @@ struct CachedStatement {
392392
struct InnerConnection {
393393
stream: BufferedStream<MaybeSslStream<InternalStream>>,
394394
notice_handler: Box<NoticeHandler>,
395-
notifications: RingBuf<Notification>,
395+
notifications: VecDeque<Notification>,
396396
cancel_data: CancelData,
397397
unknown_types: HashMap<Oid, Type>,
398398
cached_statements: HashMap<String, CachedStatement>,
@@ -426,7 +426,7 @@ impl InnerConnection {
426426
stream: BufferedStream::new(stream),
427427
next_stmt_id: 0,
428428
notice_handler: Box::new(DefaultNoticeHandler),
429-
notifications: RingBuf::new(),
429+
notifications: VecDeque::new(),
430430
cancel_data: CancelData { process_id: 0, secret_key: 0 },
431431
unknown_types: HashMap::new(),
432432
cached_statements: HashMap::new(),
@@ -1374,7 +1374,7 @@ impl<'conn> Statement<'conn> {
13741374

13751375
let mut result = Rows {
13761376
stmt: self,
1377-
data: RingBuf::new(),
1377+
data: VecDeque::new(),
13781378
};
13791379
let more_rows = try!(result.read_rows());
13801380

@@ -1563,7 +1563,7 @@ impl Column {
15631563
/// An iterator over the resulting rows of a query.
15641564
pub struct Rows<'stmt> {
15651565
stmt: &'stmt Statement<'stmt>,
1566-
data: RingBuf<Vec<Option<Vec<u8>>>>,
1566+
data: VecDeque<Vec<Option<Vec<u8>>>>,
15671567
}
15681568

15691569
impl<'a> fmt::Debug for Rows<'a> {

src/url.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -243,7 +243,7 @@ fn get_authority(rawurl: &str) ->
243243
let mut host = "";
244244
let mut port = None;
245245

246-
let mut colon_count = 0us;
246+
let mut colon_count = 0usize;
247247
let mut pos = 0;
248248
let mut begin = 2;
249249
let mut end = len;

0 commit comments

Comments
 (0)