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

Revert accidental cargo submodule update #137597

Open
wants to merge 1 commit into
base: master
Choose a base branch
from

Conversation

oli-obk
Copy link
Contributor

@oli-obk oli-obk commented Feb 25, 2025

This was accidentally introduced in #135726

@rustbot
Copy link
Collaborator

rustbot commented Feb 25, 2025

r? @ehuss

rustbot has assigned @ehuss.
They will have a look at your PR within the next two weeks and either review your PR or reassign to another reviewer.

Use r? to explicitly pick a reviewer

@rustbot
Copy link
Collaborator

rustbot commented Feb 25, 2025

⚠️ Warning ⚠️

  • These commits modify submodules.

@rustbot
Copy link
Collaborator

rustbot commented Feb 25, 2025

Some changes occurred in src/tools/cargo

cc @ehuss

@rustbot rustbot added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Feb 25, 2025
@Kobzol
Copy link
Contributor

Kobzol commented Feb 25, 2025

Cargo goes back from ce948f4616e3d4277e30c75c8bb01e094910df39 to 1d1d646c06a84c1aa53967b394b7f1218f85db82.

@bors r+ (I think that this should be reverted quickly-ish)

@bors
Copy link
Contributor

bors commented Feb 25, 2025

📌 Commit 6cd0721 has been approved by Kobzol

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 25, 2025
fmease added a commit to fmease/rust that referenced this pull request Feb 25, 2025
Revert accidental cargo submodule update

This was accidentally introduced in rust-lang#135726
@jieyouxu
Copy link
Member

@bors p=10 (in case the rollup fails)

@fmease
Copy link
Member

fmease commented Feb 25, 2025

@jieyouxu I'll reinclude it into a p=11 rollup, is that what you had in mind?

fmease added a commit to fmease/rust that referenced this pull request Feb 25, 2025
Revert accidental cargo submodule update

This was accidentally introduced in rust-lang#135726
@jieyouxu
Copy link
Member

I'll reinclude it into a p=11 rollup, is that what you had in mind?

Yeah that's completely fine 👍

bors added a commit to rust-lang-ci/rust that referenced this pull request Feb 25, 2025
Rollup of 6 pull requests

Successful merges:

 - rust-lang#135480 (Don't require method impls for methods with `Self:Sized` bounds for impls for unsized types)
 - rust-lang#137360 (Use `as_chunks` in `analyze_source_file_sse2`)
 - rust-lang#137460 (downgrade bootstrap `cc`)
 - rust-lang#137515 (Update `compiler-builtins` to 0.1.148)
 - rust-lang#137522 (use stage 2 on cargo and clippy tests when possible)
 - rust-lang#137597 (Revert accidental cargo submodule update)

r? `@ghost`
`@rustbot` modify labels: rollup
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants