Skip to content

[beta-1.96] Update cargo submodule#156625

Merged
rust-bors[bot] merged 2 commits into
rust-lang:betafrom
weihanglo:beta-1.96-backport
May 17, 2026
Merged

[beta-1.96] Update cargo submodule#156625
rust-bors[bot] merged 2 commits into
rust-lang:betafrom
weihanglo:beta-1.96-backport

Conversation

@weihanglo
Copy link
Copy Markdown
Member

@weihanglo weihanglo commented May 15, 2026

View all comments

1 commits in 9fb171546a9db5513062de20df78116ed5ee7668..bfa14ef47afbddd88d6be1913a0e486386a566a2
2026-04-14 20:13:35 -0500 to 2026-05-15 13:10:54 -0400

r? ghost

@rustbot
Copy link
Copy Markdown
Collaborator

rustbot commented May 15, 2026

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 May 15, 2026
@rustbot
Copy link
Copy Markdown
Collaborator

rustbot commented May 15, 2026

⚠️ Warning ⚠️

@weihanglo
Copy link
Copy Markdown
Member Author

@bors r+ rollup=never p=1

@rust-bors
Copy link
Copy Markdown
Contributor

rust-bors Bot commented May 16, 2026

📌 Commit 3b4883f has been approved by weihanglo

It is now in the queue for this repository.

@rust-bors rust-bors Bot 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 May 16, 2026
@rust-bors

This comment has been minimized.

rust-bors Bot pushed a commit that referenced this pull request May 16, 2026
[beta-1.96] Update cargo submodule

1 commits in 9fb171546a9db5513062de20df78116ed5ee7668..bfa14ef47afbddd88d6be1913a0e486386a566a2
2026-04-14 20:13:35 -0500 to 2026-05-15 13:10:54 -0400
- Revert "feat: add frame-pointers profile option (rust-lang/cargo#16742)" (rust-lang/cargo#16998)

r? ghost
@rust-bors rust-bors Bot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels May 16, 2026
@rust-bors
Copy link
Copy Markdown
Contributor

rust-bors Bot commented May 16, 2026

💔 Test for a1927c3 failed: CI. Failed job:

@rust-log-analyzer

This comment has been minimized.

@JonathanBrouwer
Copy link
Copy Markdown
Contributor

@bors retry

@rust-bors rust-bors Bot 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 May 16, 2026
@rust-bors

This comment has been minimized.

rust-bors Bot pushed a commit that referenced this pull request May 16, 2026
[beta-1.96] Update cargo submodule

1 commits in 9fb171546a9db5513062de20df78116ed5ee7668..bfa14ef47afbddd88d6be1913a0e486386a566a2
2026-04-14 20:13:35 -0500 to 2026-05-15 13:10:54 -0400
- Revert "feat: add frame-pointers profile option (rust-lang/cargo#16742)" (rust-lang/cargo#16998)

r? ghost
@rust-bors rust-bors Bot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels May 16, 2026
@rust-bors
Copy link
Copy Markdown
Contributor

rust-bors Bot commented May 16, 2026

💔 Test for 396a7ed failed: CI. Failed job:

@rust-log-analyzer

This comment has been minimized.

@Kobzol
Copy link
Copy Markdown
Member

Kobzol commented May 16, 2026

@bors retry

Spurious failure fixed by #156640.

@rust-bors rust-bors Bot 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 May 16, 2026
@JonathanBrouwer
Copy link
Copy Markdown
Contributor

@Kobzol Shouldn't that fix be added to this pr, since this targets beta?

@JonathanBrouwer
Copy link
Copy Markdown
Contributor

@bors r-
To give time to reply

@rust-bors rust-bors Bot added the S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. label May 16, 2026
@rust-bors
Copy link
Copy Markdown
Contributor

rust-bors Bot commented May 16, 2026

This pull request was unapproved.

View changes since this unapproval

@rust-bors rust-bors Bot removed the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label May 16, 2026
@Kobzol
Copy link
Copy Markdown
Member

Kobzol commented May 16, 2026

That is a good point. Yeah, it will have to be integrated with this PR to fix CI.

CI is currently down because apt is unable to access the repo at
dilos.org. It is failing inside the fortanix install script which tries
to run apt-get with the error:

```
5.679 E: Failed to fetch https://apt.dilos.org/dilos/dists/dilos2/InRelease  403  Forbidden [IP: 116.202.240.188 443]
```

These lines in the Dockerfile were added when Solaris builds were merged
into dist-various-2 in rust-lang#45001.
However, Solaris builds were split off in
rust-lang#138699. In that PR, these lines
adding the dilos repository weren't removed.

AFAICT, these are no longer necessary.
@rustbot rustbot added A-CI Area: Our Github Actions CI A-testsuite Area: The testsuite used to check the correctness of rustc T-infra Relevant to the infrastructure team, which will review and decide on the PR/issue. labels May 17, 2026
@weihanglo
Copy link
Copy Markdown
Member Author

#156640 (comment)

Included the CI fix. Now

@bors r+ rollup=never p=1

@rust-bors
Copy link
Copy Markdown
Contributor

rust-bors Bot commented May 17, 2026

📌 Commit 392f8c0 has been approved by weihanglo

It is now in the queue for this repository.

@rust-bors rust-bors Bot 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 May 17, 2026
@JonathanBrouwer
Copy link
Copy Markdown
Contributor

@bors p=6
Scheduling this before the next rollup

@rust-bors

This comment has been minimized.

@rust-bors rust-bors Bot added merged-by-bors This PR was explicitly merged by bors. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels May 17, 2026
@rust-bors
Copy link
Copy Markdown
Contributor

rust-bors Bot commented May 17, 2026

☀️ Test successful - CI
Approved by: weihanglo
Duration: 3h 6m 5s
Pushing 6be5f81 to beta...

@rust-bors rust-bors Bot merged commit 6be5f81 into rust-lang:beta May 17, 2026
12 checks passed
@rustbot rustbot added this to the 1.96.0 milestone May 17, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

A-CI Area: Our Github Actions CI A-testsuite Area: The testsuite used to check the correctness of rustc merged-by-bors This PR was explicitly merged by bors. T-infra Relevant to the infrastructure team, which will review and decide on the PR/issue.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants