Skip to content

Commit 94831ff

Browse files
committed
Auto merge of rust-lang#123968 - jieyouxu:rollup-1pnkxor, r=jieyouxu
Rollup of 12 pull requests Successful merges: - rust-lang#123423 (Distribute LLVM bitcode linker as a preview component) - rust-lang#123548 (libtest: also measure time in Miri) - rust-lang#123666 (Fix some typos in doc) - rust-lang#123864 (Remove a HACK by instead inferring opaque types during expected/formal type checking) - rust-lang#123896 (Migrate some diagnostics in `rustc_resolve` to session diagnostic) - rust-lang#123919 (builtin-derive: tag → discriminant) - rust-lang#123922 (Remove magic constants when using `base_n`.) - rust-lang#123931 (Don't leak unnameable types in `-> _` recover) - rust-lang#123933 (move the LargeAssignments lint logic into its own file) - rust-lang#123934 (`rustc_data_structures::graph` mini refactor) - rust-lang#123941 (Fix UB in LLVM FFI when passing zero or >1 bundle) - rust-lang#123957 (disable create_dir_all_bare test on all(miri, windows)) r? `@ghost` `@rustbot` modify labels: rollup
2 parents 14447a8 + a8ebeb9 commit 94831ff

File tree

2 files changed

+3
-4
lines changed

2 files changed

+3
-4
lines changed

std/tests/create_dir_all_bare.rs

+1
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ impl Drop for CurrentDir {
3131
}
3232

3333
#[test]
34+
#[cfg_attr(all(miri, windows), ignore)] // File system access on Windows not supported by Miri
3435
fn create_dir_all_bare() {
3536
let tmpdir = common::tmpdir();
3637
CurrentDir::with(tmpdir.path(), || {

test/src/console.rs

+2-4
Original file line numberDiff line numberDiff line change
@@ -315,10 +315,8 @@ pub fn run_tests_console(opts: &TestOpts, tests: Vec<TestDescAndFn>) -> io::Resu
315315

316316
// Prevent the usage of `Instant` in some cases:
317317
// - It's currently not supported for wasm targets.
318-
// - We disable it for miri because it's not available when isolation is enabled.
319-
let is_instant_unsupported = (cfg!(target_family = "wasm") && !cfg!(target_os = "wasi"))
320-
|| cfg!(target_os = "zkvm")
321-
|| cfg!(miri);
318+
let is_instant_unsupported =
319+
(cfg!(target_family = "wasm") && !cfg!(target_os = "wasi")) || cfg!(target_os = "zkvm");
322320

323321
let start_time = (!is_instant_unsupported).then(Instant::now);
324322
run_tests(opts, tests, |x| on_test_event(&x, &mut st, &mut *out))?;

0 commit comments

Comments
 (0)