Skip to content

Commit 386a2bb

Browse files
committed
fat -> wide
1 parent 96ea142 commit 386a2bb

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

src/librustc_mir/interpret/operand.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ use rustc_macros::HashStable;
2424
///
2525
/// For optimization of a few very common cases, there is also a representation for a pair of
2626
/// primitive values (`ScalarPair`). It allows Miri to avoid making allocations for checked binary
27-
/// operations and fat pointers. This idea was taken from rustc's codegen.
27+
/// operations and wide pointers. This idea was taken from rustc's codegen.
2828
/// In particular, thanks to `ScalarPair`, arithmetic operations and casts can be entirely
2929
/// defined on `Immediate`, and do not have to work with a `Place`.
3030
#[derive(Copy, Clone, Debug, PartialEq, Eq, HashStable, Hash)]
@@ -74,7 +74,7 @@ impl<'tcx, Tag> Immediate<Tag> {
7474
pub fn to_scalar_or_undef(self) -> ScalarMaybeUndef<Tag> {
7575
match self {
7676
Immediate::Scalar(val) => val,
77-
Immediate::ScalarPair(..) => bug!("Got a fat pointer where a scalar was expected"),
77+
Immediate::ScalarPair(..) => bug!("Got a wide pointer where a scalar was expected"),
7878
}
7979
}
8080

@@ -331,7 +331,7 @@ impl<'mir, 'tcx, M: Machine<'mir, 'tcx>> InterpCx<'mir, 'tcx, M> {
331331
Ok(self.read_immediate(op)?.to_scalar_or_undef())
332332
}
333333

334-
// Turn the fat MPlace into a string (must already be dereferenced!)
334+
// Turn the wide MPlace into a string (must already be dereferenced!)
335335
pub fn read_str(
336336
&self,
337337
mplace: MPlaceTy<'tcx, M::PointerTag>,

src/librustc_mir/interpret/place.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ impl<Tag> MemPlace<Tag> {
125125
Self::from_scalar_ptr(ptr.into(), align)
126126
}
127127

128-
/// Turn a mplace into a (thin or fat) pointer, as a reference, pointing to the same space.
128+
/// Turn a mplace into a (thin or wide) pointer, as a reference, pointing to the same space.
129129
/// This is the inverse of `ref_to_mplace`.
130130
#[inline(always)]
131131
pub fn to_ref(self) -> Immediate<Tag> {
@@ -278,7 +278,7 @@ where
278278
M::MemoryMap: AllocMap<AllocId, (MemoryKind<M::MemoryKinds>, Allocation<Tag, M::AllocExtra>)>,
279279
M::AllocExtra: AllocationExtra<Tag>,
280280
{
281-
/// Take a value, which represents a (thin or fat) reference, and make it a place.
281+
/// Take a value, which represents a (thin or wide) reference, and make it a place.
282282
/// Alignment is just based on the type. This is the inverse of `MemPlace::to_ref()`.
283283
///
284284
/// Only call this if you are sure the place is "valid" (aligned and inbounds), or do not
@@ -1034,7 +1034,7 @@ where
10341034
MPlaceTy::from_aligned_ptr(ptr, layout)
10351035
}
10361036

1037-
/// Returns a fat MPlace.
1037+
/// Returns a wide MPlace.
10381038
pub fn allocate_str(
10391039
&mut self,
10401040
str: &str,

0 commit comments

Comments
 (0)