Skip to content

Commit d840236

Browse files
committed
---
yaml --- r: 36222 b: refs/heads/try2 c: d42cf97 h: refs/heads/master v: v3
1 parent 5e7aec4 commit d840236

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ refs/heads/snap-stage3: eb8fd119c65c67f3b1b8268cc7341c22d39b7b61
55
refs/heads/try: d324a424d8f84b1eb049b12cf34182bda91b0024
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
8-
refs/heads/try2: 59a592f4c43a1a7a1814951ecc5f41896cabd05d
8+
refs/heads/try2: d42cf97bcc6110be8a8b2ec02669230b265332dd
99
refs/heads/incoming: d9317a174e434d4c99fc1a37fd7dc0d2f5328d37
1010
refs/heads/dist-snap: 22efa39382d41b084fde1719df7ae8ce5697d8c9
1111
refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596

branches/try2/src/libstd/net_tcp.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -813,12 +813,12 @@ impl TcpSocketBuf: io::Reader {
813813
let mut bytes = ~[0];
814814
if self.read(bytes, 1u) == 0 {
815815
if self.end_of_stream {
816-
-1
816+
-1
817817
} else {
818818
fail
819819
}
820-
} else {
821-
bytes[0] as int
820+
} else {
821+
bytes[0] as int
822822
}
823823
}
824824
fn unread_byte(amt: int) {

0 commit comments

Comments
 (0)