Merge branch 'release-v0.5.0' into release

rust-lang-nursery · Nov 17, 2015 · 55fe007 · 55fe007
2 parents 6d93591 + 7545f68
commit 55fe007
Show file tree

Hide file tree

Showing 3 changed files with 256 additions and 238 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -2,7 +2,6 @@ language: rust
 rust:
 - nightly
 - beta
-- stable
+- 1.4.0
 script:
 - cargo test
-- test $TRAVIS_RUST_VERSION != "nightly" || cargo test --features "from_raw_fd socket_timeout"
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,23 +1,17 @@
 [package]
 name = "unix_socket"
-version = "0.4.6"
+version = "0.5.0"
 authors = ["Steven Fackler <[email protected]>"]
 license = "MIT/Apache-2.0"
 description = "Unix domain socket bindings"
 repository = "https://github.com/rust-lang-nursery/unix-socket"
-documentation = "https://doc.rust-lang.org/unix-socket/doc/v0.4.6/unix_socket"
+documentation = "https://doc.rust-lang.org/unix-socket/doc/v0.5.0/unix_socket"
 readme = "README.md"
 keywords = ["posix", "unix", "socket", "domain"]
 
 [dependencies]
-libc = "0.1"
-debug-builders = "0.1"
+libc = "0.2.1"
+cfg-if = "0.1"
 
 [dev-dependencies]
 tempdir = "0.3"
-
-[features]
-default = ["from_raw_fd"]
-
-from_raw_fd = []
-socket_timeout = []
-Original file line number
+Diff line change
@@ Expand Up / @@ -2,7 +2,6 @@ language: rust @@
     rust:
     - nightly
     - beta
-    - stable
+    - 1.4.0
     script:
     - cargo test
-    - test $TRAVIS_RUST_VERSION != "nightly" || cargo test --features "from_raw_fd socket_timeout"