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

Fix rebase fallout

Browse source
This commit is contained in:
est31 2016-11-20 01:26:51 +01:00
parent 5fd5d524b7
commit 32d8d24159
3 changed files with 29 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/librustc/ty/layout.rs
View file

@ -1198,7 +1198,9 @@ impl<'a, 'gcx, 'tcx> Layout {
if def.is_enum() && def.variants.iter().all(|v| v.fields.is_empty()) {
// All bodies empty -> intlike
let (mut min, mut max, mut non_zero) = (i128::max_value(), i128::min_value(), true);
let (mut min, mut max, mut non_zero) = (i128::max_value(),
i128::min_value(),
true);
for v in &def.variants {
let x = v.disr_val.to_u128_unchecked() as i128;
if x == 0 { non_zero = false; }