Swarm rework (#182)

* Rename Transport::RawConn to Output

* Remove AsyncRead + AsyncWrite bound on Transport::Output

* UpgradedNode now always implements Transport

* Add and tweak modifiers for Transport and ConnectionUpgrade

* Secio upgrade now returns the pubkey in its output

* Add upgrade::apply

* Add Transport::and_then

* Rework the swarm

* Rustfmt

* Fix concerns

datastore/src/json_file.rs

@@ -27,8 +27,8 @@ use futures::stream::{iter_ok, Stream};
 use query::{naive_apply_query, Query};
 use serde::Serialize;
 use serde::de::DeserializeOwned;
-use serde_json::{from_reader, from_value, to_value, to_writer, Map};
 use serde_json::value::Value;
+use serde_json::{from_reader, from_value, to_value, to_writer, Map};
 use std::borrow::Cow;
 use std::fs;
 use std::io::Cursor;
@@ -264,11 +264,11 @@ where
 
 #[cfg(test)]
 mod tests {
-    use {Filter, FilterOp, FilterTy, Order, Query};
     use Datastore;
     use JsonFileDatastore;
     use futures::{Future, Stream};
     use tempfile::NamedTempFile;
+    use {Filter, FilterOp, FilterTy, Order, Query};
 
     #[test]
     fn open_and_flush() {

datastore/src/lib.rs

@@ -113,8 +113,8 @@ use std::borrow::Cow;
 use std::io::Error as IoError;
 use std::ops::DerefMut;
 
-mod query;
 mod json_file;
+mod query;
 
 pub use self::json_file::{JsonFileDatastore, JsonFileDatastoreEntry};
 pub use self::query::{Filter, FilterOp, FilterTy, Order, Query};

datastore/src/query.rs

@@ -18,8 +18,8 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-use futures::{Async, Future, Poll, Stream};
 use futures::stream::{iter_ok, Skip as StreamSkip, Take as StreamTake};
+use futures::{Async, Future, Poll, Stream};
 use std::borrow::Cow;
 use std::cmp::Ordering;
 use std::io::Error as IoError;