Skip to content

Conversation

@tbu-
Copy link
Contributor

@tbu- tbu- commented Jan 26, 2025

Fixes #135635 (review).

Based on top of #135635 to avoid merge conflicts.

@rustbot
Copy link
Collaborator

rustbot commented Jan 26, 2025

r? @joboet

rustbot has assigned @joboet.
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 rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-libs Relevant to the library team, which will review and decide on the PR/issue. labels Jan 26, 2025
@tbu-
Copy link
Contributor Author

tbu- commented Jan 26, 2025

Commit unique to this PR: 93d347d.

@joboet
Copy link
Member

joboet commented Jan 29, 2025

Yeah, that configuration is ... interesting.

@bors r+ rollup

@bors
Copy link
Collaborator

bors commented Jan 29, 2025

📌 Commit 93d347d has been approved by joboet

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 Jan 29, 2025
@klensy
Copy link
Contributor

klensy commented Jan 29, 2025

Wait, pr not rebased after #135635 merge

@joboet
Copy link
Member

joboet commented Jan 29, 2025

That is not an issue, git merge takes care of that since the relevant commits are the same.

@klensy
Copy link
Contributor

klensy commented Jan 29, 2025

Git commit log will be linear, without duped ones? Didn't tried that, assumed that this will be almost like a merge commit ¯_(ツ)_/¯

@tbu-
Copy link
Contributor Author

tbu- commented Jan 29, 2025

Rust's commit log isn't linear, because it uses merge commits heavily (unrelated to this PR). The git commit log will only contain the commits once (that's what git merge is for).

@bors bors merged commit da7980b into rust-lang:master Jan 29, 2025
6 checks passed
@rustbot rustbot added this to the 1.86.0 milestone Jan 29, 2025
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. T-libs Relevant to the library team, which will review and decide on the PR/issue.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants