Merge remote-tracking branch 'upstream/master'

Author: cixtor

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;
 }