Skip to content

Commit 907c393

Browse files
committed
Auto merge of #122980 - workingjubilee:rollup-r5i1rke, r=workingjubilee
Rollup of 7 pull requests Successful merges: - #120419 (Expand sys/os for UEFI) - #121940 (Mention Register Size in `#[warn(asm_sub_register)]`) - #122762 (fix typo of endianness) - #122797 (Fix compile of wasm64-unknown-unknown target) - #122875 (CFI: Support self_cell-like recursion) - #122879 (CFI: Strip auto traits off Virtual calls) - #122969 (Simplify an iterator search in borrowck diag) r? `@ghost` `@rustbot` modify labels: rollup
2 parents 1b11211 + def7c75 commit 907c393

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

src/shims/intrinsics/simd.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -457,7 +457,7 @@ pub trait EvalContextExt<'mir, 'tcx: 'mir>: crate::MiriInterpCxExt<'mir, 'tcx> {
457457
let bitmask_len = u32::try_from(bitmask_len).unwrap();
458458

459459
// To read the mask, we transmute it to an integer.
460-
// That does the right thing wrt endianess.
460+
// That does the right thing wrt endianness.
461461
let mask_ty = this.machine.layouts.uint(mask.layout.size).unwrap();
462462
let mask = mask.transmute(mask_ty, this)?;
463463
let mask: u64 = this.read_scalar(&mask)?.to_bits(mask_ty.size)?.try_into().unwrap();
@@ -509,7 +509,7 @@ pub trait EvalContextExt<'mir, 'tcx: 'mir>: crate::MiriInterpCxExt<'mir, 'tcx> {
509509
}
510510
}
511511
// We have to change the type of the place to be able to write `res` into it. This
512-
// transmutes the integer to an array, which does the right thing wrt endianess.
512+
// transmutes the integer to an array, which does the right thing wrt endianness.
513513
let dest =
514514
dest.transmute(this.machine.layouts.uint(dest.layout.size).unwrap(), this)?;
515515
this.write_int(res, &dest)?;

src/shims/unix/linux/fd/event.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ impl FileDescriptor for Event {
3838
}
3939

4040
/// A write call adds the 8-byte integer value supplied in
41-
/// its buffer (in native endianess) to the counter. The maximum value that may be
41+
/// its buffer (in native endianness) to the counter. The maximum value that may be
4242
/// stored in the counter is the largest unsigned 64-bit value
4343
/// minus 1 (i.e., 0xfffffffffffffffe). If the addition would
4444
/// cause the counter's value to exceed the maximum, then the
@@ -57,7 +57,7 @@ impl FileDescriptor for Event {
5757
) -> InterpResult<'tcx, io::Result<usize>> {
5858
let v1 = self.val.get();
5959
let bytes: [u8; 8] = bytes.try_into().unwrap(); // FIXME fail gracefully when this has the wrong size
60-
// Convert from target endianess to host endianess.
60+
// Convert from target endianness to host endianness.
6161
let num = match tcx.sess.target.endian {
6262
Endian::Little => u64::from_le_bytes(bytes),
6363
Endian::Big => u64::from_be_bytes(bytes),

0 commit comments

Comments
 (0)