Merge remote-tracking branch 'upstream/master' into patch-async

# Conflicts:
#	Cargo.toml

Author: stevefan1999-personal

Cargo.toml

@@ -19,7 +19,7 @@ cfg-if = "1.0.0"
 heapless = "0.7.14"
 httparse = { version = "1.7.1", default-features = false }
 rand_core = "0.6.3"
-sha1 = "0.10.1"
+sha1 = { version = "0.10.1", default-features = false }
 
 [dev-dependencies]
 async-std = { version = "1.12.0", features = ["attributes"] }

examples/server_async/compat.rs

@@ -4,16 +4,16 @@
 // As this is far from being any useful, please do extend this on your own
 pub trait CompatExt {
     fn compat(self) -> Compat<Self>
-        where
-            Self: Sized;
+    where
+        Self: Sized;
     fn compat_ref(&self) -> Compat<&Self>;
     fn compat_mut(&mut self) -> Compat<&mut Self>;
 }
 
 impl<T> CompatExt for T {
     fn compat(self) -> Compat<Self>
-        where
-            Self: Sized,
+    where
+        Self: Sized,
     {
         Compat(self)
     }