if ty::type_is_integral(lhs_t) && ast_util::is_shift_binop(op) {
// Shift is a special case: rhs must be uint, no matter what lhs is
- check_expr_has_type(fcx, &**rhs, fcx.tcx().types.uint);
- fcx.write_ty(expr.id, lhs_t);
+ check_expr(fcx, &**rhs);
+ let rhs_ty = fcx.expr_ty(&**rhs);
+ let rhs_ty = fcx.infcx().resolve_type_vars_if_possible(&rhs_ty);
+ if ty::type_is_integral(rhs_ty) {
+ fcx.write_ty(expr.id, lhs_t);
+ } else {
+ fcx.type_error_message(
+ expr.span,
+ |actual| {
+ format!(
+ "right-hand-side of a shift operation must have integral type, \
+ not `{}`",
+ actual)
+ },
+ rhs_ty,
+ None);
+ fcx.write_ty(expr.id, fcx.tcx().types.err);
+ }
return;
}
--- /dev/null
+// Copyright 2015 The Rust Project Developers. See the COPYRIGHT
+// file at the top-level directory of this distribution and at
+// http://rust-lang.org/COPYRIGHT.
+//
+// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
+
+// Test that we can do shifts by any integral type.
+
+struct Panolpy {
+ char: char,
+ str: &'static str,
+}
+
+fn foo(p: &Panolpy) {
+ 22 >> p.char;
+ //~^ ERROR right-hand-side of a shift operation must have integral type
+
+ 22 >> p.str;
+ //~^ ERROR right-hand-side of a shift operation must have integral type
+
+ 22 >> p;
+ //~^ ERROR right-hand-side of a shift operation must have integral type
+
+ // We could be more accepting in the case of a type not yet inferred, but not
+ // known to be an integer, but meh.
+ let x;
+ 22 >> x;
+ //~^ ERROR right-hand-side of a shift operation must have integral type
+
+ 22 >> 1;
+ // Integer literal types are OK
+}
+
+fn main() {
+}
--- /dev/null
+// Copyright 2015 The Rust Project Developers. See the COPYRIGHT
+// file at the top-level directory of this distribution and at
+// http://rust-lang.org/COPYRIGHT.
+//
+// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
+
+// Test that we can do shifts by any integral type.
+
+struct Panolpy {
+ i8: i8,
+ i16: i16,
+ i32: i32,
+ i64: i64,
+ isize: isize,
+
+ u8: u8,
+ u16: u16,
+ u32: u32,
+ u64: u64,
+ usize: usize,
+}
+
+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 >> 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);
+}
+
+fn main() {
+ let p = Panolpy {
+ i8: 1,
+ i16: 1,
+ i32: 1,
+ i64: 1,
+ isize: 1,
+
+ u8: 1,
+ u16: 1,
+ u32: 1,
+ u64: 1,
+ usize: 1,
+ };
+ foo(&p)
+}