Skip to content

Update cargo#108330

Merged
bors merged 1 commit intorust-lang:masterfrom
weihanglo:update-cargo
Feb 23, 2023
Merged

Update cargo#108330
bors merged 1 commit intorust-lang:masterfrom
weihanglo:update-cargo

Conversation

@weihanglo
Copy link
Member

@weihanglo weihanglo commented Feb 22, 2023 •
edited
Loading

15 commits in 17b3d0de0897e1c6b8ca347bd39f850bb0a5b9f6..9d5b32f503fc099c4064298465add14d4bce11e6
2023-02-17 19:45:09 +0000 to 2023-02-22 23:04:16 +0000

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

rustbot commented Feb 22, 2023

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
Copy link
Member Author

weihanglo commented Feb 22, 2023

Lockfile change looks reasonable and expected.

@bors r+ p=1

@bors
Copy link
Collaborator

bors commented Feb 22, 2023

📌 Commit 391a243d6b3695631cd8f333b5ea1f9fd1b296d9 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 Feb 22, 2023
@akiirui
Copy link

akiirui commented Feb 22, 2023

I think we should wait for curl to release curl/curl@821f6e2, and update curl-sys to prevent rust-lang/cargo#11746.

@bors
Copy link
Collaborator

bors commented Feb 22, 2023

⌛ Testing commit 391a243d6b3695631cd8f333b5ea1f9fd1b296d9 with merge a5493c220346b834c479119a0a356717fd6c1c3e...

@weihanglo
Copy link
Member Author

weihanglo commented Feb 22, 2023

Valid.
Should either wait or revert.

@bors r-

@bors 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-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Feb 22, 2023
@bors
Copy link
Collaborator

bors commented Feb 22, 2023

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

1 similar comment
@bors
Copy link
Collaborator

bors commented Feb 22, 2023

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

@weihanglo
Update cargo
80bea6c 
15 commits in 17b3d0de0897e1c6b8ca347bd39f850bb0a5b9f6..9d5b32f503fc099c4064298465add14d4bce11e6
2023-02-17 19:45:09 +0000 to 2023-02-22 23:04:16 +0000

- refactor(job_queue): docs and move types around (rust-lang/cargo#11758)
- Scrub more of the test environment (rust-lang/cargo#11757)
- Make more reads of environment variables go through the `Config` (rust-lang/cargo#11754)
- Revert "Update curl-sys to use libcurl 7.88.1" (rust-lang/cargo#11755)
- use consistent case (rust-lang/cargo#11748)
- Switch some tests from `build` to `check` (rust-lang/cargo#11725)
- Fix typo in sparse-registry warning message (rust-lang/cargo#11753)
- reuse url encoding from `url` crate, don't use separate `percent-encoding` (rust-lang/cargo#11750)
- Read environment variables through `Config` instead of `std::env::var(_os)` (rust-lang/cargo#11727)
- Update curl-sys to use libcurl 7.88.1 (rust-lang/cargo#11749)
- mdman: update pretty_assertions to reduce deps (rust-lang/cargo#11747)
- Cleanup tests (rust-lang/cargo#11745)
- Enhance help texts of position args (rust-lang/cargo#11740)
- Fix typo (rust-lang/cargo#11741)
- Update comment about cargo-ok (rust-lang/cargo#11724)
@weihanglo
Copy link
Member Author

weihanglo commented Feb 23, 2023

curl has been reverted.

@bors r+ p=1

@bors
Copy link
Collaborator

bors commented Feb 23, 2023

📌 Commit 80bea6c 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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Feb 23, 2023
@bors
Copy link
Collaborator

bors commented Feb 23, 2023

⌛ Testing commit 80bea6c with merge 8b1dbf7...

@bors
Copy link
Collaborator

bors commented Feb 23, 2023

☀️ Test successful - checks-actions
Approved by: weihanglo
Pushing 8b1dbf7 to master...

1 similar comment
@bors
Copy link
Collaborator

bors commented Feb 23, 2023

☀️ Test successful - checks-actions
Approved by: weihanglo
Pushing 8b1dbf7 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Feb 23, 2023
@bors bors merged commit 8b1dbf7 into rust-lang:master Feb 23, 2023
@rustbot rustbot added this to the 1.69.0 milestone Feb 23, 2023
@rust-timer
Copy link
Collaborator

rust-timer commented Feb 23, 2023

Finished benchmarking commit (8b1dbf7): comparison URL.

Overall result: ❌✅ regressions and improvements - 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
Regressions ❌
(secondary)		 2.5% [2.5%, 2.5%] 1
Improvements ✅
(primary)		 -1.0% [-1.1%, -0.9%] 2
Improvements ✅
(secondary)		 -2.2% [-2.5%, -1.9%] 6
All ❌✅ (primary) -1.0% [-1.1%, -0.9%] 2

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)		 -3.1% [-3.1%, -3.1%] 1
Improvements ✅
(secondary)		 -2.9% [-2.9%, -2.9%] 1
All ❌✅ (primary) -3.1% [-3.1%, -3.1%] 1

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
Regressions ❌
(secondary)		 3.6% [1.7%, 8.7%] 25
Improvements ✅
(primary)		 - - 0
Improvements ✅
(secondary)		 - - 0
All ❌✅ (primary) - - 0

@rustbot rustbot added the perf-regression Performance regression. label Feb 23, 2023
@nnethercote
Copy link
Contributor

nnethercote commented Feb 24, 2023

Clearly noise, when getting perf changes from a cargo update.

@rustbot label: +perf-regression-triaged

@rustbot rustbot added the perf-regression-triaged The performance regression has been triaged. label Feb 24, 2023
@weihanglo weihanglo deleted the update-cargo branch February 24, 2023 00:48
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

merged-by-bors This PR was explicitly merged by bors. perf-regression Performance regression. perf-regression-triaged The performance regression has been triaged. S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.

Projects

None yet

Milestone

1.69.0

Development

Successfully merging this pull request may close these issues.

6 participants

@weihanglo @rustbot @bors @akiirui @rust-timer @nnethercote