Auto merge of #87 - nox:dumb-down, r=Ms2ger

Revert "Introduce an inprocess feature"

This reverts commit a1b6926.
See rust-lang/cargo#1197 (comment)

Author: bors-servo

Cargo.toml

@@ -1,14 +1,11 @@
 [package]
 name = "ipc-channel"
-version = "0.3.1"
+version = "0.4.0"
 
 [lib]
 name = "ipc_channel"
 path = "lib.rs"
 
-[features]
-inprocess = []
-
 [dependencies]
 bincode = "0.5.9"
 lazy_static = "0.2"

appveyor.yml

@@ -13,4 +13,4 @@ install:
 build: false
 
 test_script:
-  - cargo test --verbose --features inprocess
+  - cargo test --verbose

lib.rs

@@ -7,8 +7,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-#![cfg_attr(feature = "inprocess", feature(mpsc_select))]
 #![feature(borrow_state)]
+#![cfg_attr(any(target_os="windows", target_os="android"), feature(mpsc_select))]
 
 #[macro_use]
 extern crate lazy_static;

platform/mod.rs

@@ -8,13 +8,13 @@
 // except according to those terms.
 
 mod os {
-    #[cfg(all(not(feature = "inprocess"), target_os = "linux"))]
+    #[cfg(target_os = "linux")]
     include!("linux/mod.rs");
 
-    #[cfg(all(not(feature = "inprocess"), target_os = "macos"))]
+    #[cfg(target_os = "macos")]
     include!("macos/mod.rs");
 
-    #[cfg(feature = "inprocess")]
+    #[cfg(any(target_os = "windows", target_os = "android"))]
     include!("inprocess/mod.rs");
 }