diff options
| author | bors <bors@rust-lang.org> | 2024-08-19 20:42:45 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2024-08-19 20:42:45 +0000 |
| commit | 636d7ff91b9847d6d43c7bbe023568828f6e3246 (patch) | |
| tree | 1465b175c7f5fa0e6ce1c772b4ebc308302a46ed /src | |
| parent | 5601d14249818d952da612fec481b7af3ed03a39 (diff) | |
| parent | 77303568c049c5cb53d2cb8e67c8f34c819d3f5e (diff) | |
Auto merge of #129275 - matthiaskrgr:rollup-qv64hg6, r=matthiaskrgr
Rollup of 6 pull requests Successful merges: - #129194 (Fix bootstrap test `detect_src_and_out` on Windows) - #129217 (safe transmute: check lifetimes) - #129223 ( Fix wrong argument for `get_fn_decl`) - #129235 (Check that `#[may_dangle]` is properly applied) - #129245 (Fix a typo in `rustc_hir` doc comment) - #129271 (Prevent double panic in query system, improve diagnostics) r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'src')
| -rw-r--r-- | src/bootstrap/src/core/config/tests.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/bootstrap/src/core/config/tests.rs b/src/bootstrap/src/core/config/tests.rs index 378d069672f..219c5a6ec91 100644 --- a/src/bootstrap/src/core/config/tests.rs +++ b/src/bootstrap/src/core/config/tests.rs @@ -96,8 +96,8 @@ fn detect_src_and_out() { test(parse(""), None); { - let build_dir = if cfg!(windows) { Some("C:\\tmp") } else { Some("/tmp") }; - test(parse("build.build-dir = \"/tmp\""), build_dir); + let build_dir = if cfg!(windows) { "C:\\tmp" } else { "/tmp" }; + test(parse(&format!("build.build-dir = '{build_dir}'")), Some(build_dir)); } } |