auto merge of #12756 : pongad/rust/remove_owned_str_pat, r=alexcrichton

match-drop-strs-issue-4541.rs deleted as it's the same with issue-4541.rs

2 files changed, 4 insertions, 4 deletions

diff --git a/src/libstd/local_data.rs b/src/libstd/local_data.rs
index 6b854daabda..9fc635647f3 100644
--- a/src/libstd/local_data.rs
+++ b/src/libstd/local_data.rs
@@ -398,8 +398,8 @@ mod tests {
             }
         });
         modify(my_key, |data| {
-            match data {
-                Some(~"first data") => Some(~"next data"),
+            match data.as_ref().map(|s| s.as_slice()) {
+                Some("first data") => Some(~"next data"),
                 Some(ref val)       => fail!("wrong value: {}", *val),
                 None                 => fail!("missing value")
             }
diff --git a/src/libstd/task.rs b/src/libstd/task.rs
index 1de5322b157..16ac46186df 100644
--- a/src/libstd/task.rs
+++ b/src/libstd/task.rs
@@ -387,8 +387,8 @@ fn test_back_to_the_future_result() {
 fn test_try_success() {
     match try(proc() {
         ~"Success!"
-    }) {
-        result::Ok(~"Success!") => (),
+    }).as_ref().map(|s| s.as_slice()) {
+        result::Ok("Success!") => (),
         _ => fail!()
     }
 }