Update cargo #108665

weihanglo · 2023-03-02T17:46:04Z

25 commits in 9880b408a3af50c08fab3dbf4aa2a972df71e951..7d3033d2e59383fd76193daf9423c3d141972a7d
2023-02-28 19:39:39 +0000 to 2023-03-08 17:05:08 +0000

Revert "feat: Use test name for dir when running tests cargo#11738" - Use test name for dir when running tests (Revert "#11738" - Use test name for dir when running tests cargo#11812)
Update CHANGELOG for 1.68 backports (Update CHANGELOG for 1.68 backports cargo#11810)
Add CARGO_PKG_README (Add CARGO_PKG_README cargo#11645)
path dependency: fix cargo-util version (path dependency: fix cargo-util version cargo#11807)
Adding display of which target failed to compile (Adding display of which target failed to compile cargo#11636)
Fix CARGO_CFG_ vars for configs defined both with and without value (Fix CARGO_CFG_ vars for configs defined both with and without value cargo#11790)
Breaking endless loop on cyclic features in added dependency in cargo-add (Breaking endless loop on cyclic features in added dependency in cargo-add cargo#11805)
Enhance the doc of timing report with graphs (Enhance the doc of timing report with graphs cargo#11798)
Make sparse the default protocol for crates.io (Make sparse the default protocol for crates.io cargo#11791)
Use sha2 to calculate SHA256 (Use sha2 to calculate SHA256 cargo#11795)
gitoxide progress bar fixes (gitoxide progress bar fixes cargo#11800)
Check publish_to_alt_registry publish content (Check publish_to_alt_registry publish content cargo#11799)
chore: fix missing files in autolabel trigger_files (chore: fix missing files in autolabel trigger_files cargo#11797)
chore: Update base64 (chore: Update base64 cargo#11796)
Fix some doc typos (Fix some doc typos cargo#11794)
chore(ci): Enforce cargo-deny in CI (chore(ci): Enforce cargo-deny in CI cargo#11761)
Some cleanup for unstable docs (Some cleanup for unstable docs cargo#11793)
gitoxide integration: fetch (gitoxide integration: fetch cargo#11448)
patch can conflict on not activated packages (patch can conflict on not activated packages cargo#11770)
fix(toml): Provide a way to show unused manifest keys for dependencies (fix(toml): Provide a way to show unused manifest keys for dependencies cargo#11630)
Improve error for missing crate in --offline mode for sparse index (Improve error for missing crate in --offline mode for sparse index cargo#11783)
feat(resolver): -Zdirect-minimal-versions (feat(resolver): -Zdirect-minimal-versions cargo#11688)
feat: Use test name for dir when running tests (feat: Use test name for dir when running tests cargo#11738)
Jobserver cleanup (Jobserver cleanup cargo#11764)
Fix help string for "--charset" option of "cargo tree" (Fix help string for "--charset" option of "cargo tree" cargo#11785)

~~This update is primarily for making rust-lang/cargo#11630 into 1.69~~ (will file a beta backport then). However, just look into the licenses and dependencies permitted list, it looks a bit unfortunate but inevitable I guess?

r? @ehuss
cc @Muscraft

rustbot · 2023-03-02T17:46:10Z

⚠️ Warning ⚠️

These commits modify submodules.

rustbot · 2023-03-02T17:46:14Z

These commits modify the Cargo.lock file. Random changes to Cargo.lock can be introduced when switching branches and rebasing PRs.
This was probably unintentional and should be reverted before this PR is merged.

If this was intentional then you can ignore this comment.

Some changes occurred in src/tools/cargo

cc @ehuss

weihanglo · 2023-03-02T17:46:18Z

@bors rollup=never

src/tools/tidy/src/deps.rs

ehuss · 2023-03-02T18:23:53Z

I reached out to the compiler team to look at the dependency update for tempfile at https://rust-lang.zulipchat.com/#narrow/stream/131828-t-compiler/topic/tempfile.20update/near/339174848.

It looks like it introduces a new warning in compiler/rustc_data_structures/src/temp_dir.rs which needs the same fix as was done in cargo.

weihanglo · 2023-03-03T17:01:45Z

@ehuss This is ready for a second round of review. I hope the fix looks fine.

ehuss · 2023-03-04T00:05:11Z

@bors r+ p=1

bors · 2023-03-04T00:05:13Z

📌 Commit b51d127bb02b76ece6de30a2dba98e8502ab4cae has been approved by ehuss

It is now in the queue for this repository.

bors · 2023-03-04T01:40:12Z

⌛ Testing commit b51d127bb02b76ece6de30a2dba98e8502ab4cae with merge aaa448d5735672b51256df9283469b4ed9887938...

bors · 2023-03-04T01:55:01Z

💔 Test failed - checks-actions

sunfishcode · 2023-03-04T06:22:01Z

It appears to be a problem with rustix containing references to pwritev64v2 and preadv64v2 which are not defined on older GLIBC versions. I'm preparing a rustix update.

sunfishcode · 2023-03-04T08:09:52Z

I've now released rustix 0.36.9 with a fix for the pwritev64v2/preadv64v2 error.

weihanglo · 2023-03-04T10:04:30Z

@sunfishcode thanks for the quick patch!

I'll go ahead and merge it. Please shout out if you think it is wrong.

@bors r+ p=1 rollup=never

bors · 2023-03-04T10:04:31Z

📌 Commit e22675fd186a5d09cfca2690e0e7ee3cfdff402b has been approved by weihanglo

It is now in the queue for this repository.

weihanglo · 2023-03-08T18:25:59Z

Now rust-lang/cargo#11738 is reverted.
Let's give @bors try another chance.

bors · 2023-03-08T18:26:09Z

⌛ Trying commit 2fc970321353d3677952cb219e728c44fd47c71c with merge 62c208e611d34224f83b96ca5b49e8a43c72096a...

bors · 2023-03-08T19:15:20Z

☀️ Try build successful - checks-actions
Build commit: 62c208e611d34224f83b96ca5b49e8a43c72096a (62c208e611d34224f83b96ca5b49e8a43c72096a)

weihanglo · 2023-03-08T19:16:59Z

It passed!
@bors r+

bors · 2023-03-08T19:17:01Z

📌 Commit 8ac95bb has been approved by weihanglo

It is now in the queue for this repository.

bors · 2023-03-08T20:04:30Z

⌛ Testing commit 8ac95bb with merge 900c354...

bors · 2023-03-08T22:48:09Z

☀️ Test successful - checks-actions
Approved by: weihanglo
Pushing 900c354 to master...

rust-timer · 2023-03-09T00:28:17Z

Finished benchmarking commit (900c354): comparison URL.

Overall result: ❌ regressions - ACTION NEEDED

Next Steps: If you can justify the regressions found in this perf run, please indicate this with @rustbot label: +perf-regression-triaged along with sufficient written justification. If you cannot justify the regressions please open an issue or create a new PR that fixes the regressions, add a comment linking to the newly created issue or PR, and then add the perf-regression-triaged label to this PR.

@rustbot label: +perf-regression
cc @rust-lang/wg-compiler-performance

Instruction count

This is a highly reliable metric that was used to determine the overall result at the top of this comment.

	mean	range	count
Regressions ❌ (primary)	0.3%	[0.3%, 0.4%]	8
Regressions ❌ (secondary)	0.3%	[0.1%, 0.5%]	13
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-0.3%	[-0.3%, -0.3%]	2
All ❌✅ (primary)	0.3%	[0.3%, 0.4%]	8

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)	3.2%	[3.1%, 3.2%]	2
Regressions ❌ (secondary)	0.9%	[0.9%, 0.9%]	1
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-2.1%	[-2.4%, -1.7%]	3
All ❌✅ (primary)	3.2%	[3.1%, 3.2%]	2

Cycles

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.8%	[0.7%, 0.8%]	2
Regressions ❌ (secondary)	1.3%	[1.3%, 1.4%]	2
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-	-	0
All ❌✅ (primary)	0.8%	[0.7%, 0.8%]	2

Mark-Simulacrum · 2023-03-14T13:26:05Z

This looks quite likely to be noise, so marking as triaged.

…ehuss Make cargo a workspace 8 commits in 7bf43f028ba5eb1f4d70d271c2546c38512c9875..39116ccc9b420a883a98a960f0597f9cf87414b8 2023-04-10 16:01:41 +0000 to 2023-04-15 20:24:15 +0000 - Make cargo a workspace (rust-lang/cargo#11851) - Fix flaky not_found_permutations test. (rust-lang/cargo#11976) - Use restricted Damerau-Levenshtein algorithm (rust-lang/cargo#11963) - Correct the bug report for `cargo clippy --fix` (rust-lang/cargo#11882) - Stabilize `cargo logout` (rust-lang/cargo#11950) - Add more information to HTTP errors to help with debugging. (rust-lang/cargo#11878) - Use registry.default for login/logout (rust-lang/cargo#11949) - Change -C to be unstable (rust-lang/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, rust-lang#108665 failed because of the interaction bewteen `windows-sys` and `raw-dylib`. It currenctly blocks cargo's feature `-Zgitxodie` from moving forward. * See rust-lang/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!

Update windows-sys This updates the windows-sys dependency from 0.45 to 0.48. This shouldn't add or remove any duplicate dependencies (since there are other dependencies still using 0.45 and 0.42). The intent is to move it along the direction towards unifying in the future (though it seems like a moving target that will be difficult to ever hit). This also bumps the home crate version. I think it should be OK to make the migration from winapi to windows-sys a patch version, though there seems to be some issues with the way windows-sys works that could introduce some build-time problems in some situations (such as those encountered in rust-lang/rust#108665 and rust-lang/rust#106610). However, I don't expect too much of an issue.

rustbot assigned ehuss Mar 2, 2023

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. labels Mar 2, 2023

ehuss reviewed Mar 2, 2023

View reviewed changes

src/tools/tidy/src/deps.rs Outdated Show resolved Hide resolved

oli-obk self-assigned this Mar 2, 2023

weihanglo force-pushed the update-cargo branch from 59ec37d to bfbf0e8 Compare March 2, 2023 19:25

This comment has been minimized.

Sign in to view

oli-obk approved these changes Mar 3, 2023

View reviewed changes

rustbot added the T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. label Mar 3, 2023

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

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

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

This comment has been minimized.

Sign in to view

weihanglo force-pushed the update-cargo branch from 2fc9703 to 8ac95bb Compare March 8, 2023 19:16

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

bors added the merged-by-bors This PR was explicitly merged by bors. label Mar 8, 2023

bors merged commit 900c354 into rust-lang:master Mar 8, 2023

rustbot added this to the 1.70.0 milestone Mar 8, 2023

weihanglo deleted the update-cargo branch March 8, 2023 22:49

rustbot added the perf-regression Performance regression. label Mar 9, 2023

This comment has been minimized.

Sign in to view

epage mentioned this pull request Mar 10, 2023

Tracking Issue for -Zgitoxide rust-lang/cargo#11813

Open

15 tasks

Mark-Simulacrum added the perf-regression-triaged The performance regression has been triaged. label Mar 14, 2023

weihanglo mentioned this pull request Mar 14, 2023

Make cargo a workspace #109133

Merged

ehuss mentioned this pull request Apr 23, 2023

Update windows-sys rust-lang/cargo#12021

Merged

matthiaskrgr mentioned this pull request Oct 10, 2023

Compiler Error while trying to prototype a workaround for const methods in traits #116599

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Update cargo #108665

Update cargo #108665

weihanglo commented Mar 2, 2023 •

edited

Loading

rustbot commented Mar 2, 2023

rustbot commented Mar 2, 2023

weihanglo commented Mar 2, 2023

ehuss commented Mar 2, 2023

This comment has been minimized.

weihanglo commented Mar 3, 2023

ehuss commented Mar 4, 2023

bors commented Mar 4, 2023

bors commented Mar 4, 2023

bors commented Mar 4, 2023

sunfishcode commented Mar 4, 2023

sunfishcode commented Mar 4, 2023

weihanglo commented Mar 4, 2023

bors commented Mar 4, 2023

This comment has been minimized.

weihanglo commented Mar 8, 2023

bors commented Mar 8, 2023

bors commented Mar 8, 2023

weihanglo commented Mar 8, 2023

bors commented Mar 8, 2023

bors commented Mar 8, 2023

bors commented Mar 8, 2023

rust-timer commented Mar 9, 2023

This comment has been minimized.

This comment has been minimized.

Mark-Simulacrum commented Mar 14, 2023

Update cargo #108665

Update cargo #108665

Conversation

weihanglo commented Mar 2, 2023 • edited Loading

rustbot commented Mar 2, 2023

rustbot commented Mar 2, 2023

weihanglo commented Mar 2, 2023

ehuss commented Mar 2, 2023

This comment has been minimized.

weihanglo commented Mar 3, 2023

ehuss commented Mar 4, 2023

bors commented Mar 4, 2023

bors commented Mar 4, 2023

bors commented Mar 4, 2023

sunfishcode commented Mar 4, 2023

sunfishcode commented Mar 4, 2023

weihanglo commented Mar 4, 2023

bors commented Mar 4, 2023

This comment has been minimized.

weihanglo commented Mar 8, 2023

bors commented Mar 8, 2023

bors commented Mar 8, 2023

weihanglo commented Mar 8, 2023

bors commented Mar 8, 2023

bors commented Mar 8, 2023

bors commented Mar 8, 2023

rust-timer commented Mar 9, 2023

Overall result: ❌ regressions - ACTION NEEDED

Instruction count

Max RSS (memory usage)

Cycles

This comment has been minimized.

This comment has been minimized.

Mark-Simulacrum commented Mar 14, 2023

weihanglo commented Mar 2, 2023 •

edited

Loading