Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update cargo #112601

Merged
merged 1 commit into from
Jun 15, 2023
Merged

Update cargo #112601

merged 1 commit into from
Jun 15, 2023

Conversation

weihanglo
Copy link
Member

@weihanglo weihanglo commented Jun 14, 2023 •
edited
Loading

11 commits in 49b6d9e179a91cf7645142541c9563443f64bf2b..0c14026aa84ee2ec4c67460c0a18abc8519ca6b2
2023-06-09 17:21:19 +0000 to 2023-06-14 18:43:05 +0000

This commit also update LICENSE exceptions, as Cargo introduced a newer version of dunce and blake3 as dependencies.

r? @ghost

@rustbot rustbot added A-testsuite Area: The testsuite used to check the correctness of rustc S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) labels Jun 14, 2023
@rustbot
Copy link
Collaborator

rustbot commented Jun 14, 2023

Some changes occurred in src/tools/cargo

cc @ehuss

@weihanglo
Copy link
Member Author

Several dependencies updated, including some critical C libs. A bit risky (?), so no rollup.

@bors r+ p=1 rollup=never

@bors
Copy link
Contributor

bors commented Jun 14, 2023

📌 Commit cb8531c2edf99d89eb82320a0447b9b3d22bb7cc has been approved by weihanglo

It is now in the queue for this repository.

@bors bors added S-waiting-on-bors 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 Jun 14, 2023
@weihanglo weihanglo mentioned this pull request Jun 14, 2023
Merged
@bors
Copy link
Contributor

bors commented Jun 14, 2023

⌛ Testing commit cb8531c2edf99d89eb82320a0447b9b3d22bb7cc with merge b616e29e7e5e0e4688f772e9bb8a768c8b385080...

@bors
Copy link
Contributor

bors commented Jun 14, 2023

💔 Test failed - checks-actions

@bors bors added S-waiting-on-review 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 Jun 14, 2023
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@weihanglo
Copy link
Member Author

@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?

rust/src/ci/github-actions/ci.yml

Lines 610 to 612 in fa8762b

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

@epage
Copy link
Contributor

epage commented Jun 14, 2023

@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
Merged
Merged
bors added a commit to rust-lang/cargo that referenced this pull request Jun 14, 2023
@bors
Auto merge of #12269 - epage:bin, r=weihanglo
0c14026 
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
@weihanglo
Copy link
Member Author

Going to try it again with the new fix.

@bors r+ p=1 rollup=never

@bors
Copy link
Contributor

bors commented Jun 14, 2023

📌 Commit b40b92f has been approved by weihanglo

It is now in the queue for this repository.

@bors bors added S-waiting-on-bors 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 Jun 14, 2023
@bors
Copy link
Contributor

bors commented Jun 14, 2023

⌛ Testing commit b40b92f with merge 7db1f0dfef76d37488315708db10c713b34071c0...

@rust-log-analyzer
Copy link
Collaborator

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.

@bors
Copy link
Contributor

bors commented Jun 15, 2023

💔 Test failed - checks-actions

@bors bors added S-waiting-on-review 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 Jun 15, 2023
@weihanglo
Copy link
Member Author 

   == 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

@bors bors added S-waiting-on-bors 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 Jun 15, 2023
@bors
Copy link
Contributor

bors commented Jun 15, 2023

⌛ Testing commit b40b92f with merge 5a65be8...

@bors
Copy link
Contributor

bors commented Jun 15, 2023

☀️ Test successful - checks-actions
Approved by: weihanglo
Pushing 5a65be8 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Jun 15, 2023
@bors bors merged commit 5a65be8 into rust-lang:master Jun 15, 2023
@rustbot rustbot added this to the 1.72.0 milestone Jun 15, 2023
@weihanglo weihanglo deleted the update-cargo branch June 15, 2023 09:46
@rust-timer
Copy link
Collaborator

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 Jun 17, 2023
@bors
Auto merge of #12268 - epage:direct, r=weihanglo
0d5370a 
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.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
A-testsuite Area: The testsuite used to check the correctness of rustc merged-by-bors This PR was explicitly merged by bors. S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap)
Projects
None yet
Milestone
1.72.0
Development

Successfully merging this pull request may close these issues.
6 participants
@weihanglo @rustbot @bors @rust-log-analyzer @epage @rust-timer