Skip to content

Add several errno values for OpenBSD#1036

Merged
bors[bot] merged 1 commit intonix-rust:masterfrom
sourgrasses:master
Mar 29, 2019
Merged

Add several errno values for OpenBSD#1036
bors[bot] merged 1 commit intonix-rust:masterfrom
sourgrasses:master

Conversation

@sourgrasses
Copy link
Copy Markdown
Contributor

It looks like OpenBSD added several new errno values in 6.2, and they've already been added to libc, so this should allow any crates using those to build on OpenBSD.

@asomers
Copy link
Copy Markdown
Member

asomers commented Mar 16, 2019

Yikes, those are some long lines! While you're here, would you mind wrapping them to 80 columns?

@sourgrasses
Copy link
Copy Markdown
Contributor Author

Ha, yeah, I was wondering about that and decided just to mimic the line above. Should I just rustfmt that whole file with a max width of 80? Those long lines come out like this:

#[cfg(any(target_os = "macos", target_os = "freebsd",
          target_os = "dragonfly", target_os = "ios",
          target_os = "openbsd", target_os = "netbsd"))]
EPROTO => "Protocol error",

It wraps some of the other cfg lines also in more or less the same style.

@asomers
Copy link
Copy Markdown
Member

asomers commented Mar 16, 2019

I'm not a fan of everything that rustfmt does. I wouldn't use it on parts of the file that you aren't changing.

@sourgrasses
Copy link
Copy Markdown
Contributor Author

Sounds good. Should I go ahead and wrap those other really long lines I was mimicking?

@rennis250
Copy link
Copy Markdown

Is it mainly formatting that is holding this back? It would be helpful to have this available, because newer versions of some packages I depend on already check for EPROTO and won't compile on OpenBSD, forcing me to stay with older versions.

Thanks,
Rob

@rennis250
Copy link
Copy Markdown

Sorry if I came off demanding. I was merely just inquiring. Thanks! :-)

--Rob

@sourgrasses
Copy link
Copy Markdown
Contributor Author

I was actually just thinking of bumping this. It's blocking some wayland-related crates from compiling for me.

@rennis250
Copy link
Copy Markdown

Same! :)

Smithay/wayland-rs#259

@asomers
Copy link
Copy Markdown
Member

asomers commented Mar 28, 2019

Thanks for handling the formatting. Could you please do two more things?

  1. Add a CHANGELOG entry that says something like "Added new errno constants from OpenBSD 6.2"
  2. Squash the commits.

@sourgrasses
Copy link
Copy Markdown
Contributor Author

👍

Copy link
Copy Markdown
Member

@asomers asomers left a comment

Choose a reason for hiding this comment

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

Thanks for your contribution!

bors r+

bors bot added a commit that referenced this pull request Mar 28, 2019
1036: Add several errno values for OpenBSD r=asomers a=sourgrasses

It looks like OpenBSD added several new errno values in 6.2, and they've already been added to `libc`, so this should allow any crates using those to build on OpenBSD.

Co-authored-by: Jenn Wheeler <jwheeler@antiochcollege.edu>
@bors
Copy link
Copy Markdown
Contributor

bors bot commented Mar 28, 2019

Timed out

@asomers
Copy link
Copy Markdown
Member

asomers commented Mar 28, 2019

Looks like Travis is super-slow today :'( . I'll try again late at night.

@asomers
Copy link
Copy Markdown
Member

asomers commented Mar 29, 2019

bors r+

@bors
Copy link
Copy Markdown
Contributor

bors bot commented Mar 29, 2019

Merge conflict

@asomers
Copy link
Copy Markdown
Member

asomers commented Mar 29, 2019

Sorry, but merging master isn't the right way to resolve the merge conflict. You need to rebase instead.

@sourgrasses
Copy link
Copy Markdown
Contributor Author

Yeahhh, whoops lol.

Copy link
Copy Markdown
Member

@asomers asomers left a comment

Choose a reason for hiding this comment

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

bors r+

bors bot added a commit that referenced this pull request Mar 29, 2019
1036: Add several errno values for OpenBSD r=asomers a=sourgrasses

It looks like OpenBSD added several new errno values in 6.2, and they've already been added to `libc`, so this should allow any crates using those to build on OpenBSD.

Co-authored-by: Jenn Wheeler <jwheeler@antiochcollege.edu>
@bors
Copy link
Copy Markdown
Contributor

bors bot commented Mar 29, 2019

Build succeeded

@bors bors bot merged commit c690968 into nix-rust:master Mar 29, 2019
@rennis250
Copy link
Copy Markdown

Thanks!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants