Skip to content

Fix rebase #758

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
Jun 23, 2020
Merged

Fix rebase #758

merged 1 commit into from
Jun 23, 2020

Conversation

mark-i-m
Copy link
Member

Blocked on #757

Redo of #737 but correct (I hope)

@mark-i-m mark-i-m added the S-blocked Status: this PR is blocked waiting for something label Jun 19, 2020
@LeSeulArtichaut LeSeulArtichaut removed the S-blocked Status: this PR is blocked waiting for something label Jun 21, 2020
@LeSeulArtichaut
Copy link
Contributor

#757 was merged, marking as unblocked.

@mark-i-m mark-i-m marked this pull request as ready for review June 22, 2020 16:30
@mark-i-m
Copy link
Member Author

(CI failure is unrelated: https://linker.iecc.com/ appears to be down atm)

@mark-i-m
Copy link
Member Author

Aha! It works. This PR is behind master, and CI just passed when I reran without rebasing 🎉

LeSeulArtichaut
LeSeulArtichaut approved these changes Jun 23, 2020
View reviewed changes
Copy link
Contributor

@LeSeulArtichaut LeSeulArtichaut left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should we merge then?

@mark-i-m
Copy link
Member Author

I think so :fingers_crossed:

@mark-i-m mark-i-m merged commit 175a18c into rust-lang:master Jun 23, 2020
@mark-i-m mark-i-m deleted the fix-rebase branch June 23, 2020 17:01
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@LeSeulArtichaut LeSeulArtichaut LeSeulArtichaut approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@mark-i-m @LeSeulArtichaut