Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit 00ed73c

Browse files
committedNov 2, 2024
Auto merge of #132512 - workingjubilee:update-miri-for-rustc-abi, r=RalfJung
miri: Directly use rustc_abi I tried to make this a PR to the miri repo for funsies. Ironically, the integration flow meant that it would use a too-old toolchain hash, and I didn't understand the build system there enough to want to manually fiddle with the hashes.
2 parents 07cbbdd + a953b32 commit 00ed73c

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

61 files changed

+526
-485
lines changed
 

‎src/tools/miri/clippy.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
arithmetic-side-effects-allowed = ["rustc_target::abi::Size"]
1+
arithmetic-side-effects-allowed = ["rustc_abi::Size"]

‎src/tools/miri/src/alloc_addresses/mod.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@ use std::cell::RefCell;
77
use std::cmp::max;
88

99
use rand::Rng;
10+
use rustc_abi::{Align, Size};
1011
use rustc_data_structures::fx::{FxHashMap, FxHashSet};
1112
use rustc_span::Span;
12-
use rustc_target::abi::{Align, Size};
1313

1414
use self::reuse_pool::ReusePool;
1515
use crate::concurrency::VClock;

0 commit comments

Comments
 (0)
Please sign in to comment.