user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Auto merge of #36372 - sfackler:sum-prod-overflow, r=alexcrichton

Browse source 
Inherit overflow checks for sum and product

We have previously documented the fact that these will panic on overflow, but I think this behavior is what people actually want/expect. `#[rustc_inherit_overflow_checks]` didn't exist when we discussed these for stabilization.

r? @alexcrichton

Closes #35807
This commit is contained in:
bors 2016-09-15 02:43:01 -07:00 • committed by GitHub
commit e2c64d1690
4 changed files with 68 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

35
src/test/run-pass/iter-sum-overflow-debug.rs Normal file
View file

@ -0,0 +1,35 @@
// Copyright 2016 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.
// compile-flags: -C debug_assertions=yes
use std::panic;
fn main() {
let r = panic::catch_unwind(|| {
[1, i32::max_value()].iter().sum::<i32>();
});
assert!(r.is_err());
let r = panic::catch_unwind(|| {
[2, i32::max_value()].iter().product::<i32>();
});
assert!(r.is_err());
let r = panic::catch_unwind(|| {
[1, i32::max_value()].iter().cloned().sum::<i32>();
});
assert!(r.is_err());
let r = panic::catch_unwind(|| {
[2, i32::max_value()].iter().cloned().product::<i32>();
});
assert!(r.is_err());
}

23
src/test/run-pass/iter-sum-overflow-ndebug.rs Normal file
View file

@ -0,0 +1,23 @@
// Copyright 2016 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.
// compile-flags: -C debug_assertions=no
fn main() {
assert_eq!([1i32, i32::max_value()].iter().sum::<i32>(),
1i32.wrapping_add(i32::max_value()));
assert_eq!([2i32, i32::max_value()].iter().product::<i32>(),
2i32.wrapping_mul(i32::max_value()));
assert_eq!([1i32, i32::max_value()].iter().cloned().sum::<i32>(),
1i32.wrapping_add(i32::max_value()));
assert_eq!([2i32, i32::max_value()].iter().cloned().product::<i32>(),
2i32.wrapping_mul(i32::max_value()));
}