---

yaml
---
r: 271555
b: refs/heads/auto
c: 874574d
h: refs/heads/master
i:
  271553: 970aba3
  271551: 21975b1

Author: nikomatsakis

[refs]

@@ -8,7 +8,7 @@ refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
 refs/tags/release-0.3.1: 495bae036dfe5ec6ceafd3312b4dca48741e845b
 refs/tags/release-0.4: e828ea2080499553b97dfe33b3f4d472b4562ad7
 refs/tags/release-0.5: 7e3bcfbf21278251ee936ad53e92e9b719702d73
-refs/heads/auto: 726ba6630d28a63e197e9eef1cc20abd157b2910
+refs/heads/auto: 874574d5487d5efdf7401c3e9f318921d6dfd369
 refs/tags/release-0.6: b4ebcfa1812664df5e142f0134a5faea3918544c
 refs/tags/0.1: b19db808c2793fe2976759b85a355c3ad8c8b336
 refs/tags/0.2: 1754d02027f2924bed83b0160ee340c7f41d5ea1

branches/auto/src/test/run-pass/backtrace.rs

@@ -60,8 +60,7 @@ fn expected(fn_name: &str) -> String {
     // name with namespace info, so we just see `foo` and not
     // `backtrace::foo` as we see on linux (which uses the linkage
     // name).
-
-    if cfg!(windows) {
+    if cfg!(windows) && cfg!(target_env = "msvc") {
         format!(" - {}", fn_name)
     } else {
         format!(" - backtrace::{}", fn_name)