bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

rollup merge of #22497: nikomatsakis/suffixes

Browse source 
Conflicts:
	src/librustc_trans/trans/tvec.rs
This commit is contained in:
Alex Crichton 2015-02-18 14:35:01 -08:00
commit 5250a82f79
351 changed files with 1025 additions and 1028 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/libstd/old_io/net/pipe.rs
View file

@ -390,7 +390,7 @@ mod tests {
};
let _t = thread::spawn(move|| {
for _ in 0u..times {
for _ in 0..times {
let mut stream = UnixStream::connect(&path2);
match stream.write(&[100]) {
Ok(..) => {}
@ -555,7 +555,7 @@ mod tests {
tx.send(UnixStream::connect(&addr2).unwrap()).unwrap();
});
let l = rx.recv().unwrap();
for i in 0u..1001 {
for i in 0..1001 {
match a.accept() {
Ok(..) => break,
Err(ref e) if e.kind == TimedOut => {}
@ -683,7 +683,7 @@ mod tests {
assert_eq!(s.read(&mut [0]).err().unwrap().kind, TimedOut);
s.set_timeout(Some(20));
for i in 0u..1001 {
for i in 0..1001 {
match s.write(&[0; 128 * 1024]) {
Ok(()) | Err(IoError { kind: ShortWrite(..), .. }) => {},
Err(IoError { kind: TimedOut, .. }) => break,
@ -727,7 +727,7 @@ mod tests {
assert_eq!(s.read(&mut [0]).err().unwrap().kind, TimedOut);
tx.send(()).unwrap();
for _ in 0u..100 {
for _ in 0..100 {
assert!(s.write(&[0;128 * 1024]).is_ok());
}
}
@ -746,7 +746,7 @@ mod tests {
let mut s = a.accept().unwrap();
s.set_write_timeout(Some(20));
for i in 0u..1001 {
for i in 0..1001 {
match s.write(&[0; 128 * 1024]) {
Ok(()) | Err(IoError { kind: ShortWrite(..), .. }) => {},
Err(IoError { kind: TimedOut, .. }) => break,