diff options
| author | Luqman Aden <laden@csclub.uwaterloo.ca> | 2013-02-15 02:30:30 -0500 |
|---|---|---|
| committer | Luqman Aden <laden@mozilla.com> | 2013-02-15 02:49:54 -0800 |
| commit | 4cf51c2531bf754d5eaddaf7c5798b983d399751 (patch) | |
| tree | 173c719a03882b7a83a0beb6005cbc2126efce9e /src/libstd/net_ip.rs | |
| parent | 9727008ed0772fc325e0822e74b429e4e7c09af0 (diff) | |
| download | rust-4cf51c2531bf754d5eaddaf7c5798b983d399751.tar.gz rust-4cf51c2531bf754d5eaddaf7c5798b983d399751.zip | |
libstd: Get rid of `move`.
Diffstat (limited to 'src/libstd/net_ip.rs')
| -rw-r--r-- | src/libstd/net_ip.rs | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/libstd/net_ip.rs b/src/libstd/net_ip.rs index 88bacf53e63..4a185f68e17 100644 --- a/src/libstd/net_ip.rs +++ b/src/libstd/net_ip.rs @@ -181,7 +181,7 @@ pub mod v4 { */ pub fn parse_addr(ip: &str) -> IpAddr { match try_parse_addr(ip) { - result::Ok(move addr) => move addr, + result::Ok(addr) => addr, result::Err(ref err_data) => fail!(err_data.err_msg) } } @@ -276,7 +276,7 @@ pub mod v6 { */ pub fn parse_addr(ip: &str) -> IpAddr { match try_parse_addr(ip) { - result::Ok(move addr) => move addr, + result::Ok(addr) => addr, result::Err(copy err_data) => fail!(err_data.err_msg) } } @@ -331,7 +331,7 @@ extern fn get_addr_cb(handle: *uv_getaddrinfo_t, status: libc::c_int, result::Err(GetAddrUnknownError)); break; }; - out_vec.push(move new_ip_addr); + out_vec.push(new_ip_addr); let next_addr = ll::get_next_addrinfo(curr_addr); if next_addr == ptr::null::<addrinfo>() as *addrinfo { @@ -345,7 +345,7 @@ extern fn get_addr_cb(handle: *uv_getaddrinfo_t, status: libc::c_int, } log(debug, fmt!("successful process addrinfo result, len: %?", vec::len(out_vec))); - output_ch.send(result::Ok(move out_vec)); + output_ch.send(result::Ok(out_vec)); } else { log(debug, ~"addrinfo pointer is NULL"); @@ -427,7 +427,7 @@ mod test { } // note really sure how to realiably test/assert // this.. mostly just wanting to see it work, atm. - let results = result::unwrap(move ga_result); + let results = result::unwrap(ga_result); log(debug, fmt!("test_get_addr: Number of results for %s: %?", localhost_name, vec::len(results))); for vec::each(results) |r| { |
