Make cargo a workspace #109133

weihanglo · 2023-03-14T18:22:49Z

8 commits in 7bf43f028ba5eb1f4d70d271c2546c38512c9875..39116ccc9b420a883a98a960f0597f9cf87414b8
2023-04-10 16:01:41 +0000 to 2023-04-15 20:24:15 +0000

Make cargo a workspace (Make cargo a workspace cargo#11851)
Fix flaky not_found_permutations test. (Fix flaky not_found_permutations test. cargo#11976)
Use restricted Damerau-Levenshtein algorithm (Use restricted Damerau-Levenshtein algorithm cargo#11963)
Correct the bug report for cargo clippy --fix (Correct the bug report for cargo clippy --fix cargo#11882)
Stabilize cargo logout (Stabilize cargo logout cargo#11950)
Add more information to HTTP errors to help with debugging. (Add more information to HTTP errors to help with debugging. cargo#11878)
Use registry.default for login/logout (Use registry.default for login/logout cargo#11949)
Change -C to be unstable (Change -C to be unstable cargo#11960)

What does this PR try to resolve?

Making cargo a workspace.

Why doing this?

rustc-workspace-hack is primarily for sharing dependencies between rls and cargo, as rls previously depends on cargo. After rls retired, it is no longer the case sharing dependencies.
It's q bit painful that cargo needs to deal with some dependency and licensing complexities. For example, Update cargo #108665 failed because of the interaction bewteen windows-sys and raw-dylib. It currenctly blocks cargo's feature -Zgitxodie from moving forward.
See Make cargo a workspace cargo#11851

Benchmark result

I've done a simple benchmark on both keeping or removing entire rustc-workspace-hack. It had no significant difference. Both took ~2m30s to finish ./x.py build -j8 src/tools/cargo src/tools/rls src/tools/clippy src/tools/miri src/tools/rustfmt. Environment info:

host: aarch64-apple-darwin
os: Mac OS 13.2.1 [64-bit]

A sophisticated benchmark may be needed.

Additional information

This depends on prior works from @Muscraft and @ehuss. Credits to them!

albertlarsan68 · 2023-03-14T18:33:05Z

Does this means that cargo will have its own Cargo.lock?

.gitmodules

weihanglo · 2023-03-14T19:11:42Z

@bors try

bors · 2023-03-14T19:11:52Z

⌛ Trying commit d4724e2fc45d91b6c6ccd6ce4c8ab6a4b05212bb with merge ffd9aff2c26946dbc701cdc41e080c17cc40789b...

weihanglo · 2023-03-14T20:31:54Z

Does this means that cargo will have its own Cargo.lock?

Exactly!

bors · 2023-03-14T21:21:07Z

💔 Test failed - checks-actions

weihanglo · 2023-03-15T00:11:14Z

Failed on openssl build. I guess it's rustc-workspace-hack including some curl-sys features causes the issue.

rust/src/tools/rustc-workspace-hack/Cargo.toml

Line 77 in 1716932

    
           curl-sys = { version = "0.4.13", features = ["http2", "libnghttp2-sys"], optional = true }

I've made a change in cargo to include curl/http2 in all-static feature.

Let's @bors try again.

bors · 2023-03-15T00:11:23Z

⌛ Trying commit 5c7b56bde2f25a99b03bdc1d525b0d0c55afd5dc with merge 9fa7021716eaa8f3cfccf9eb2c8dfaa209f8ee8e...

bors · 2023-03-15T02:01:52Z

💔 Test failed - checks-actions

weihanglo · 2023-03-15T15:31:18Z

@bors try

bors · 2023-03-15T15:31:30Z

⌛ Trying commit 9a7e8a1 with merge 8ea09f172814926c4c234f649b199f6aa9205307...

bors · 2023-03-15T17:21:53Z

💔 Test failed - checks-actions

bors · 2023-03-15T19:32:28Z

☔ The latest upstream changes (presumably #109164) made this pull request unmergeable. Please resolve the merge conflicts.

It is unnecessary to stream cargo JSON output.

weihanglo · 2023-04-16T18:34:35Z

openssl dependency now becomes a platform specific dependency of Cargo. Let's try again.

@bors r=ehuss rollup=never p=1

bors · 2023-04-16T18:34:37Z

📌 Commit 103ed0e has been approved by ehuss

It is now in the queue for this repository.

bors · 2023-04-16T19:26:05Z

⌛ Testing commit 103ed0e with merge d0f204e...

bors · 2023-04-16T21:37:44Z

☀️ Test successful - checks-actions
Approved by: ehuss
Pushing d0f204e to master...

rust-timer · 2023-04-16T23:24:44Z

Finished benchmarking commit (d0f204e): 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)	-	-	0
Regressions ❌ (secondary)	2.0%	[2.0%, 2.0%]	1
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-2.0%	[-2.5%, -1.2%]	3
All ❌✅ (primary)	-	-	0

Cycles

This benchmark run did not return any relevant results for this metric.

deps: drop serde feature from url, drop rustc-workspace-hack Cargo now have it's own workspace and rustc dropped [`rustc-workspace-hack`](rust-lang/rust#109133), so no need to unify features here; drop rustc-workspace-hack. changelog: none

RalfJung · 2023-06-04T16:19:30Z

So Cargo now is a separate workspace from the main rustc workspace? It was already in a workspace before, after all (so I am confused by the PR description). Doesn't that mean https://github.com/rust-lang/rust/blob/master/src/etc/rust_analyzer_settings.json needs updating? Cc @jyn514

Remove rustc-workspace-hack The `rustc-workspace-hack` dependency was removed in rust-lang/rust#109133 and should no longer be needed.

albertlarsan68 · 2023-06-04T16:50:04Z

I do not think that this is needed, since not many people will do cargo development in the Rustc repo, and the needed dependencies (if any) should already be set as path deps.

ehuss · 2023-06-04T16:51:46Z

Sorry, I'm not familiar with rust-analyzer settings, so I don't know.

jyn514 · 2023-06-04T16:57:51Z

@RalfJung #111998

jyn514 · 2023-06-04T16:58:16Z

ah, looks like i missed cargo there - happy to take a PR adding it

Remove rustc-workspace-hack The `rustc-workspace-hack` dependency was removed in rust-lang#109133 and should no longer be needed.

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 Mar 14, 2023

weihanglo mentioned this pull request Mar 14, 2023

Make cargo a workspace rust-lang/cargo#11851

Merged

7 tasks

weihanglo commented Mar 14, 2023

View reviewed changes

.gitmodules Outdated Show resolved Hide resolved

bors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Mar 14, 2023

weihanglo force-pushed the make-cargo-a-workspace branch from bd24787 to 5c7b56b Compare March 15, 2023 00:06

This comment has been minimized.

Sign in to view

weihanglo force-pushed the make-cargo-a-workspace branch from 5c7b56b to 9a7e8a1 Compare March 15, 2023 13:56

This comment was marked as outdated.

Sign in to view

This comment has been minimized.

Sign in to view

weihanglo force-pushed the make-cargo-a-workspace branch 2 times, most recently from b34783c to a6c6912 Compare March 17, 2023 13:10

bootstrap: switch from stream_cargo to try_run_quiet

103ed0e

It is unnecessary to stream cargo JSON output.

weihanglo force-pushed the make-cargo-a-workspace branch from 4081b34 to 103ed0e Compare April 16, 2023 18:32

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 Apr 16, 2023

bors added the merged-by-bors This PR was explicitly merged by bors. label Apr 16, 2023

bors merged commit d0f204e into rust-lang:master Apr 16, 2023

rustbot added this to the 1.71.0 milestone Apr 16, 2023

weihanglo deleted the make-cargo-a-workspace branch April 16, 2023 21:38

klensy mentioned this pull request May 25, 2023

deps: drop serde feature from url, drop rustc-workspace-hack rust-lang/rust-clippy#10824

Merged

This was referenced Jun 4, 2023

Remove rustc-workspace-hack rust-lang/rustfmt#5776

Merged

Remove rustc-workspace-hack rust-lang/miri#2916

Merged

bors added a commit to rust-lang/miri that referenced this pull request Jun 4, 2023

Auto merge of #2916 - ehuss:remove-workspace-hack, r=RalfJung

9fa049f

Remove rustc-workspace-hack The `rustc-workspace-hack` dependency was removed in rust-lang/rust#109133 and should no longer be needed.

nsarlin-zama mentioned this pull request Jul 12, 2024

Ns/versionize clean zama-ai/tfhe-rs#1326

Merged

4 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Make cargo a workspace #109133

Make cargo a workspace #109133

weihanglo commented Mar 14, 2023 •

edited

Loading

albertlarsan68 commented Mar 14, 2023

weihanglo commented Mar 14, 2023

bors commented Mar 14, 2023

weihanglo commented Mar 14, 2023

bors commented Mar 14, 2023

weihanglo commented Mar 15, 2023

bors commented Mar 15, 2023

This comment has been minimized.

bors commented Mar 15, 2023

This comment has been minimized.

weihanglo commented Mar 15, 2023

bors commented Mar 15, 2023

bors commented Mar 15, 2023

This comment was marked as outdated.

This comment has been minimized.

bors commented Mar 15, 2023

weihanglo commented Apr 16, 2023

bors commented Apr 16, 2023

bors commented Apr 16, 2023

bors commented Apr 16, 2023

rust-timer commented Apr 16, 2023

RalfJung commented Jun 4, 2023 •

edited

Loading

albertlarsan68 commented Jun 4, 2023

ehuss commented Jun 4, 2023

jyn514 commented Jun 4, 2023

jyn514 commented Jun 4, 2023

Make cargo a workspace #109133

Make cargo a workspace #109133

Conversation

weihanglo commented Mar 14, 2023 • edited Loading

What does this PR try to resolve?

Benchmark result

Additional information

albertlarsan68 commented Mar 14, 2023

weihanglo commented Mar 14, 2023

bors commented Mar 14, 2023

weihanglo commented Mar 14, 2023

bors commented Mar 14, 2023

weihanglo commented Mar 15, 2023

bors commented Mar 15, 2023

This comment has been minimized.

bors commented Mar 15, 2023

This comment has been minimized.

weihanglo commented Mar 15, 2023

bors commented Mar 15, 2023

bors commented Mar 15, 2023

This comment was marked as outdated.

This comment has been minimized.

bors commented Mar 15, 2023

weihanglo commented Apr 16, 2023

bors commented Apr 16, 2023

bors commented Apr 16, 2023

bors commented Apr 16, 2023

rust-timer commented Apr 16, 2023

Overall result: no relevant changes - no action needed

Instruction count

Max RSS (memory usage)

Cycles

RalfJung commented Jun 4, 2023 • edited Loading

albertlarsan68 commented Jun 4, 2023

ehuss commented Jun 4, 2023

jyn514 commented Jun 4, 2023

jyn514 commented Jun 4, 2023

weihanglo commented Mar 14, 2023 •

edited

Loading

RalfJung commented Jun 4, 2023 •

edited

Loading