Skip to content

Commit 39dd12d

Browse files
committed
Auto merge of #126374 - workingjubilee:rollup-tz0utfr, r=workingjubilee
Rollup of 10 pull requests Successful merges: - #125674 (Rewrite `symlinked-extern`, `symlinked-rlib` and `symlinked-libraries` `run-make` tests in `rmake.rs` format) - #125688 (Walk into alias-eq nested goals even if normalization fails) - #126142 (Harmonize using root or leaf obligation in trait error reporting) - #126303 (Urls to docs in rust_hir) - #126328 (Add Option::is_none_or) - #126337 (Add test for walking order dependent opaque type behaviour) - #126353 (Move `MatchAgainstFreshVars` to old solver) - #126356 (docs(rustc): Improve discoverable of Cargo docs) - #126358 (safe transmute: support `Single` enums) - #126362 (Make `try_from_target_usize` method public) r? `@ghost` `@rustbot` modify labels: rollup
2 parents 163552b + b51fb88 commit 39dd12d

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

src/lib.rs

+1
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
#![feature(lint_reasons)]
1414
#![feature(trait_upcasting)]
1515
#![feature(strict_overflow_ops)]
16+
#![feature(is_none_or)]
1617
// Configure clippy and other lints
1718
#![allow(
1819
clippy::collapsible_else_if,

src/shims/foreign_items.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -396,12 +396,12 @@ trait EvalContextExtPriv<'tcx>: crate::MiriInterpCxExt<'tcx> {
396396
// If the newly promised alignment is bigger than the native alignment of this
397397
// allocation, and bigger than the previously promised alignment, then set it.
398398
if align > alloc_align
399-
&& !this
399+
&& this
400400
.machine
401401
.symbolic_alignment
402402
.get_mut()
403403
.get(&alloc_id)
404-
.is_some_and(|&(_, old_align)| align <= old_align)
404+
.is_none_or(|&(_, old_align)| align > old_align)
405405
{
406406
this.machine.symbolic_alignment.get_mut().insert(alloc_id, (offset, align));
407407
}

0 commit comments

Comments
 (0)