about summary refs log tree commit diff
path: root/src/libstd/net_ip.rs
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2013-05-09 11:18:43 -0700
committerbors <bors@rust-lang.org>2013-05-09 11:18:43 -0700
commitce9c0225c451c00c3eebe4e496185143a18814b9 (patch)
treec7e9b5e57ad703323939c5f95947bb31cfa26e38 /src/libstd/net_ip.rs
parent7a4c6e587d631c0316d51c9b4a50d406f38221cd (diff)
parent2bc12635a24abf710304c06a91dbf3709cba8fd4 (diff)
downloadrust-ce9c0225c451c00c3eebe4e496185143a18814b9.tar.gz
rust-ce9c0225c451c00c3eebe4e496185143a18814b9.zip
auto merge of #6349 : thestinger/rust/explicit_copy, r=thestinger
I removed some of the copies, but most are just made explicit. The usage in `libcore` was already fixed, but the attribute was only set to warn (not removed).
Diffstat (limited to 'src/libstd/net_ip.rs')
-rw-r--r--src/libstd/net_ip.rs4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/libstd/net_ip.rs b/src/libstd/net_ip.rs
index 9a0eb6d85db..758e7a5e6ca 100644
--- a/src/libstd/net_ip.rs
+++ b/src/libstd/net_ip.rs
@@ -175,7 +175,7 @@ pub mod v4 {
     pub fn parse_addr(ip: &str) -> IpAddr {
         match try_parse_addr(ip) {
           result::Ok(addr) => addr,
-          result::Err(ref err_data) => fail!(err_data.err_msg)
+          result::Err(ref err_data) => fail!(copy err_data.err_msg)
         }
     }
     // the simple, old style numberic representation of
@@ -272,7 +272,7 @@ pub mod v6 {
     pub fn parse_addr(ip: &str) -> IpAddr {
         match try_parse_addr(ip) {
           result::Ok(addr) => addr,
-          result::Err(copy err_data) => fail!(err_data.err_msg)
+          result::Err(copy err_data) => fail!(copy err_data.err_msg)
         }
     }
     pub fn try_parse_addr(ip: &str) -> result::Result<IpAddr,ParseAddrErr> {