Skip to content

Commit 0e70ed9

Browse files
committed
Auto merge of #122139 - GuillaumeGomez:rollup-37vtwsc, r=GuillaumeGomez
Rollup of 10 pull requests Successful merges: - #121863 (silence mismatched types errors for implied projections) - #122043 (Apply `EarlyBinder` only to `TraitRef` in `ImplTraitHeader`) - #122066 (Add proper cfgs for struct HirIdValidator used only with debug-assert) - #122104 (Rust is a proper name: rust → Rust) - #122110 (Make `x t miri` respect `MIRI_TEMP`) - #122114 (Make not finding core a fatal error) - #122115 (Cancel parsing ever made during recovery) - #122123 (Don't require specifying unrelated assoc types when trait alias is in `dyn` type) - #122126 (Fix `tidy --bless` on ̶X̶e̶n̶i̶x̶ Windows) - #122129 (Set `RustcDocs` to only run on host) r? `@ghost` `@rustbot` modify labels: rollup
2 parents ae3af12 + bb0d374 commit 0e70ed9

File tree

2 files changed

+7
-1
lines changed

2 files changed

+7
-1
lines changed

tests/compiletest.rs

+3-1
Original file line numberDiff line numberDiff line change
@@ -81,8 +81,10 @@ fn test_config(target: &str, path: &str, mode: Mode, with_dependencies: bool) ->
8181

8282
// Add a test env var to do environment communication tests.
8383
program.envs.push(("MIRI_ENV_VAR_TEST".into(), Some("0".into())));
84+
8485
// Let the tests know where to store temp files (they might run for a different target, which can make this hard to find).
85-
program.envs.push(("MIRI_TEMP".into(), Some(env::temp_dir().into())));
86+
let miri_temp = env::var_os("MIRI_TEMP").unwrap_or_else(|| env::temp_dir().into());
87+
program.envs.push(("MIRI_TEMP".into(), Some(miri_temp)));
8688

8789
let mut config = Config {
8890
target: Some(target.to_owned()),

tests/pass/shims/fs.rs

+4
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
11
//@ignore-target-windows: File handling is not implemented yet
22
//@compile-flags: -Zmiri-disable-isolation
33

4+
// If this test is failing for you locally, you can try
5+
// 1. Deleting the files `/tmp/miri_*`
6+
// 2. Setting `MIRI_TEMP` or `TMPDIR` to a different directory, without the `miri_*` files
7+
48
#![feature(io_error_more)]
59
#![feature(io_error_uncategorized)]
610

0 commit comments

Comments
 (0)