Merge remote-tracking branch 'upstream/master'

2011-05-31 13:19:15 -04:00 · 2011-05-31 13:19:15 -04:00 · ebe055c307
commit ebe055c307
parent b0a5c09986 18a1cce2bc
1 changed files with 1 additions and 1 deletions
--- a/src/test/compile-fail/pred-on-wrong-slots.rs
+++ b/src/test/compile-fail/pred-on-wrong-slots.rs
@ -8,7 +8,7 @@
 fn f(int a, int b) : lt(a,b) {
 }

-fn lt(int a, int b) -> bool {
+pred lt(int a, int b) -> bool {
  ret a < b;
 }