Skip to content

[beta-1.72] backport #12359 #12371

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
Merged
merged 1 commit into from
Jul 18, 2023
Merged

[beta-1.72] backport #12359 #12371

merged 1 commit into from
Jul 18, 2023

Conversation

weihanglo
Copy link
Member

Beta backports:

In order to make CI pass, the following PRs are also cherry-picked:

@weihanglo
fix(git): respect scp-like URL for nested submodules
f9e1aeb 
`parent_remote_url` used to be `&str` before rust-lang#12244. However, we changed
the type to `Url` and it started failing to parse scp-like URLs since
they are not compliant with WHATWG URL spec.

In this commit, we change it back to `&str` and construct the URL
manually. This should be safe since Cargo already checks if it is a
relative URL for that if branch.
@rustbot
Copy link
Collaborator

rustbot commented Jul 18, 2023

r? @epage

(rustbot has picked a reviewer for you, use r? to override)

@rustbot
Copy link
Collaborator

rustbot commented Jul 18, 2023

⚠️ Warning ⚠️

  • Pull requests are usually filed against the master branch for this repo, but this one is against rust-1.72.0. Please double check that you specified the right target!

@rustbot rustbot added A-git Area: anything dealing with git S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Jul 18, 2023
@ehuss
Copy link
Contributor

ehuss commented Jul 18, 2023

Thanks!

@bors r+

@bors
Copy link
Contributor

bors commented Jul 18, 2023

📌 Commit f9e1aeb 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 Jul 18, 2023
@bors
Copy link
Contributor

bors commented Jul 18, 2023

⌛ Testing commit f9e1aeb with merge dd6536b...

@bors
Copy link
Contributor

bors commented Jul 18, 2023

☀️ Test successful - checks-actions
Approved by: ehuss
Pushing dd6536b to rust-1.72.0...

@bors bors merged commit dd6536b into rust-lang:rust-1.72.0 Jul 18, 2023
@weihanglo weihanglo deleted the beta-backport branch July 18, 2023 16:02
@weihanglo weihanglo mentioned this pull request Jul 18, 2023
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Jul 19, 2023
@bors
Auto merge of rust-lang#113836 - weihanglo:update-beta-cargo, r=weiha…
aad221e 
…nglo

[beta-1.72] Update cargo

2 commits in 45782b6b8afd1da042d45c2daeec9c0744f72cc7..dd6536b8ed28f73c0e82089c72ef39a03bc634be
2023-07-05 16:54:51 +0000 to 2023-07-18 14:02:13 +0000
- [beta-1.72] backport rust-lang/cargo#12359 (rust-lang/cargo#12371)
- [beta-1.72] Bump version of crates-io due to unintentional semver-breaking change (rust-lang/cargo#12356)

r? ghost
@ehuss ehuss mentioned this pull request Jul 30, 2023
Merged
@ehuss ehuss added this to the 1.72.0 milestone Jul 30, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@epage epage

Labels
A-git Area: anything dealing with git 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.72.0
Development

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