Skip to content

minor: Sync from downstream #15628

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 2 commits into from
Sep 18, 2023
Merged

minor: Sync from downstream #15628

merged 2 commits into from
Sep 18, 2023

Conversation

@lnicola
Copy link
Member

@lnicola lnicola commented Sep 18, 2023

No description provided.

@rustbot rustbot added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Sep 18, 2023
@lnicola
Copy link
Member Author

lnicola commented Sep 18, 2023

@bors r+

@rustbot rustbot added has-merge-commits S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Sep 18, 2023
@rustbot
Copy link
Collaborator

rustbot commented Sep 18, 2023

There are merge commits (commits with multiple parents) in your changes. We have a no merge policy so these commits will need to be removed for this pull request to be merged.

You can start a rebase with the following commands:

$ # rebase
$ git rebase -i master
$ # delete any merge commits in the editor that appears
$ git push --force-with-lease

The following commits are merge commits:

@bors
Copy link
Contributor

bors commented Sep 18, 2023

📌 Commit d39b45a has been approved by lnicola

It is now in the queue for this repository.

@bors
Copy link
Contributor

bors commented Sep 18, 2023

⌛ Testing commit d39b45a with merge 258b15c...

@bors
Copy link
Contributor

bors commented Sep 18, 2023

☀️ Test successful - checks-actions
Approved by: lnicola
Pushing 258b15c to master...

@bors bors merged commit 258b15c into rust-lang:master Sep 18, 2023
@lnicola lnicola deleted the sync-from-rust branch September 18, 2023 09:25
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

has-merge-commits S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. S-waiting-on-review Status: Awaiting review from the assignee but also interested parties.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@lnicola @rustbot @bors @bossmc