bjoernager/rust
bjoernager/rust
1
Fork 0
Code Issues Pull requests Activity

s/Scalar::Raw/Scalar::Int

Browse source
This commit is contained in:
oli 2020-11-01 16:57:03 +00:00
parent 3a7970848c
commit df4d717d0b
13 changed files with 48 additions and 48 deletions
Download patch file Download diff file Expand all files Collapse all files

4
compiler/rustc_mir/src/const_eval/eval_queries.rs
View file

@ -137,7 +137,7 @@ pub(super) fn op_to_const<'tcx>(
let alloc = ecx.tcx.global_alloc(ptr.alloc_id).unwrap_memory();
ConstValue::ByRef { alloc, offset: ptr.offset }
}
Scalar::Raw(int) => {
Scalar::Int(int) => {
assert!(mplace.layout.is_zst());
assert_eq!(
int.assert_bits(ecx.tcx.data_layout.pointer_size)
@ -162,7 +162,7 @@ pub(super) fn op_to_const<'tcx>(
Scalar::Ptr(ptr) => {
(ecx.tcx.global_alloc(ptr.alloc_id).unwrap_memory(), ptr.offset.bytes())
}
Scalar::Raw { .. } => (
Scalar::Int { .. } => (
ecx.tcx
.intern_const_alloc(Allocation::from_byte_aligned_bytes(b"" as &[u8])),
0,