changeset 73:7a059fb6186a

Sort imports
author Lewin Bormann <lbo@spheniscida.de>
date Sat, 06 Feb 2016 18:48:10 +0000
parents 98b6d1e37f6a
children fb6d8991bcc9
files src/map.rs src/mapreducer.rs src/record_types.rs src/reduce.rs src/shard_merge.rs
diffstat 5 files changed, 12 insertions(+), 13 deletions(-) [+]
line wrap: on
line diff
--- a/src/map.rs	Sat Feb 06 18:37:34 2016 +0000
+++ b/src/map.rs	Sat Feb 06 18:48:10 2016 +0000
@@ -3,13 +3,14 @@
 
 #![allow(dead_code)]
 
+use std::collections::BTreeMap;
 use std::fmt;
 use std::io::Write;
-use std::collections::BTreeMap;
+
+use formats::util::MRSinkGenerator;
 use mapreducer::MapReducer;
+use parameters::MRParameters;
 use record_types::{Record, MEmitter};
-use parameters::MRParameters;
-use formats::util::MRSinkGenerator;
 
 /// This is the base of the mapping phase. It contains an input
 /// and intermediary input and output forms.
--- a/src/mapreducer.rs	Sat Feb 06 18:37:34 2016 +0000
+++ b/src/mapreducer.rs	Sat Feb 06 18:48:10 2016 +0000
@@ -1,6 +1,7 @@
 //! The MapReducer trait and associated types.
 
 use record_types::{REmitter, MEmitter, Record, MultiRecord};
+
 use std::clone::Clone;
 use std::hash::{Hasher, SipHasher};
 
--- a/src/record_types.rs	Sat Feb 06 18:37:34 2016 +0000
+++ b/src/record_types.rs	Sat Feb 06 18:48:10 2016 +0000
@@ -1,5 +1,5 @@
+use std::collections::LinkedList;
 use std::cmp::{Eq, PartialEq, Ordering, PartialOrd};
-use std::collections::LinkedList;
 
 /// A (key,value) pair.
 #[derive(Clone, PartialEq, Eq)]
@@ -10,10 +10,7 @@
 
 /// Shortcut for creating a record.
 pub fn mk_rcrd(k: &str, v: &str) -> Record {
-    Record {
-        key: String::from(k),
-        value: String::from(v),
-    }
+    Record { key: String::from(k), value: String::from(v) }
 }
 
 impl PartialOrd for Record {
--- a/src/reduce.rs	Sat Feb 06 18:37:34 2016 +0000
+++ b/src/reduce.rs	Sat Feb 06 18:48:10 2016 +0000
@@ -1,9 +1,11 @@
 //! Implements the Reduce phase.
 //!
 
+use std::iter::Peekable;
+
+use formats::util::MRSinkGenerator;
 use mapreducer::MapReducer;
 use parameters::MRParameters;
-use formats::util::MRSinkGenerator;
 use record_types::{Record, MultiRecord, REmitter};
 use shard_merge::ShardMergeIterator;
 
@@ -64,8 +66,6 @@
     }
 }
 
-use std::iter::Peekable;
-
 /// Iterator adapter: Converts an Iterator<Item=Record> into an Iterator<Item=MultiRecord> by
 /// grouping subsequent records with identical key.
 /// The original iterator must yield records in sorted order (or at least in an order where
--- a/src/shard_merge.rs	Sat Feb 06 18:37:34 2016 +0000
+++ b/src/shard_merge.rs	Sat Feb 06 18:48:10 2016 +0000
@@ -4,11 +4,11 @@
 
 #![allow(dead_code)]
 
-use sort;
-
 use std::cmp::{Ord, Ordering};
 use std::iter;
 
+use sort;
+
 /// See module description.
 /// This type uses dynamic instead of static dispatch because it realizes an arbitrary structure
 /// and can therefore not work with a single type signature.