---

yaml
---
r: 40750
b: refs/heads/dist-snap
c: 01c0971
h: refs/heads/master
v: v3

Author: catamorphism

[refs]

@@ -7,7 +7,7 @@ refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: a810c03263670238bccd64cabb12a23a46e3a278
 refs/heads/incoming: e90142e536c150df0d9b4b2f11352152177509b5
-refs/heads/dist-snap: f675b97ddc3d85498473bb4da7f95b8942ebbd81
+refs/heads/dist-snap: 01c0971172578ac170b3ae07c35ae416644ca1ef
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
 refs/heads/try3: 9387340aab40a73e8424c48fd42f0c521a4875c0

branches/dist-snap/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/dist-snap/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");
 }