---

yaml
---
r: 172251
b: refs/heads/beta
c: a661bd6
h: refs/heads/master
i:
  172249: 4861720
  172247: 5fbbc99
v: v3

Author: nikomatsakis

[refs]

@@ -31,5 +31,5 @@ refs/heads/automation-fail: 1bf06495443584539b958873e04cc2f864ab10e4
 refs/heads/issue-18208-method-dispatch-3-quick-reject: 2009f85b9f99dedcec4404418eda9ddba90258a2
 refs/heads/batch: b5571ed71a5879c0495a982506258d5d267744ed
 refs/heads/building: 126db549b038c84269a1e4fe46f051b2c15d6970
-refs/heads/beta: 705b92bdfe33d0d6febdf945340262514e1b3b5c
+refs/heads/beta: a661bd6575dd3fac17cf77fdea8b76ca790ac212
 refs/heads/windistfix: 7608dbad651f02e837ed05eef3d74a6662a6e928

branches/beta/src/test/compile-fail/shift-various-bad-types.rs

@@ -33,6 +33,10 @@ fn foo(p: &Panolpy) {
 
     22 >> 1;
     // Integer literal types are OK
+
+    // Type of the result follows the LHS, not the RHS:
+    let _: i32 = 22_i64 >> 1_i32;
+    //~^ ERROR mismatched types: expected `i32`, found `i64`
 }
 
 fn main() {

branches/beta/src/test/run-pass/shift-various-types.rs

@@ -25,17 +25,17 @@ struct Panolpy {
 }
 
 fn foo(p: &Panolpy) {
-    assert_eq!(22 >> p.i8, 11_i8);
-    assert_eq!(22 >> p.i16, 11_i16);
-    assert_eq!(22 >> p.i32, 11_i32);
-    assert_eq!(22 >> p.i64, 11_i64);
-    assert_eq!(22 >> p.isize, 11_is);
+    assert_eq!(22_i32 >> p.i8, 11_i32);
+    assert_eq!(22_i32 >> p.i16, 11_i32);
+    assert_eq!(22_i32 >> p.i32, 11_i32);
+    assert_eq!(22_i32 >> p.i64, 11_i32);
+    assert_eq!(22_i32 >> p.isize, 11_i32);
 
-    assert_eq!(22 >> p.u8, 11_u8);
-    assert_eq!(22 >> p.u16, 11_u16);
-    assert_eq!(22 >> p.u32, 11_u32);
-    assert_eq!(22 >> p.u64, 11_u64);
-    assert_eq!(22 >> p.usize, 11_us);
+    assert_eq!(22_i32 >> p.u8, 11_i32);
+    assert_eq!(22_i32 >> p.u16, 11_i32);
+    assert_eq!(22_i32 >> p.u32, 11_i32);
+    assert_eq!(22_i32 >> p.u64, 11_i32);
+    assert_eq!(22_i32 >> p.usize, 11_i32);
 }
 
 fn main() {