Skip to content

Update cargo #112120

New issue

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

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

Already on GitHub? # to your account

Merged
merged 2 commits into from
May 31, 2023
Merged

Update cargo #112120

merged 2 commits into from
May 31, 2023

Conversation

weihanglo
Copy link
Member

17 commits in 64fb38c97ac4d3a327fc9032c862dd28c8833b17..f7b95e31642e09c2b6eabb18ed75007dda6677a0
2023-05-23 18:53:23 +0000 to 2023-05-30 19:25:02 +0000

r? @ghost

@rustbot rustbot added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label May 30, 2023
@rustbot
Copy link
Collaborator

rustbot commented May 30, 2023

Some changes occurred in src/tools/cargo

cc @ehuss

@weihanglo
Copy link
Member Author

Oh I need to update workspace.resolver = "1"

@rustbot rustbot added the T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) label May 30, 2023
weihanglo added 2 commits May 31, 2023 00:08
rust-lang/cargo#10910 starts emitting warning if resolver is not set
for 2021 edition package. We want to surpress the warning for now.
@rustbot rustbot added A-testsuite Area: The testsuite used to check the correctness of rustc T-infra Relevant to the infrastructure team, which will review and decide on the PR/issue. labels May 30, 2023
@weihanglo
Copy link
Member Author

r? @ehuss

I added it to four Cargo.toml. Any other place I missed needs `resolver = "1"?

@ehuss
Copy link
Contributor

ehuss commented May 31, 2023

I think that looks correct. I went ahead and opened rust-lang/stdarch#1435 to cover the stdarch submodule.

@bors r+ p=1

@bors
Copy link
Collaborator

bors commented May 31, 2023

📌 Commit 6f07116 has been approved by ehuss

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 May 31, 2023
@bors
Copy link
Collaborator

bors commented May 31, 2023

⌛ Testing commit 6f07116 with merge f51fca3...

@bors
Copy link
Collaborator

bors commented May 31, 2023

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

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label May 31, 2023
@bors bors merged commit f51fca3 into rust-lang:master May 31, 2023
@rustbot rustbot added this to the 1.72.0 milestone May 31, 2023
@weihanglo weihanglo deleted the update-cargo branch May 31, 2023 06:48
@rust-timer
Copy link
Collaborator

Finished benchmarking commit (f51fca3): 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)
3.6% [2.5%, 4.6%] 2
Improvements ✅
(primary)
-4.5% [-4.5%, -4.5%] 1
Improvements ✅
(secondary)
-2.5% [-2.5%, -2.5%] 1
All ❌✅ (primary) -4.5% [-4.5%, -4.5%] 1

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: 643.102s -> 643.402s (0.05%)

# for free to join this conversation on GitHub. Already have an account? # to comment
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) T-infra Relevant to the infrastructure team, which will review and decide on the PR/issue.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants