From 6217ce958e4b1007ca9e49751dba1aa1b68fbe67 Mon Sep 17 00:00:00 2001
From: Brian Anderson <banderson@mozilla.com>
Date: Fri, 2 Sep 2011 16:35:50 -0700
Subject: [PATCH] Print the type of istrs as 'str' in error messages. Issue
 #855

---
 src/comp/util/ppaux.rs                    | 2 +-
 src/test/compile-fail/binop-bitxor-str.rs | 2 +-
 src/test/compile-fail/fail-type-err.rs    | 2 +-
 src/test/compile-fail/minus-string.rs     | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/comp/util/ppaux.rs b/src/comp/util/ppaux.rs
index 8846d5c5380..ede973149c5 100644
--- a/src/comp/util/ppaux.rs
+++ b/src/comp/util/ppaux.rs
@@ -107,7 +107,7 @@ fn ty_to_str(cx: &ctxt, typ: &t) -> str {
           ty_uint. { "uint" }
           ty_machine(tm) { ty_mach_to_str(tm) }
           ty_char. { "char" }
-          ty_istr. { "istr" }
+          ty_istr. { "str" }
           ty_box(tm) { "@" + mt_to_str(cx, tm) }
           ty_uniq(t) { "~" + ty_to_str(cx, t) }
           ty_vec(tm) { "[" + mt_to_str(cx, tm) + "]" }
diff --git a/src/test/compile-fail/binop-bitxor-str.rs b/src/test/compile-fail/binop-bitxor-str.rs
index cfb0ac6ed3a..65e0996fa62 100644
--- a/src/test/compile-fail/binop-bitxor-str.rs
+++ b/src/test/compile-fail/binop-bitxor-str.rs
@@ -1,3 +1,3 @@
-// error-pattern:^ cannot be applied to type `istr`
+// error-pattern:^ cannot be applied to type `str`
 
 fn main() { let x = "a" ^ "b"; }
diff --git a/src/test/compile-fail/fail-type-err.rs b/src/test/compile-fail/fail-type-err.rs
index 8d1f36fc25f..8ea86d80a7b 100644
--- a/src/test/compile-fail/fail-type-err.rs
+++ b/src/test/compile-fail/fail-type-err.rs
@@ -1,2 +1,2 @@
-// error-pattern:expected istr but found [int]
+// error-pattern:expected str but found [int]
 fn main() { fail [0]; }
diff --git a/src/test/compile-fail/minus-string.rs b/src/test/compile-fail/minus-string.rs
index 8141c510b47..e30a2dbe7df 100644
--- a/src/test/compile-fail/minus-string.rs
+++ b/src/test/compile-fail/minus-string.rs
@@ -1,3 +1,3 @@
-// error-pattern:applying unary minus to non-numeric type istr
+// error-pattern:applying unary minus to non-numeric type str
 
 fn main() { -"foo"; }