#![feature(untagged_unions)]
#![feature(unwind_attributes)]
#![feature(doc_alias)]
+#![feature(inclusive_range_methods)]
#![cfg_attr(not(stage0), feature(mmx_target_feature))]
#![cfg_attr(not(stage0), feature(tbm_target_feature))]
/// # Examples
///
/// ```
-/// #![feature(inclusive_range_fields)]
+/// #![feature(inclusive_range_methods)]
///
/// assert_eq!((3..=5), std::ops::RangeInclusive::new(3, 5));
/// assert_eq!(3 + 4 + 5, (3..=5).sum());
#[test]
fn test_range_inclusive() {
- let mut r = RangeInclusive { start: 1i8, end: 2 };
+ let mut r = RangeInclusive::new(1i8, 2);
assert_eq!(r.next(), Some(1));
assert_eq!(r.next(), Some(2));
assert_eq!(r.next(), None);
- r = RangeInclusive { start: 127i8, end: 127 };
+ r = RangeInclusive::new(127i8, 127);
assert_eq!(r.next(), Some(127));
assert_eq!(r.next(), None);
- r = RangeInclusive { start: -128i8, end: -128 };
+ r = RangeInclusive::new(-128i8, -128);
assert_eq!(r.next_back(), Some(-128));
assert_eq!(r.next_back(), None);
// degenerate
- r = RangeInclusive { start: 1, end: -1 };
+ r = RangeInclusive::new(1, -1);
assert_eq!(r.size_hint(), (0, Some(0)));
assert_eq!(r.next(), None);
}
#![feature(trusted_len)]
#![feature(catch_expr)]
#![feature(test)]
-#![feature(inclusive_range_fields)]
+#![feature(inclusive_range_methods)]
#![recursion_limit="512"]
use std::fmt;
use std::i128;
use std::mem;
-use std::ops::RangeInclusive;
use ich::StableHashingContext;
use rustc_data_structures::stable_hasher::{HashStable, StableHasher,
ty::TyFloat(FloatTy::F64) => scalar(F64),
ty::TyFnPtr(_) => {
let mut ptr = scalar_unit(Pointer);
- ptr.valid_range.start = 1;
+ ptr.valid_range = 1..=*ptr.valid_range.end();
tcx.intern_layout(LayoutDetails::scalar(self, ptr))
}
ty::TyRawPtr(ty::TypeAndMut { ty: pointee, .. }) => {
let mut data_ptr = scalar_unit(Pointer);
if !ty.is_unsafe_ptr() {
- data_ptr.valid_range.start = 1;
+ data_ptr.valid_range = 1..=*data_ptr.valid_range.end();
}
let pointee = tcx.normalize_erasing_regions(param_env, pointee);
}
ty::TyDynamic(..) => {
let mut vtable = scalar_unit(Pointer);
- vtable.valid_range.start = 1;
+ vtable.valid_range = 1..=*vtable.valid_range.end();
vtable
}
_ => return Err(LayoutError::Unknown(unsized_part))
match st.abi {
Abi::Scalar(ref mut scalar) |
Abi::ScalarPair(ref mut scalar, _) => {
- if scalar.valid_range.start == 0 {
- scalar.valid_range.start = 1;
+ if *scalar.valid_range.start() == 0 {
+ scalar.valid_range = 1..=*scalar.valid_range.end();
}
}
_ => {}
}
}
}
- if niche_variants.start > v {
- niche_variants.start = v;
- }
- niche_variants.end = v;
+ niche_variants = *niche_variants.start().min(&v)..=v;
}
- if niche_variants.start > niche_variants.end {
+ if niche_variants.start() > niche_variants.end() {
dataful_variant = None;
}
if let Some(i) = dataful_variant {
- let count = (niche_variants.end - niche_variants.start + 1) as u128;
+ let count = (niche_variants.end() - niche_variants.start() + 1) as u128;
for (field_index, &field) in variants[i].iter().enumerate() {
let (offset, niche, niche_start) =
match self.find_niche(field, count)? {
let max_value = !0u128 >> (128 - bits);
// Find out how many values are outside the valid range.
- let niches = if v.start <= v.end {
- v.start + (max_value - v.end)
+ let niches = if v.start() <= v.end() {
+ v.start() + (max_value - v.end())
} else {
- v.start - v.end - 1
+ v.start() - v.end() - 1
};
// Give up if we can't fit `count` consecutive niches.
return None;
}
- let niche_start = v.end.wrapping_add(1) & max_value;
- let niche_end = v.end.wrapping_add(count) & max_value;
+ let niche_start = v.end().wrapping_add(1) & max_value;
+ let niche_end = v.end().wrapping_add(count) & max_value;
Some((offset, Scalar {
value,
- valid_range: v.start..=niche_end
+ valid_range: *v.start()..=niche_end
}, niche_start))
};
}
NicheFilling {
dataful_variant,
- niche_variants: RangeInclusive { start, end },
+ ref niche_variants,
ref niche,
niche_start,
ref variants,
} => {
dataful_variant.hash_stable(hcx, hasher);
- start.hash_stable(hcx, hasher);
- end.hash_stable(hcx, hasher);
+ niche_variants.start().hash_stable(hcx, hasher);
+ niche_variants.end().hash_stable(hcx, hasher);
niche.hash_stable(hcx, hasher);
niche_start.hash_stable(hcx, hasher);
variants.hash_stable(hcx, hasher);
fn hash_stable<W: StableHasherResult>(&self,
hcx: &mut StableHashingContext<'a>,
hasher: &mut StableHasher<W>) {
- let Scalar { value, valid_range: RangeInclusive { start, end } } = *self;
+ let Scalar { value, ref valid_range } = *self;
value.hash_stable(hcx, hasher);
- start.hash_stable(hcx, hasher);
- end.hash_stable(hcx, hasher);
+ valid_range.start().hash_stable(hcx, hasher);
+ valid_range.end().hash_stable(hcx, hasher);
}
}
niche_start,
..
} => {
- let variants_start = niche_variants.start as u128;
- let variants_end = niche_variants.end as u128;
+ let variants_start = *niche_variants.start() as u128;
+ let variants_end = *niche_variants.end() as u128;
match raw_discr {
PrimVal::Ptr(_) => {
assert!(niche_start == 0);
if variant_index != dataful_variant {
let (niche_dest, niche) =
self.place_field(dest, mir::Field::new(0), layout)?;
- let niche_value = ((variant_index - niche_variants.start) as u128)
+ let niche_value = ((variant_index - niche_variants.start()) as u128)
.wrapping_add(niche_start);
self.write_primval(niche_dest, PrimVal::Bytes(niche_value), niche.ty)?;
}
#![feature(range_contains)]
#![feature(rustc_diagnostic_macros)]
#![feature(nonzero)]
-#![feature(inclusive_range_fields)]
+#![feature(inclusive_range_methods)]
#![feature(crate_visibility_modifier)]
#![feature(never_type)]
#![cfg_attr(stage0, feature(try_trait))]
let bits = self.value.size(cx).bits();
assert!(bits <= 128);
let mask = !0u128 >> (128 - bits);
- let start = self.valid_range.start;
- let end = self.valid_range.end;
+ let start = *self.valid_range.start();
+ let end = *self.valid_range.end();
assert_eq!(start, start & mask);
assert_eq!(end, end & mask);
start..(end.wrapping_add(1) & mask)
#![feature(const_fn)]
#![feature(fs_read_write)]
#![feature(inclusive_range)]
-#![feature(inclusive_range_fields)]
+#![feature(inclusive_range_methods)]
#![feature(slice_patterns)]
#[macro_use]
return;
}
- if scalar.valid_range.start < scalar.valid_range.end {
- if scalar.valid_range.start > 0 {
+ if scalar.valid_range.start() < scalar.valid_range.end() {
+ if *scalar.valid_range.start() > 0 {
attrs.set(ArgAttribute::NonNull);
}
}
self.layout,
self.layout.fields.offset(0),
self.layout.field(cx, 0).size);
- name.push_str(&adt.variants[niche_variants.start].name.as_str());
+ name.push_str(&adt.variants[*niche_variants.start()].name.as_str());
// Create the (singleton) list of descriptions of union members.
vec![
bx.range_metadata(load, range);
}
}
- layout::Pointer if vr.start < vr.end && !vr.contains(&0) => {
+ layout::Pointer if vr.start() < vr.end() && !vr.contains(&0) => {
bx.nonnull_metadata(load);
}
_ => {}
..
} => {
let niche_llty = discr.layout.immediate_llvm_type(bx.cx);
- if niche_variants.start == niche_variants.end {
+ if niche_variants.start() == niche_variants.end() {
// FIXME(eddyb) Check the actual primitive type here.
let niche_llval = if niche_start == 0 {
// HACK(eddyb) Using `C_null` as it works on all types.
C_uint_big(niche_llty, niche_start)
};
bx.select(bx.icmp(llvm::IntEQ, lldiscr, niche_llval),
- C_uint(cast_to, niche_variants.start as u64),
+ C_uint(cast_to, *niche_variants.start() as u64),
C_uint(cast_to, dataful_variant as u64))
} else {
// Rebase from niche values to discriminant values.
- let delta = niche_start.wrapping_sub(niche_variants.start as u128);
+ let delta = niche_start.wrapping_sub(*niche_variants.start() as u128);
let lldiscr = bx.sub(lldiscr, C_uint_big(niche_llty, delta));
- let lldiscr_max = C_uint(niche_llty, niche_variants.end as u64);
+ let lldiscr_max = C_uint(niche_llty, *niche_variants.end() as u64);
bx.select(bx.icmp(llvm::IntULE, lldiscr, lldiscr_max),
bx.intcast(lldiscr, cast_to, false),
C_uint(cast_to, dataful_variant as u64))
let niche = self.project_field(bx, 0);
let niche_llty = niche.layout.immediate_llvm_type(bx.cx);
- let niche_value = ((variant_index - niche_variants.start) as u128)
+ let niche_value = ((variant_index - *niche_variants.start()) as u128)
.wrapping_add(niche_start);
// FIXME(eddyb) Check the actual primitive type here.
let niche_llval = if niche_value == 0 {
if let layout::Int(_, s) = scalar.value {
signed = s;
- if scalar.valid_range.end > scalar.valid_range.start {
+ if scalar.valid_range.end() > scalar.valid_range.start() {
// We want `table[e as usize]` to not
// have bound checks, and this is the most
// convenient place to put the `assume`.
base::call_assume(&bx, bx.icmp(
llvm::IntULE,
llval,
- C_uint_big(ll_t_in, scalar.valid_range.end)
+ C_uint_big(ll_t_in, *scalar.valid_range.end())
));
}
}