Update cargo by weihanglo · Pull Request #112601 · rust-lang/rust (original) (raw)
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.Learn more about bidirectional Unicode characters
[ Show hidden characters]({{ revealButtonHref }})
Area: The testsuite used to check the correctness of rustc
Status: Awaiting review from the assignee but also interested parties.
Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap)
labels
Some changes occurred in src/tools/cargo
cc @ehuss
Several dependencies updated, including some critical C libs. A bit risky (?), so no rollup.
@bors r+ p=1 rollup=never
📌 Commit cb8531c2edf99d89eb82320a0447b9b3d22bb7cc has been approved by weihanglo
It is now in the queue for this repository.
Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
and removed S-waiting-on-review
Status: Awaiting review from the assignee but also interested parties.
labels
⌛ Testing commit cb8531c2edf99d89eb82320a0447b9b3d22bb7cc with merge b616e29e7e5e0e4688f772e9bb8a768c8b385080...
Status: Awaiting review from the assignee but also interested parties.
and removed S-waiting-on-bors
Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
labels
This comment has been minimized.
@epage could you help check the failure? I've tried building with --release flag on GitHub Actions and have a hard time reproducing it. Might be something related to --enabled-lld, or something related to EXE_SUFFIX change?
| env: |
|---|
| SCRIPT: python x.py --stage 2 test src/tools/cargotest src/tools/cargo |
| RUST_CONFIGURE_ARGS: --build=x86_64-pc-windows-msvc --enable-lld |
@weihanglo my best guess is we are running into path length limits C:\a\rust\rust\build\x86_64-pc-windows-msvc\stage2-tools\x86_64-pc-windows-msvc\tmp\cit\t2405\home\.cargo\eval\target\eval\99\6b\f453c13f041cf91ef0e9189d6ed62e4050c4a952c7bcadc4a3ccc143fa10\script\target\debug\deps\script_996bf453c13f041cf91ef0e9189d6ed62e4050c4a952c7bcadc4a3ccc143fa10.exe is 290 characters long
This was referenced
Jun 14, 2023
bors added a commit to rust-lang/cargo that referenced this pull request
fix(embedded): Don't append hash to bin names
What does this PR try to resolve?
More immediately, this is to unblock rust-lang/rust#112601
The hash existed for sharing a target directory. That code isn't implemented yet and a per-user build cache might remove the need for it, so let's remove it for now and more carefully weigh adding it back in.
In general, this is also the more appropriate way for a feature that would be first class.
How should we test and review this PR?
This originally built on #12268 but now stands alone as the other PR has windows issues to work out
Additional information
Going to try it again with the new fix.
@bors r+ p=1 rollup=never
📌 Commit b40b92f has been approved by weihanglo
It is now in the queue for this repository.
Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
and removed S-waiting-on-review
Status: Awaiting review from the assignee but also interested parties.
labels
⌛ Testing commit b40b92f with merge 7db1f0dfef76d37488315708db10c713b34071c0...
The job aarch64-gnu failed! Check out the build log: (web) (plain)
Click to see the possible cause of the failure (guessed by this bot)
Compiling regex-syntax v0.6.26
Compiling rustc-demangle v0.1.21
[RUSTC-TIMING] rustc_demangle test:false 1.889
[RUSTC-TIMING] aho_corasick test:false 2.004
##[error]The runner has received a shutdown signal. This can happen when the runner service is stopped, or a manually started runner is canceled.
Status: Awaiting review from the assignee but also interested parties.
and removed S-waiting-on-bors
Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
labels
== clock drift check ==
local time: Thu Jun 15 00:02:18 UTC 2023
Session terminated, killing shell... ...killed.
time="2023-06-15T00:02:18Z" level=error msg="error waiting for container: unexpected EOF"
network time:
Error: The operation was canceled.
Looks like unrelated to Cargo change. Could be a spurious network issue.
@bors retry
Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
and removed S-waiting-on-review
Status: Awaiting review from the assignee but also interested parties.
labels
Finished benchmarking commit (5a65be8): comparison URL.
Overall result: no relevant changes - no action needed
@rustbot label: -perf-regression
Instruction count
This benchmark run did not return any relevant results for this metric.
Max RSS (memory usage)
Results
This is a less reliable metric that may be of interest but was not used to determine the overall result at the top of this comment.
| mean | range | count | |
|---|---|---|---|
| Regressions ❌ (primary) | 2.7% | [1.6%, 3.8%] | 2 |
| Regressions ❌ (secondary) | - | - | 0 |
| Improvements ✅ (primary) | - | - | 0 |
| Improvements ✅ (secondary) | -1.4% | [-1.4%, -1.4%] | 1 |
| All ❌✅ (primary) | 2.7% | [1.6%, 3.8%] | 2 |
Cycles
This benchmark run did not return any relevant results for this metric.
Binary size
This benchmark run did not return any relevant results for this metric.
Bootstrap: 647.125s -> 646.601s (-0.08%)
bors added a commit to rust-lang/cargo that referenced this pull request
fix(embedded): Don't create an intermediate manifest
What does this PR try to resolve?
More immediately, this is to unblock rust-lang/rust#112601
More generally, this gets us away from hackily writing out an out-of-line manifest from an embedded manifest. To parse the manifest, we have to write it out so our regular manifest loading code could handle it. This updates the manifest parsing code to handle it.
This doesn't mean this will work everywhere in all cases though. For example, ephemeral workspaces parses a manifest from the SourceId and these won't have valid SourceIds.
As a consequence, Cargo.lock and CARGO_TARGET_DIR are changing from being next to
the temp manifest to being next to the script. This still isn't the
desired behavior but stepping stones.
How should we test and review this PR?
A Commit at a time
Additional information
In production code, this does not conflict with #12255 (due to #12262) but in test code, it does.
Labels
Area: The testsuite used to check the correctness of rustc
This PR was explicitly merged by bors.
Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap)