Skip to content
Merged

Rustup #3414

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
a308277
Update target.rs alloc.rs event.rs simd.rs
RoboSchmied Mar 20, 2024
0a2b6c6
Rollup merge of #120419 - Ayush1325:uefi-sys-os, r=nicholasbishop,wor…
workingjubilee Mar 24, 2024
e46b226
Rollup merge of #121940 - veera-sivarajan:bugfix-121593, r=fmease
workingjubilee Mar 24, 2024
f1473ae
Rollup merge of #122762 - RoboSchmied:RoboSchmied-typo, r=workingjubilee
workingjubilee Mar 24, 2024
799f5d9
Rollup merge of #122797 - alexcrichton:fix-compile-wasm64, r=Mark-Sim…
workingjubilee Mar 24, 2024
9b34153
Rollup merge of #122875 - maurer:cfi-transparent-termination, r=worki…
workingjubilee Mar 24, 2024
34097ab
Rollup merge of #122879 - maurer:callsite-instances, r=workingjubilee
workingjubilee Mar 24, 2024
def7c75
Rollup merge of #122969 - cuviper:borrowck-rposition, r=matthewjasper
workingjubilee Mar 24, 2024
907c393
Auto merge of #122980 - workingjubilee:rollup-r5i1rke, r=workingjubilee
bors Mar 24, 2024
dc8d914
Auto merge of #122891 - compiler-errors:encode-implied-predicates-alw…
bors Mar 24, 2024
e828dd3
Auto merge of #122895 - matthiaskrgr:ice-tests-5xxxx-to-9xxxx, r=fmease
bors Mar 24, 2024
698553e
Auto merge of #122658 - cuviper:gccjit-archive, r=Mark-Simulacrum
bors Mar 24, 2024
be0fc0a
Auto merge of #122721 - oli-obk:merge_queries, r=davidtwco
bors Mar 25, 2024
ea6c704
Auto merge of #122951 - Nilstrieb:nodejs20, r=Kobzol
bors Mar 25, 2024
415e29b
Auto merge of #122802 - estebank:unconstrained-generic-const, r=Nadri…
bors Mar 25, 2024
a23e2a9
Preparing for merge from rustc
RalfJung Mar 25, 2024
172a215
Merge from rustc
RalfJung Mar 25, 2024
dee88d7
support '--sysroot=' form of setting the sysroot as well
RalfJung Mar 25, 2024
File filter

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion rust-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
9b8d12cf4c2311203aea83315552b15993bd4f81
cb7c63606e53715f94f3ba04d38e50772e4cd23d
2 changes: 1 addition & 1 deletion src/bin/miri.rs
Original file line number Diff line number Diff line change
Expand Up @@ -276,7 +276,7 @@ fn run_compiler(
// If no `--sysroot` is given, the `MIRI_SYSROOT` env var is consulted to find where
// that sysroot lives, and that is passed to rustc.
let sysroot_flag = "--sysroot";
if !args.iter().any(|e| e == sysroot_flag) {
if !args.iter().any(|e| e.starts_with(sysroot_flag)) {
// Using the built-in default here would be plain wrong, so we *require*
// the env var to make sure things make sense.
let miri_sysroot = env::var("MIRI_SYSROOT").unwrap_or_else(|_| {
Expand Down
4 changes: 2 additions & 2 deletions src/shims/intrinsics/simd.rs
Original file line number Diff line number Diff line change
Expand Up @@ -457,7 +457,7 @@ pub trait EvalContextExt<'mir, 'tcx: 'mir>: crate::MiriInterpCxExt<'mir, 'tcx> {
let bitmask_len = u32::try_from(bitmask_len).unwrap();

// To read the mask, we transmute it to an integer.
// That does the right thing wrt endianess.
// That does the right thing wrt endianness.
let mask_ty = this.machine.layouts.uint(mask.layout.size).unwrap();
let mask = mask.transmute(mask_ty, this)?;
let mask: u64 = this.read_scalar(&mask)?.to_bits(mask_ty.size)?.try_into().unwrap();
Expand Down Expand Up @@ -509,7 +509,7 @@ pub trait EvalContextExt<'mir, 'tcx: 'mir>: crate::MiriInterpCxExt<'mir, 'tcx> {
}
}
// We have to change the type of the place to be able to write `res` into it. This
// transmutes the integer to an array, which does the right thing wrt endianess.
// transmutes the integer to an array, which does the right thing wrt endianness.
let dest =
dest.transmute(this.machine.layouts.uint(dest.layout.size).unwrap(), this)?;
this.write_int(res, &dest)?;
Expand Down
4 changes: 2 additions & 2 deletions src/shims/unix/linux/fd/event.rs
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ impl FileDescriptor for Event {
}

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