---

yaml
---
r: 36655
b: refs/heads/try2
c: 01c0971
h: refs/heads/master
i:
  36653: dc92818
  36651: ca1d3a2
  36647: deff816
  36639: 6f6f6e7
v: v3

Author: catamorphism

[refs]

@@ -5,7 +5,7 @@ refs/heads/snap-stage3: eb8fd119c65c67f3b1b8268cc7341c22d39b7b61
 refs/heads/try: d324a424d8f84b1eb049b12cf34182bda91b0024
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
-refs/heads/try2: f675b97ddc3d85498473bb4da7f95b8942ebbd81
+refs/heads/try2: 01c0971172578ac170b3ae07c35ae416644ca1ef
 refs/heads/incoming: d9317a174e434d4c99fc1a37fd7dc0d2f5328d37
 refs/heads/dist-snap: 22efa39382d41b084fde1719df7ae8ce5697d8c9
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596

branches/try2/src/librustc/middle/trans/alt.rs

@@ -951,8 +951,18 @@ fn compare_values(cx: block, lhs: ValueRef, rhs: ValueRef, rhs_t: ty::t) ->
                                                          scratch_result.val));
             return scratch_result.to_result(bcx);
         }
+        ty::ty_estr(_) => {
+            let scratch_result = scratch_datum(cx, ty::mk_bool(cx.tcx()),
+                                               false);
+            let did = cx.tcx().lang_items.str_eq_fn.get();
+            let bcx = callee::trans_rtcall_or_lang_call(cx, did,
+                                                        ~[lhs, rhs],
+                                                        expr::SaveIn(
+                                                         scratch_result.val));
+            return scratch_result.to_result(bcx);
+        }
         _ => {
-            cx.tcx().sess.bug(~"only scalars and unique strings supported in \
+            cx.tcx().sess.bug(~"only scalars and strings supported in \
                                 compare_values");
         }
     }

branches/try2/src/test/run-pass/issue-3574.rs

@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// xfail-test
 // rustc --test match_borrowed_str.rs.rs && ./match_borrowed_str.rs
 extern mod std;
 
@@ -21,8 +20,8 @@ fn compare(x: &str, y: &str) -> bool
     }
 }
 
-#[test]
-fn tester()
+fn main()
 {
     assert compare("foo", "foo");
+    assert compare(@"foo", @"foo");
 }