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.

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

Update cargo #118275

Merged
merged 1 commit into from
Nov 25, 2023
Merged

Update cargo #118275

merged 1 commit into from
Nov 25, 2023

Conversation

weihanglo
Copy link
Member

7 commits in 71cd3a926f0cf41eeaf9f2a7f2194b2aff85b0f6..9b13310ca596020a737aaa47daa4ed9ff8898a2f
2023-11-20 15:30:57 +0000 to 2023-11-24 16:20:51 +0000


This also removes the check to ensure that rustfix between

  • src/tools/cargo
  • src/tools/compiletest

has the same version,
since rust-lang/rustfix has migrated to under rust-lang/cargo.

r? ghost

This removes the check to ensure that `rustfix` between

* src/tools/cargo
* src/tools/compiletest

has the same version,
since `rust-lang/rustfix` has migrated to under `rust-lang/cargo`.
@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 Nov 25, 2023
@rustbot
Copy link
Collaborator

rustbot commented Nov 25, 2023

The list of allowed third-party dependencies may have been modified! You must ensure that any new dependencies have compatible licenses before merging.

cc @davidtwco, @wesleywiser

Some changes occurred in src/tools/cargo

cc @ehuss

@weihanglo
Copy link
Member Author

r? ehuss

If you could help check that the change is correct.

@ehuss
Copy link
Contributor

ehuss commented Nov 25, 2023

@bors r+ rollup=never p=1

@bors
Copy link
Contributor

bors commented Nov 25, 2023

📌 Commit 9b013bb 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 Nov 25, 2023
@bors
Copy link
Contributor

bors commented Nov 25, 2023

⌛ Testing commit 9b013bb with merge f5dc265...

@bors
Copy link
Contributor

bors commented Nov 25, 2023

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

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Nov 25, 2023
@bors bors merged commit f5dc265 into rust-lang:master Nov 25, 2023
12 checks passed
@rustbot rustbot added this to the 1.76.0 milestone Nov 25, 2023
@weihanglo weihanglo deleted the update-cargo branch November 26, 2023 00:18
@rust-timer
Copy link
Collaborator

Finished benchmarking commit (f5dc265): 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)
- - 0
Improvements ✅
(primary)
- - 0
Improvements ✅
(secondary)
-3.0% [-4.7%, -1.2%] 2
All ❌✅ (primary) - - 0

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: 675.077s -> 674.609s (-0.07%)
Artifact size: 313.29 MiB -> 313.33 MiB (0.01%)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in 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)
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants