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.

Sign up for GitHub

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

Jump to bottom

[beta] Update cargo #104486

Closed
wants to merge 1 commit into from
Closed

[beta] Update cargo #104486

wants to merge 1 commit into from

Conversation

weihanglo
Copy link
Member

1 commits in 7e484fc1a766f56dbc95380f45719698e0c82749..d65d197ad5c6c09234369f219f943e291d4f04b9 2022-10-27 15:20:57 +0000 to 2022-11-15 21:30:31 +0000

r? @ghost

@weihanglo
[beta] Update cargo
f018d5f 
1 commits in 7e484fc1a766f56dbc95380f45719698e0c82749..d65d197ad5c6c09234369f219f943e291d4f04b9
2022-10-27 15:20:57 +0000 to 2022-11-15 21:30:31 +0000
- [beta-1.66] Backport fix for git2 safe-directory disable (rust-lang/cargo#11381)
@rustbot rustbot added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Nov 16, 2022
@rustbot
Copy link
Collaborator

rustbot commented Nov 16, 2022

Some changes occurred in src/tools/cargo

cc @ehuss

@weihanglo
Copy link
Member Author

@ehuss please help check I do this correctly. Thank you!

@weihanglo
Copy link
Member Author

I think it's fine to merge.

@bors r+

@bors
Copy link
Contributor

bors commented Nov 19, 2022

📌 Commit f018d5f 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 Nov 19, 2022
@ehuss
Copy link
Contributor

ehuss commented Nov 19, 2022

Sorry for the delay, unfortunately this won't merge without some more work on the beta branch. There have been some changes that prevent it from compiling.

@bors r-

I'm hoping to get this rolled up into #104447.

@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 Nov 19, 2022
@Mark-Simulacrum
Copy link
Member

Yes, we'll roll this up, going to close this PR for now.

@Mark-Simulacrum Mark-Simulacrum mentioned this pull request Nov 20, 2022
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Nov 20, 2022
@bors
Auto merge of rust-lang#104447 - Mark-Simulacrum:beta-next, r=Mark-Si…
0040709 
…mulacrum

[beta] backport

*  Use nominal_obligations_without_const in wf for FnDef rust-lang#104180
*  Don't silently eat label before block in block-like expr rust-lang#103986
*  Revert "Update CI to use Android NDK r25b" rust-lang#104628
*  rustdoc: Resolve doc links in external traits having local impls rust-lang#104364
*  Use 64 bits for incremental cache in-file positions rust-lang#104164
*  rustdoc: Do not add external traits to the crate in register_res rust-lang#103649
*  Revert "Normalize opaques with escaping bound vars" rust-lang#103509
* Bump to released stable compiler
* [beta] Update cargo rust-lang#104486

r? `@Mark-Simulacrum`
@weihanglo weihanglo deleted the update-beta-cargo branch November 20, 2022 17:34
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
S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@weihanglo @rustbot @bors @ehuss @Mark-Simulacrum