Reorganise some async code

Cargo.lock

@@ -223,6 +223,12 @@ dependencies = [
  "winapi 0.3.8",
 ]
 
+[[package]]
+name = "fnv"
+version = "1.0.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2fad85553e09a6f881f739c29f0b00b0f01357c743266d478b68951ce23285f3"
+
 [[package]]
 name = "fuchsia-zircon"
 version = "0.3.3"
@@ -376,8 +382,9 @@ dependencies = [
 
 [[package]]
 name = "intel-pstate"
-version = "0.2.0"
-source = "git+https://github.com/flukejones/intel-pstate#f70ab9726bdada99f5cb01c64c056f2093f3a008"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b0e7f68d8a6d149a5b2195ab645923c63ee35928fff58895b3c1d21541afe90c"
 dependencies = [
  "err-derive",
  "smart-default",
@@ -857,6 +864,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7d9c43f1bb96970e153bcbae39a65e249ccb942bd9d36dbdf086024920417c9c"
 dependencies = [
  "bytes",
+ "fnv",
  "futures-core",
  "lazy_static",
  "mio",