Merge #908

908: Prep for 0.11 release r=Susurrus a=Susurrus



Co-authored-by: Bryant Mairs <bryantmairs@google.com>

3 files changed, 22 insertions, 12 deletions

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8189dd20..69484bbf 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,16 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 ## [Unreleased]
 
 ### Added
+
+### Changed
+
+### Fixed
+
+### Removed
+
+## [0.11.0] 2018-06-01
+
+### Added
 - Added `sendfile` on FreeBSD and Darwin.
   ([#901](https://github.com/nix-rust/nix/pull/901))
 - Added `pselect`
@@ -15,19 +25,19 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 - Added `mlockall` and `munlockall`
   ([#876](https://github.com/nix-rust/nix/pull/876))
 - Added `SO_MARK` on Linux.
-- ([#873](https://github.com/nix-rust/nix/pull/873))
+  ([#873](https://github.com/nix-rust/nix/pull/873))
 - Added safe support for nearly any buffer type in the `sys::aio` module.
   ([#872](https://github.com/nix-rust/nix/pull/872))
 - Added `sys::aio::LioCb` as a wrapper for `libc::lio_listio`.
   ([#872](https://github.com/nix-rust/nix/pull/872))
-- Added `getsid` in `::nix::unistd`
+- Added `unistd::getsid`
   ([#850](https://github.com/nix-rust/nix/pull/850))
 - Added `alarm`. ([#830](https://github.com/nix-rust/nix/pull/830))
 - Added interface flags `IFF_NO_PI, IFF_TUN, IFF_TAP` on linux-like systems.
   ([#853](https://github.com/nix-rust/nix/pull/853))
 - Added `statvfs` module to all MacOS and Linux architectures.
   ([#832](https://github.com/nix-rust/nix/pull/832))
-- Added `EVFILT_EMPTY`, `EVFILT_PROCDESC` and `EVFILT_SENDFILE` on FreeBSD.
+- Added `EVFILT_EMPTY`, `EVFILT_PROCDESC`, and `EVFILT_SENDFILE` on FreeBSD.
   ([#825](https://github.com/nix-rust/nix/pull/825))
 - Exposed `termios::cfmakesane` on FreeBSD.
   ([#825](https://github.com/nix-rust/nix/pull/825))
@@ -39,18 +49,16 @@ This project adheres to [Semantic Versioning](http://semver.org/).
   ([#833](https://github.com/nix-rust/nix/pull/833))
 
 ### Changed
-- Display and Debug for SysControlAddr now includes all fields.
+- `Display` and `Debug` for `SysControlAddr` now includes all fields.
   ([#837](https://github.com/nix-rust/nix/pull/837))
 - `ioctl!` has been replaced with a family of `ioctl_*!` macros.
   ([#833](https://github.com/nix-rust/nix/pull/833))
-- `io!`, `ior!`, `iow!`, and `iorw` has been renamed to `request_code_none!`, `request_code_read!`,
-  `request_code_write`, and `request_code_readwrite` respectively. These have also now been exposed
+- `io!`, `ior!`, `iow!`, and `iorw!` has been renamed to `request_code_none!`, `request_code_read!`,
+  `request_code_write!`, and `request_code_readwrite!` respectively. These have also now been exposed
   in the documentation.
   ([#833](https://github.com/nix-rust/nix/pull/833))
 - Enabled more `ptrace::Request` definitions for uncommon Linux platforms
   ([#892](https://github.com/nix-rust/nix/pull/892))
-- Remove `IFF_NOTRAILERS` on OpenBSD, as it has been removed in OpenBSD 6.3
-  ([#893](https://github.com/nix-rust/nix/pull/893))
 - Emulation of `FD_CLOEXEC` and `O_NONBLOCK` was removed from `socket()`, `accept4()`, and
   `socketpair()`.
   ([#907](https://github.com/nix-rust/nix/pull/907))
@@ -67,12 +75,14 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 
 ### Removed
 - Removed explicit support for the `bytes` crate from the `sys::aio` module.
-  See `sys::aio::AioCb::from_boxed_slice`s examples for alternatives.
+  See `sys::aio::AioCb::from_boxed_slice` examples for alternatives.
   ([#872](https://github.com/nix-rust/nix/pull/872))
 - Removed `sys::aio::lio_listio`.  Use `sys::aio::LioCb::listio` instead.
   ([#872](https://github.com/nix-rust/nix/pull/872))
 - Removed emulated `accept4()` from macos, ios, and netbsd targets
   ([#907](https://github.com/nix-rust/nix/pull/907))
+- Removed `IFF_NOTRAILERS` on OpenBSD, as it has been removed in OpenBSD 6.3
+  ([#893](https://github.com/nix-rust/nix/pull/893))
 
 ## [0.10.0] 2018-01-26
 
diff --git a/Cargo.toml b/Cargo.toml
index 6f46d916..618be88a 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name        = "nix"
 description = "Rust friendly bindings to *nix APIs"
-version     = "0.11.0-pre"
+version     = "0.11.0"
 authors     = ["The nix-rust Project Developers"]
 repository  = "https://github.com/nix-rust/nix"
 license     = "MIT"
@@ -12,7 +12,7 @@ exclude     = [
 ]
 
 [dependencies]
-libc = { git = "https://github.com/rust-lang/libc" }
+libc = "0.2.42"
 bitflags = "1.0"
 cfg-if = "0.1.0"
 void = "1.0.2"
diff --git a/README.md b/README.md
index 558fb6c0..79c7fd2f 100644
--- a/README.md
+++ b/README.md
@@ -88,7 +88,7 @@ To use `nix`, first add this to your `Cargo.toml`:
 
 ```toml
 [dependencies]
-nix = "0.10.0"
+nix = "0.11.0"
 ```
 
 Then, add this to your crate root: