---

yaml
---
r: 151588
b: refs/heads/try2
c: 611c2ae
h: refs/heads/master
v: v3

Author: thomaslee

[refs]

@@ -5,7 +5,7 @@ refs/heads/snap-stage3: 78a7676898d9f80ab540c6df5d4c9ce35bb50463
 refs/heads/try: 519addf6277dbafccbb4159db4b710c37eaa2ec5
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
-refs/heads/try2: a57889a58012a53146de7ba54e234a025a9b30c4
+refs/heads/try2: 611c2ae4f1411a36e3010a3a4f9145115a3a0e88
 refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/try2/src/libstd/io/net/tcp.rs

@@ -63,7 +63,10 @@ impl TcpStream {
     /// `host` can be a hostname or IP address string. If no error is
     /// encountered, then `Ok(stream)` is returned.
     pub fn connect(host: &str, port: u16) -> IoResult<TcpStream> {
-        let addresses = try!(get_host_addresses(host));
+        let addresses = match FromStr::from_str(host) {
+            Some(addr) => vec!(addr),
+            None => try!(get_host_addresses(host))
+        };
         let mut err = IoError{
             kind: ConnectionFailed,
             desc: "no addresses found for hostname",

branches/try2/src/test/run-pass/tcp-stress.rs

@@ -37,11 +37,9 @@ fn main() {
         unsafe { libc::exit(1) }
     });
 
-    let host = "127.0.0.1";
-    let port = 0;
     let (tx, rx) = channel();
     spawn(proc() {
-        let mut listener = TcpListener::bind(host, port).unwrap();
+        let mut listener = TcpListener::bind("127.0.0.1", 0).unwrap();
         tx.send(listener.socket_name().unwrap());
         let mut acceptor = listener.listen();
         loop {
@@ -57,15 +55,15 @@ fn main() {
         }
     });
     let addr = rx.recv();
-    let host = addr.ip.to_str();
-    let port = addr.port;
 
     let (tx, rx) = channel();
     for _ in range(0, 1000) {
         let tx = tx.clone();
         let mut builder = TaskBuilder::new();
         builder.opts.stack_size = Some(32 * 1024);
         builder.spawn(proc() {
+            let host = addr.ip.to_str();
+            let port = addr.port;
             match TcpStream::connect(host, port) {
                 Ok(stream) => {
                     let mut stream = stream;