diff options
| author | Daniel Micay <danielmicay@gmail.com> | 2013-07-31 17:59:59 -0400 |
|---|---|---|
| committer | Daniel Micay <danielmicay@gmail.com> | 2013-08-01 00:21:13 -0400 |
| commit | dabd4762037baab06603fe76dd59795e4d415334 (patch) | |
| tree | d06d60ad7b3088ba03377f022c11fa779a78a7dc /src/libstd/rt | |
| parent | c47be6929bafa6c585949907627cd1ea3280fd50 (diff) | |
| download | rust-dabd4762037baab06603fe76dd59795e4d415334.tar.gz rust-dabd4762037baab06603fe76dd59795e4d415334.zip | |
make `in` and `foreach` get treated as keywords
Diffstat (limited to 'src/libstd/rt')
| -rw-r--r-- | src/libstd/rt/io/extensions.rs | 10 | ||||
| -rw-r--r-- | src/libstd/rt/io/net/tcp.rs | 8 | ||||
| -rw-r--r-- | src/libstd/rt/io/net/udp.rs | 2 | ||||
| -rw-r--r-- | src/libstd/rt/io/option.rs | 8 |
4 files changed, 14 insertions, 14 deletions
diff --git a/src/libstd/rt/io/extensions.rs b/src/libstd/rt/io/extensions.rs index c6654e9dabe..2d21bf0f9dc 100644 --- a/src/libstd/rt/io/extensions.rs +++ b/src/libstd/rt/io/extensions.rs @@ -330,7 +330,7 @@ impl<T: Reader> ReaderUtil for T { } else { read_error::cond.raise(e) } - }).in { + }).inside { while keep_reading { self.push_bytes(&mut buf, DEFAULT_BUF_SIZE) } @@ -640,7 +640,7 @@ mod test { None }; do read_error::cond.trap(|_| { - }).in { + }).inside { let byte = reader.read_byte(); assert!(byte == None); } @@ -679,7 +679,7 @@ mod test { fn read_bytes_eof() { let mut reader = MemReader::new(~[10, 11]); do read_error::cond.trap(|_| { - }).in { + }).inside { assert!(reader.read_bytes(4) == ~[10, 11]); } } @@ -720,7 +720,7 @@ mod test { let mut reader = MemReader::new(~[10, 11]); let mut buf = ~[8, 9]; do read_error::cond.trap(|_| { - }).in { + }).inside { reader.push_bytes(&mut buf, 4); assert!(buf == ~[8, 9, 10, 11]); } @@ -743,7 +743,7 @@ mod test { } }; let mut buf = ~[8, 9]; - do read_error::cond.trap(|_| { } ).in { + do read_error::cond.trap(|_| { } ).inside { reader.push_bytes(&mut buf, 4); } assert!(buf == ~[8, 9, 10]); diff --git a/src/libstd/rt/io/net/tcp.rs b/src/libstd/rt/io/net/tcp.rs index c997373bf9d..82278875fa5 100644 --- a/src/libstd/rt/io/net/tcp.rs +++ b/src/libstd/rt/io/net/tcp.rs @@ -156,7 +156,7 @@ mod test { do io_error::cond.trap(|e| { assert!(e.kind == PermissionDenied); called = true; - }).in { + }).inside { let addr = Ipv4(0, 0, 0, 0, 1); let listener = TcpListener::bind(addr); assert!(listener.is_none()); @@ -172,7 +172,7 @@ mod test { do io_error::cond.trap(|e| { assert!(e.kind == ConnectionRefused); called = true; - }).in { + }).inside { let addr = Ipv4(0, 0, 0, 0, 1); let stream = TcpStream::connect(addr); assert!(stream.is_none()); @@ -320,7 +320,7 @@ mod test { // NB: ECONNRESET on linux, EPIPE on mac assert!(e.kind == ConnectionReset || e.kind == BrokenPipe); stop = true; - }).in { + }).inside { stream.write(buf); } if stop { break } @@ -349,7 +349,7 @@ mod test { // NB: ECONNRESET on linux, EPIPE on mac assert!(e.kind == ConnectionReset || e.kind == BrokenPipe); stop = true; - }).in { + }).inside { stream.write(buf); } if stop { break } diff --git a/src/libstd/rt/io/net/udp.rs b/src/libstd/rt/io/net/udp.rs index 8e654de47f0..d186ad15f4a 100644 --- a/src/libstd/rt/io/net/udp.rs +++ b/src/libstd/rt/io/net/udp.rs @@ -117,7 +117,7 @@ mod test { do io_error::cond.trap(|e| { assert!(e.kind == PermissionDenied); called = true; - }).in { + }).inside { let addr = Ipv4(0, 0, 0, 0, 1); let socket = UdpSocket::bind(addr); assert!(socket.is_none()); diff --git a/src/libstd/rt/io/option.rs b/src/libstd/rt/io/option.rs index d71ef55d3ad..7dadc653e6c 100644 --- a/src/libstd/rt/io/option.rs +++ b/src/libstd/rt/io/option.rs @@ -100,7 +100,7 @@ mod test { do io_error::cond.trap(|err| { assert_eq!(err.kind, PreviousIoError); called = true; - }).in { + }).inside { writer.write([0, 0, 0]); } assert!(called); @@ -109,7 +109,7 @@ mod test { do io_error::cond.trap(|err| { assert_eq!(err.kind, PreviousIoError); called = true; - }).in { + }).inside { writer.flush(); } assert!(called); @@ -136,7 +136,7 @@ mod test { do read_error::cond.trap(|err| { assert_eq!(err.kind, PreviousIoError); called = true; - }).in { + }).inside { reader.read(buf); } assert!(called); @@ -145,7 +145,7 @@ mod test { do io_error::cond.trap(|err| { assert_eq!(err.kind, PreviousIoError); called = true; - }).in { + }).inside { assert!(reader.eof()); } assert!(called); |
