Use futures 0.3 API (denoland#3358)

.rustfmt.toml

@@ -1,3 +1,4 @@
 # Copyright 2018-2019 the Deno authors. All rights reserved. MIT license.
 max_width = 80
 tab_spaces = 2
+edition = "2018"

cli/Cargo.toml

@@ -31,7 +31,7 @@ base64 = "0.11.0"
 byteorder = "1.3.2"
 clap = "2.33.0"
 dirs = "2.0.2"
-futures = "0.1.29"
+futures = { version = "0.3", features = [ "compat", "io-compat" ] }
 http = "0.1.19"
 hyper = "0.12.35"
 hyper-rustls = "0.17.1"

cli/compilers/js.rs

@@ -2,6 +2,8 @@
 use crate::compilers::CompiledModule;
 use crate::compilers::CompiledModuleFuture;
 use crate::file_fetcher::SourceFile;
+use crate::futures::future::FutureExt;
+use std::pin::Pin;
 use std::str;
 
 pub struct JsCompiler {}
@@ -10,14 +12,14 @@ impl JsCompiler {
   pub fn compile_async(
     self: &Self,
     source_file: &SourceFile,
-  ) -> Box<CompiledModuleFuture> {
+  ) -> Pin<Box<CompiledModuleFuture>> {
     let module = CompiledModule {
       code: str::from_utf8(&source_file.source_code)
         .unwrap()
         .to_string(),
       name: source_file.url.to_string(),
     };
 
-    Box::new(futures::future::ok(module))
+    futures::future::ok(module).boxed()
   }
 }

cli/compilers/json.rs

@@ -2,8 +2,10 @@
 use crate::compilers::CompiledModule;
 use crate::compilers::CompiledModuleFuture;
 use crate::file_fetcher::SourceFile;
+use crate::futures::future::FutureExt;
 use deno::ErrBox;
 use regex::Regex;
+use std::pin::Pin;
 use std::str;
 
 // From https://github.com/mathiasbynens/mothereff.in/blob/master/js-variables/eff.js
@@ -15,11 +17,11 @@ impl JsonCompiler {
   pub fn compile_async(
     self: &Self,
     source_file: &SourceFile,
-  ) -> Box<CompiledModuleFuture> {
+  ) -> Pin<Box<CompiledModuleFuture>> {
     let maybe_json_value: serde_json::Result<serde_json::Value> =
       serde_json::from_str(&str::from_utf8(&source_file.source_code).unwrap());
     if let Err(err) = maybe_json_value {
-      return Box::new(futures::future::err(ErrBox::from(err)));
+      return futures::future::err(ErrBox::from(err)).boxed();
     }
 
     let mut code = format!(
@@ -50,6 +52,6 @@ impl JsonCompiler {
       name: source_file.url.to_string(),
     };
 
-    Box::new(futures::future::ok(module))
+    futures::future::ok(module).boxed()
   }
 }

cli/compilers/mod.rs

@@ -19,4 +19,4 @@ pub struct CompiledModule {
 }
 
 pub type CompiledModuleFuture =
-  dyn Future<Item = CompiledModule, Error = ErrBox> + Send;
+  dyn Future<Output = Result<CompiledModule, ErrBox>> + Send;