diff --git a/miri-script/src/commands.rs b/miri-script/src/commands.rs index 75ac999e8b..be2517aa6d 100644 --- a/miri-script/src/commands.rs +++ b/miri-script/src/commands.rs @@ -423,7 +423,7 @@ impl Command { .map(|path| path.into_os_string().into_string().unwrap()) .collect() } else { - benches.into_iter().map(Into::into).collect() + benches.into_iter().collect() }; let target_flag = if let Some(target) = target { let mut flag = OsString::from("--target="); diff --git a/rust-version b/rust-version index 24bef6026d..96ff7aae00 100644 --- a/rust-version +++ b/rust-version @@ -1 +1 @@ -13170cd787cb733ed24842ee825bcbd98dc01476 +917bfa78478cbcc77406e5ea37b24c3eedefacf4 diff --git a/src/concurrency/cpu_affinity.rs b/src/concurrency/cpu_affinity.rs index 4e6bca93c5..b47b614cf5 100644 --- a/src/concurrency/cpu_affinity.rs +++ b/src/concurrency/cpu_affinity.rs @@ -54,8 +54,8 @@ impl CpuAffinityMask { let chunk = self.0[start..].first_chunk_mut::<4>().unwrap(); let offset = cpu % 32; *chunk = match target.options.endian { - Endian::Little => (u32::from_le_bytes(*chunk) | 1 << offset).to_le_bytes(), - Endian::Big => (u32::from_be_bytes(*chunk) | 1 << offset).to_be_bytes(), + Endian::Little => (u32::from_le_bytes(*chunk) | (1 << offset)).to_le_bytes(), + Endian::Big => (u32::from_be_bytes(*chunk) | (1 << offset)).to_be_bytes(), }; } 8 => { @@ -63,8 +63,8 @@ impl CpuAffinityMask { let chunk = self.0[start..].first_chunk_mut::<8>().unwrap(); let offset = cpu % 64; *chunk = match target.options.endian { - Endian::Little => (u64::from_le_bytes(*chunk) | 1 << offset).to_le_bytes(), - Endian::Big => (u64::from_be_bytes(*chunk) | 1 << offset).to_be_bytes(), + Endian::Little => (u64::from_le_bytes(*chunk) | (1 << offset)).to_le_bytes(), + Endian::Big => (u64::from_be_bytes(*chunk) | (1 << offset)).to_be_bytes(), }; } other => bug!("chunk size not supported: {other}"), diff --git a/src/shims/windows/handle.rs b/src/shims/windows/handle.rs index 3d872b65a6..c4eb11fbd3 100644 --- a/src/shims/windows/handle.rs +++ b/src/shims/windows/handle.rs @@ -97,7 +97,7 @@ impl Handle { // packs the data into the lower `data_size` bits // and packs the discriminant right above the data - discriminant << data_size | data + (discriminant << data_size) | data } fn new(discriminant: u32, data: u32) -> Option {