Merge pull request #1002 from Dastan-glitch/master

Fix a typo in future/mod.rs

Author: yoshuawuyts

Diff for: src/future/future/mod.rs

@@ -361,7 +361,7 @@ extension_trait! {
 
         #[doc = r#"
             Waits for both the future and a timeout, if the timeout completes before
-            the future, it returns an TimeoutError.
+            the future, it returns a TimeoutError.
 
             # Example
             ```