Commit ec4e11a
committed
Auto merge of #125930 - weihanglo:opt-dist-respect-cargo-config, r=<try>
feat(opt-dist): respect existing .cargo/config.toml
This should be the last piece toward self-contained `opt-dist` (I believe).
It fixes the issue described in #125465
> * The current pinned rustc-perf uses `tempfile::Tempdir` as the working
directory when collecting profiles from some of these packages.
This "tmp" working directory usage make it impossible for Cargo to pick
up the correct vendor sources setting in `.cargo/config.toml` bundled
in the rustc-src tarball. [^1]
> [^1]: https://github.com/rust-lang/rustc-perf/blob/4f313add609f43e928e98132358e8426ed3969ae/collector/src/compile/benchmark/mod.rs#L164-L173
See also
* <rust-lang/rustc-perf#1913>
* <#125465>
* https://rust-lang.zulipchat.com/#narrow/stream/247081-t-compiler.2Fperformance/topic/tempfile.20in.20rustc-perf.20make.20it.20hard.20to.20configure.20vendor
r? Kobzol2 files changed
+12
-3
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
36 | 36 | | |
37 | 37 | | |
38 | 38 | | |
39 | | - | |
| 39 | + | |
40 | 40 | | |
41 | 41 | | |
42 | 42 | | |
| |||
61 | 61 | | |
62 | 62 | | |
63 | 63 | | |
64 | | - | |
| 64 | + | |
| 65 | + | |
| 66 | + | |
| 67 | + | |
| 68 | + | |
| 69 | + | |
| 70 | + | |
| 71 | + | |
| 72 | + | |
| 73 | + | |
65 | 74 | | |
66 | 75 | | |
67 | 76 | | |
| |||
Submodule rustc-perf updated 12 files
- Cargo.lock+31-87
- collector/Cargo.toml+1-1
- collector/README.md+6-1
- collector/src/artifact_stats.rs+3
- collector/src/bin/collector.rs+9-5
- collector/src/compile/execute/mod.rs+4
- collector/src/runtime/benchmark.rs+4
- collector/src/toolchain.rs+9-5
- site/Cargo.toml+1-1
- site/src/api.rs+1-1
- site/src/request_handlers/github.rs+1-1
- triage/2024-05-27.md+153
0 commit comments