nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2024-11-29 10:13:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

rollup merge of #18580 : hirschenberger/issue-17713

Browse Source
This commit is contained in:
Alex Crichton 2014-11-03 15:30:01 -08:00
commit 11790a545c
2 changed files with 40 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/librustc/lint/builtin.rs
View File

@ -187,12 +187,12 @@ impl LintPass for TypeLimits {
if let Some(bits) = opt_ty_bits { if let Some(bits) = opt_ty_bits {
let exceeding = if let ast::ExprLit(ref lit) = r.node { let exceeding = if let ast::ExprLit(ref lit) = r.node {
if let ast::LitInt(shift, _) = lit.node { shift > bits } if let ast::LitInt(shift, _) = lit.node { shift >= bits }
else { false } else { false }
} else { } else {
match eval_const_expr_partial(cx.tcx, &**r) { match eval_const_expr_partial(cx.tcx, &**r) {
Ok(const_int(shift)) => { shift as u64 > bits }, Ok(const_int(shift)) => { shift as u64 >= bits },
Ok(const_uint(shift)) => { shift > bits }, Ok(const_uint(shift)) => { shift >= bits },
_ => { false } _ => { false }
} }
}; };

74
src/test/compile-fail/lint-exceeding-bitshifts.rs
View File

@ -12,47 +12,47 @@
#![allow(unused_variables)] #![allow(unused_variables)]
fn main() { fn main() {
let n = 1u8 << 8; let n = 1u8 << 7;
let n = 1u8 << 9; //~ ERROR: bitshift exceeds the type's number of bits let n = 1u8 << 8; //~ ERROR: bitshift exceeds the type's number of bits
let n = 1u16 << 16; let n = 1u16 << 15;
let n = 1u16 << 17; //~ ERROR: bitshift exceeds the type's number of bits let n = 1u16 << 16; //~ ERROR: bitshift exceeds the type's number of bits
let n = 1u32 << 32; let n = 1u32 << 31;
let n = 1u32 << 33; //~ ERROR: bitshift exceeds the type's number of bits let n = 1u32 << 32; //~ ERROR: bitshift exceeds the type's number of bits
let n = 1u64 << 64; let n = 1u64 << 63;
let n = 1u64 << 65; //~ ERROR: bitshift exceeds the type's number of bits let n = 1u64 << 64; //~ ERROR: bitshift exceeds the type's number of bits
let n = 1i8 << 8; let n = 1i8 << 7;
let n = 1i8 << 9; //~ ERROR: bitshift exceeds the type's number of bits let n = 1i8 << 8; //~ ERROR: bitshift exceeds the type's number of bits
let n = 1i16 << 16; let n = 1i16 << 15;
let n = 1i16 << 17; //~ ERROR: bitshift exceeds the type's number of bits let n = 1i16 << 16; //~ ERROR: bitshift exceeds the type's number of bits
let n = 1i32 << 32; let n = 1i32 << 31;
let n = 1i32 << 33; //~ ERROR: bitshift exceeds the type's number of bits let n = 1i32 << 32; //~ ERROR: bitshift exceeds the type's number of bits
let n = 1i64 << 64; let n = 1i64 << 63;
let n = 1i64 << 65; //~ ERROR: bitshift exceeds the type's number of bits let n = 1i64 << 64; //~ ERROR: bitshift exceeds the type's number of bits
let n = 1u8 >> 8; let n = 1u8 >> 7;
let n = 1u8 >> 9; //~ ERROR: bitshift exceeds the type's number of bits let n = 1u8 >> 8; //~ ERROR: bitshift exceeds the type's number of bits
let n = 1u16 >> 16; let n = 1u16 >> 15;
let n = 1u16 >> 17; //~ ERROR: bitshift exceeds the type's number of bits let n = 1u16 >> 16; //~ ERROR: bitshift exceeds the type's number of bits
let n = 1u32 >> 32; let n = 1u32 >> 31;
let n = 1u32 >> 33; //~ ERROR: bitshift exceeds the type's number of bits let n = 1u32 >> 32; //~ ERROR: bitshift exceeds the type's number of bits
let n = 1u64 >> 64; let n = 1u64 >> 63;
let n = 1u64 >> 65; //~ ERROR: bitshift exceeds the type's number of bits let n = 1u64 >> 64; //~ ERROR: bitshift exceeds the type's number of bits
let n = 1i8 >> 8; let n = 1i8 >> 7;
let n = 1i8 >> 9; //~ ERROR: bitshift exceeds the type's number of bits let n = 1i8 >> 8; //~ ERROR: bitshift exceeds the type's number of bits
let n = 1i16 >> 16; let n = 1i16 >> 15;
let n = 1i16 >> 17; //~ ERROR: bitshift exceeds the type's number of bits let n = 1i16 >> 16; //~ ERROR: bitshift exceeds the type's number of bits
let n = 1i32 >> 32; let n = 1i32 >> 31;
let n = 1i32 >> 33; //~ ERROR: bitshift exceeds the type's number of bits let n = 1i32 >> 32; //~ ERROR: bitshift exceeds the type's number of bits
let n = 1i64 >> 64; let n = 1i64 >> 63;
let n = 1i64 >> 65; //~ ERROR: bitshift exceeds the type's number of bits let n = 1i64 >> 64; //~ ERROR: bitshift exceeds the type's number of bits
let n = 1u8; let n = 1u8;
let n = n << 8; let n = n << 7;
let n = n << 9; //~ ERROR: bitshift exceeds the type's number of bits let n = n << 8; //~ ERROR: bitshift exceeds the type's number of bits
let n = 1u8 << -9; //~ ERROR: bitshift exceeds the type's number of bits let n = 1u8 << -8; //~ ERROR: bitshift exceeds the type's number of bits
let n = 1u8 << (4+4); let n = 1u8 << (4+3);
let n = 1u8 << (4+5); //~ ERROR: bitshift exceeds the type's number of bits let n = 1u8 << (4+4); //~ ERROR: bitshift exceeds the type's number of bits
} }