OpenE2K/rust
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Rename cast_from_int to cast_from_int_like

Browse Source
This commit is contained in:
Wesley Wiser 2020-03-20 19:57:29 -04:00
parent 2fa550b85d
commit 96bbd1ccb6
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/librustc_mir/interpret/cast.rs
View File

@ -136,7 +136,9 @@ impl<'mir, 'tcx, M: Machine<'mir, 'tcx>> InterpCx<'mir, 'tcx, M> {
if let Some(discr) = src.layout.ty.discriminant_for_variant(*self.tcx, index) { if let Some(discr) = src.layout.ty.discriminant_for_variant(*self.tcx, index) {
assert!(src.layout.is_zst()); assert!(src.layout.is_zst());
let discr_layout = self.layout_of(discr.ty)?; let discr_layout = self.layout_of(discr.ty)?;
return Ok(self.cast_from_int(discr.val, discr_layout, dest_layout)?.into()); return Ok(self
.cast_from_int_like(discr.val, discr_layout, dest_layout)?
.into());
} }
} }
layout::Variants::Multiple { .. } => {} layout::Variants::Multiple { .. } => {}
@ -173,10 +175,10 @@ impl<'mir, 'tcx, M: Machine<'mir, 'tcx>> InterpCx<'mir, 'tcx, M> {
// (b) cast from an integer-like (including bool, char, enums). // (b) cast from an integer-like (including bool, char, enums).
// In both cases we want the bits. // In both cases we want the bits.
let bits = self.force_bits(src.to_scalar()?, src.layout.size)?; let bits = self.force_bits(src.to_scalar()?, src.layout.size)?;
Ok(self.cast_from_int(bits, src.layout, dest_layout)?.into()) Ok(self.cast_from_int_like(bits, src.layout, dest_layout)?.into())
} }
fn cast_from_int( fn cast_from_int_like(
&self, &self,
v: u128, // raw bits v: u128, // raw bits
src_layout: TyLayout<'tcx>, src_layout: TyLayout<'tcx>,