Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit 6217ce9

Browse files
committedSep 3, 2011
Print the type of istrs as 'str' in error messages. Issue rust-lang#855
1 parent b164576 commit 6217ce9

File tree

4 files changed

+4
-4
lines changed

4 files changed

+4
-4
lines changed
 

‎src/comp/util/ppaux.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ fn ty_to_str(cx: &ctxt, typ: &t) -> str {
107107
ty_uint. { "uint" }
108108
ty_machine(tm) { ty_mach_to_str(tm) }
109109
ty_char. { "char" }
110-
ty_istr. { "istr" }
110+
ty_istr. { "str" }
111111
ty_box(tm) { "@" + mt_to_str(cx, tm) }
112112
ty_uniq(t) { "~" + ty_to_str(cx, t) }
113113
ty_vec(tm) { "[" + mt_to_str(cx, tm) + "]" }
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
// error-pattern:^ cannot be applied to type `istr`
1+
// error-pattern:^ cannot be applied to type `str`
22

33
fn main() { let x = "a" ^ "b"; }
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
// error-pattern:expected istr but found [int]
1+
// error-pattern:expected str but found [int]
22
fn main() { fail [0]; }

‎src/test/compile-fail/minus-string.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
// error-pattern:applying unary minus to non-numeric type istr
1+
// error-pattern:applying unary minus to non-numeric type str
22

33
fn main() { -"foo"; }

0 commit comments

Comments
 (0)
Please sign in to comment.