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

Correct datatype for various termios constants #629

Merged
merged 2 commits into from
May 28, 2019

Conversation

Susurrus
Copy link
Contributor

This was a part of #625, but I moved it to a separate PR as it's a breaking change and those are currently blocked for Tier 1 platforms.

@bors
Copy link
Contributor

bors commented Jul 3, 2017

☔ The latest upstream changes (presumably #640) made this pull request unmergeable. Please resolve the merge conflicts.

@Susurrus
Copy link
Contributor Author

Susurrus commented Jul 3, 2017

This also need to address NLDLY and friends.

@Susurrus
Copy link
Contributor Author

Susurrus commented Jul 9, 2017

OCRNL, ONOCR, OFILL, ONLRET, and OFDEL need to be changed to tcflag_t as well.

@gnzlbg
Copy link
Contributor

gnzlbg commented Feb 20, 2019

@Susurrus can you rebase, and maybe merge this PR with the one that removes termios for musl ?

I would like to do a libc release without this, and then, if this is ready, do a release that only contains this change.

We can then try to update libc on rust upstream, and see if there is any downfall (if anybody complains). If somebody does, we can always revert the change, and yank the libc version. If nobody complains, then this would be ok.

@Susurrus
Copy link
Contributor Author

Rebased and merged #1015 into this PR.

Susurrus and others added 2 commits March 4, 2019 08:53
As of musl 1.1.20, termios2 doesn't exist in musl for any target.
@Susurrus
Copy link
Contributor Author

@gnzlbg I updated and rebased this PR. What're next steps to merge this?

@gnzlbg
Copy link
Contributor

gnzlbg commented Mar 11, 2019

What're next steps to merge this?

Nothing. There are a couple of breaking changes in the pipeline. I'll prepare a release containing them, and see if anything breaks. If nothing breaks then that would be it. Otherwise we'll need to revert them.

@gnzlbg
Copy link
Contributor

gnzlbg commented May 28, 2019

@bors: r+

@bors
Copy link
Contributor

bors commented May 28, 2019

📌 Commit 8ff57d4 has been approved by gnzlbg

@bors
Copy link
Contributor

bors commented May 28, 2019

⌛ Testing commit 8ff57d4 with merge 5804b51...

bors added a commit that referenced this pull request May 28, 2019
Correct datatype for various termios constants

This was a part of #625, but I moved it to a separate PR as it's a breaking change and those are currently blocked for Tier 1 platforms.
@bors
Copy link
Contributor

bors commented May 28, 2019

💔 Test failed - checks-travis

@gnzlbg
Copy link
Contributor

gnzlbg commented May 28, 2019

@bors: retry

bors added a commit that referenced this pull request May 28, 2019
Correct datatype for various termios constants

This was a part of #625, but I moved it to a separate PR as it's a breaking change and those are currently blocked for Tier 1 platforms.
@bors
Copy link
Contributor

bors commented May 28, 2019

⌛ Testing commit 8ff57d4 with merge 08d4488...

@bors
Copy link
Contributor

bors commented May 28, 2019

☀️ Test successful - checks-cirrus-freebsd-11, checks-cirrus-freebsd-12, checks-travis, status-appveyor
Approved by: gnzlbg
Pushing 08d4488 to master...

@bors bors merged commit 8ff57d4 into rust-lang:master May 28, 2019
@Susurrus Susurrus deleted the tcflag_t branch May 29, 2019 13:28
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants