Merge #852

bors[bot] · Marwes · web-flow · commit 022246912383 · 2020-07-03T21:16:21.000Z
852: feat: Remove or make dependencies optional r=Marwes a=Marwes



Co-authored-by: Markus Westerlind &lt;marwes91@gmail.com&gt;
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -39,17 +39,17 @@ quick-error = "1.0.0"
 collect-mac = "0.1.0"
 either = "1.0.0"
 itertools = "0.9"
-futures = { version = "0.3.1", features = ["thread-pool"] }
+futures = { version = "0.3.1", default-features = false }
 codespan = "0.9"
 codespan-reporting = "0.9"
-pin-project = "0.4"
+pin-project-lite = { version = "0.1", optional = true }
 salsa = { version = "0.14.0", package = "gluon-salsa" }
 
 serde = { version = "1.0.0", optional = true }
 serde_state = { version = "0.4", optional = true }
 serde_derive_state = { version = "0.4.7", optional = true }
 
-tokio = { version = "0.2", features = ["stream", "sync", "rt-core"] }
+tokio = { version = "0.2", features = ["stream", "sync", "rt-core"], optional = true }
 
 # Binding crates
 regex = { version = "1", optional = true }
@@ -58,7 +58,7 @@ tower-service = { version = "0.3", optional = true }
 http = { version = "0.2", optional = true }
 hyper = { version = "0.13", optional = true, features = ["stream"] }
 native-tls = { version = "0.2", optional = true }
-tokio-tls = { version = "0.3", optional = true }
+tokio-native-tls = { version = "0.1", optional = true }
 
 # Crates used in testing
 compiletest_rs = { version = "0.5", optional = true }
@@ -78,8 +78,8 @@ walkdir = "2"
 criterion = "0.3"
 collect-mac = "0.1.0"
 env_logger = "0.7"
-failure = "0.1"
-failure_derive = "0.1"
+anyhow = "1"
+thiserror = "1"
 insta = "0.16"
 pretty_assertions = "0.6"
 structopt = "0.3"
@@ -100,10 +100,11 @@ gluon_completion = { path = "completion", version = "0.15.1" } # GLUON
 gluon_codegen = { path = "codegen", version = "0.15.1" } # GLUON
 
 [features]
-default = ["regex", "random"]
+default = ["async", "regex", "random"]
+async = ["tokio"]
 random = ["rand", "rand_xorshift"]
 serialization = ["serde", "serde_state", "serde_derive_state", "gluon_vm/serialization"]
-web = ["hyper", "http", "tower-service", "native-tls", "tokio/net", "tokio-tls"]
+web = ["async", "hyper", "http", "tower-service", "native-tls", "tokio/net", "tokio-native-tls", "pin-project-lite"]
 
 docs_rs = ["serialization"]
 
diff --git a/base/Cargo.toml b/base/Cargo.toml
@@ -24,7 +24,7 @@ fnv = "1.0.3"
 pretty = "0.10"
 smallvec = "0.6"
 collect-mac = "0.1.0"
-anymap = "0.12.0"
+anymap = { version = "0.12.0", optional = true }
 itertools = "0.9"
 ordered-float = "1"
 codespan = "0.9"
@@ -48,5 +48,5 @@ env_logger = "0.7"
 pretty_assertions = "0.6"
 
 [features]
-serialization = ["serde", "serde_state", "serde_derive", "serde_derive_state"]
+serialization = ["serde", "serde_state", "serde_derive", "serde_derive_state", "anymap"]
 nightly = ["compiletest_rs"]
diff --git a/base/src/serialization.rs b/base/src/serialization.rs
@@ -1,5 +1,3 @@
-extern crate anymap;
-
 use std::any::Any;
 use std::cell::RefCell;
 use std::collections::HashMap;
diff --git a/doc/Cargo.toml b/doc/Cargo.toml
@@ -14,7 +14,7 @@ documentation = "https://docs.rs/gluon"
 [dependencies]
 clap = "2.22.0"
 env_logger = "0.7"
-failure = "0.1"
+anyhow = "1"
 futures = "0.3"
 handlebars = "2"
 itertools = "0.9"
diff --git a/doc/src/lib.rs b/doc/src/lib.rs
@@ -17,7 +17,7 @@ use std::{
 };
 
 use {
-    failure::ResultExt,
+    anyhow::{anyhow, Context as _},
     handlebars::{Context, Handlebars, Helper, Output, RenderContext, RenderError},
     itertools::Itertools,
     pretty::{Arena, DocAllocator},
@@ -39,7 +39,7 @@ use gluon::{
     Thread, ThreadExt,
 };
 
-pub type Error = failure::Error;
+pub type Error = anyhow::Error;
 pub type Result<T> = ::std::result::Result<T, Error>;
 
 #[derive(Serialize, PartialEq, Debug, Default)]
@@ -482,7 +482,7 @@ where
     trace!("DOC: {:?}", module);
 
     reg.render_to_write(MODULE_TEMPLATE, &module, out)
-        .with_context(|err| format!("Unable to render {}: {}", module.name, err))?;
+        .with_context(|| format!("Unable to render {}", module.name))?;
     Ok(())
 }
 
@@ -532,9 +532,8 @@ impl DocCollector<'_> {
 
         debug!("Indexing module: {}", path.display());
 
-        let mut input = File::open(&*path).with_context(|err| {
-            format!("Unable to open gluon file `{}`: {}", path.display(), err)
-        })?;
+        let mut input = File::open(&*path)
+            .with_context(|| format!("Unable to open gluon file `{}`", path.display()))?;
 
         content.clear();
         input.read_to_string(content)?;
@@ -545,7 +544,7 @@ impl DocCollector<'_> {
         let name = filename_to_module(
             module_path
                 .to_str()
-                .ok_or_else(|| failure::err_msg("Non-UTF-8 filename"))?,
+                .ok_or_else(|| anyhow!("Non-UTF-8 filename"))?,
         );
 
         let (expr, typ) = thread.typecheck_str(&name, &content, None)?;
@@ -652,13 +651,8 @@ pub fn generate(options: &Options, thread: &Thread) -> Result<()> {
         .try_for_each(|(modules, module)| -> Result<()> {
             let module_path = PathBuf::from(module.name.replace(".", "/"));
             let out_path = out_path.join(&module_path).with_extension("html");
-            let mut doc_file = File::create(&*out_path).with_context(|err| {
-                format!(
-                    "Unable to open output file `{}`: {}",
-                    out_path.display(),
-                    err
-                )
-            })?;
+            let mut doc_file = File::create(&*out_path)
+                .with_context(|| format!("Unable to open output file `{}`", out_path.display()))?;
 
             generate_module(
                 &reg,
diff --git a/doc/src/main.rs b/doc/src/main.rs
@@ -1,5 +1,4 @@
 extern crate env_logger;
-extern crate failure;
 extern crate opener;
 extern crate rayon;
 extern crate structopt;
@@ -17,7 +16,7 @@ fn main() {
     }
 }
 
-fn main_() -> Result<(), failure::Error> {
+fn main_() -> Result<(), anyhow::Error> {
     env_logger::init();
 
     let opt = gluon_doc::Opt::from_args();
diff --git a/examples/http/main.rs b/examples/http/main.rs
@@ -28,7 +28,7 @@ async fn main() {
     }
 }
 
-async fn start(thread: &Thread, port: u16) -> Result<(), failure::Error> {
+async fn start(thread: &Thread, port: u16) -> Result<(), anyhow::Error> {
     let thread = thread.root_thread();
     // Last we run our `http_server.glu` module which returns a function which starts listening
     // on the port we passed from the command line
@@ -50,7 +50,7 @@ mod tests {
     use hyper::Client;
     use tokio::runtime::Runtime;
 
-    async fn wait_for_server(port: u16) -> Result<(), failure::Error> {
+    async fn wait_for_server(port: u16) -> Result<(), anyhow::Error> {
         let mut err = None;
         for _ in 0..40 {
             match Client::new()
@@ -60,16 +60,14 @@ mod tests {
                 Ok(response) => {
                     return response
                         .into_body()
-                        .try_fold(Vec::new(), |mut acc, buf| {
-                            async move {
-                                acc.extend_from_slice(&buf);
-                                Ok(acc)
-                            }
+                        .try_fold(Vec::new(), |mut acc, buf| async move {
+                            acc.extend_from_slice(&buf);
+                            Ok(acc)
                         })
                         .map_ok(|body| {
                             assert_eq!(str::from_utf8(&body).unwrap(), "Hello World");
                         })
-                        .err_into::<failure::Error>()
+                        .err_into::<anyhow::Error>()
                         .await;
                 }
                 Err(e) => err = Some(e),
@@ -120,23 +118,21 @@ mod tests {
 
                 Client::new()
                     .request(request)
-                    .err_into::<failure::Error>()
+                    .err_into::<anyhow::Error>()
                     .and_then(|response| {
                         response
                             .into_body()
-                            .try_fold(Vec::new(), |mut acc, buf| {
-                                async move {
-                                    acc.extend_from_slice(&buf);
-                                    Ok(acc)
-                                }
+                            .try_fold(Vec::new(), |mut acc, buf| async move {
+                                acc.extend_from_slice(&buf);
+                                Ok(acc)
                             })
                             .map_ok(|body| {
                                 assert_eq!(str::from_utf8(&body).unwrap(), "test");
                             })
-                            .err_into::<failure::Error>()
+                            .err_into::<anyhow::Error>()
                     })
                     .await
             })
-            .unwrap_or_else(|err: failure::Error| panic!("{}", err));
+            .unwrap_or_else(|err: anyhow::Error| panic!("{}", err));
     }
 }
diff --git a/repl/Cargo.toml b/repl/Cargo.toml
@@ -28,7 +28,7 @@ gluon_format = { version = "0.15.1", path = "../format" } # GLUON
 gluon_doc = { version = "0.15.1", path = "../doc" } # GLUON
 
 app_dirs = "1.0.0"
-failure = "0.1"
+anyhow = "1"
 futures = "0.3"
 tokio = { version = "0.2", features = ["rt-threaded", "rt-core", "macros", "signal"] }
 clap = "2.22.0"
diff --git a/repl/src/main.rs b/repl/src/main.rs
@@ -42,7 +42,7 @@ quick_error! {
 #[derive(Debug)]
 #[allow(deprecated)]
 enum Error {
-    Failure(err: failure::Error) {
+    Failure(err: anyhow::Error) {
         display("{}", err)
         from()
     }
diff --git a/src/compiler_pipeline.rs b/src/compiler_pipeline.rs
@@ -17,6 +17,9 @@ use std::{
 use either::Either;
 use salsa::ParallelDatabase;
 
+#[cfg(feature = "serde")]
+use crate::ThreadExt;
+
 use crate::{
     base::{
         ast::{self, OwnedExpr, RootExpr, SpannedExpr, Typed},
@@ -35,7 +38,7 @@ use crate::{
         macros::MacroExpander,
         thread::{RootedThread, RootedValue, Thread, ThreadInternal, VmRoot},
     },
-    Error, ModuleCompiler, Result, ThreadExt,
+    Error, ModuleCompiler, Result,
 };
 
 pub type BoxFuture<'vm, T, E> =
diff --git a/src/import.rs b/src/import.rs
@@ -16,7 +16,6 @@ use {
     futures::{
         future::{self},
         prelude::*,
-        task::SpawnExt,
     },
     itertools::Itertools,
     salsa::{debug::DebugQueryTable, Database},
@@ -573,7 +572,10 @@ where
 
         let span = args[0].span;
 
+        #[cfg(feature = "tokio")]
         if let Some(spawn) = macros.spawn {
+            use futures::task::SpawnExt;
+
             let (tx, rx) = tokio::sync::oneshot::channel();
             spawn
                 .spawn(Box::pin(async move {
@@ -585,28 +587,28 @@ where
                     let _ = tx.send(result);
                 }))
                 .unwrap();
-            Box::pin(async move {
+            return Box::pin(async move {
                 Ok(From::from(move || {
                     rx.map(move |r| {
                         r.unwrap_or_else(|err| Err(MacroError::new(Error::String(err.to_string()))))
                             .map(move |id| pos::spanned(span, Expr::Ident(id)).into())
                     })
                     .boxed()
                 }))
-            })
-        } else {
-            Box::pin(async move {
-                Ok(From::from(move || {
-                    async move {
-                        db.import(modulename)
-                            .await
-                            .map_err(|err| MacroError::message(err.to_string()))
-                            .map(move |id| pos::spanned(span, Expr::Ident(id)))
-                    }
-                    .boxed()
-                }))
-            })
+            });
         }
+
+        Box::pin(async move {
+            Ok(From::from(move || {
+                async move {
+                    db.import(modulename)
+                        .await
+                        .map_err(|err| MacroError::message(err.to_string()))
+                        .map(move |id| pos::spanned(span, Expr::Ident(id)))
+                }
+                .boxed()
+            }))
+        })
     }
 }
 
diff --git a/src/lib.rs b/src/lib.rs
@@ -888,18 +888,25 @@ impl VmBuilder {
     }
 
     pub async fn build_async(self) -> RootedThread {
-        struct TokioSpawn;
-        impl futures::task::Spawn for TokioSpawn {
-            fn spawn_obj(
-                &self,
-                future: futures::task::FutureObj<'static, ()>,
-            ) -> StdResult<(), futures::task::SpawnError> {
-                tokio::spawn(future);
-                Ok(())
+        #[allow(unused_mut, unused_assignments)]
+        let mut spawner = None;
+
+        #[cfg(feature = "tokio")]
+        {
+            struct TokioSpawn;
+            impl futures::task::Spawn for TokioSpawn {
+                fn spawn_obj(
+                    &self,
+                    future: futures::task::FutureObj<'static, ()>,
+                ) -> StdResult<(), futures::task::SpawnError> {
+                    tokio::spawn(future);
+                    Ok(())
+                }
             }
+            spawner = Some(Box::new(TokioSpawn) as Box<dyn futures::task::Spawn + Send + Sync>);
         }
 
-        self.build_inner(Some(Box::new(TokioSpawn))).await
+        self.build_inner(spawner).await
     }
 
     async fn build_inner(
diff --git a/src/std_lib/http.rs b/src/std_lib/http.rs
diff --git a/tests/main.rs b/tests/main.rs

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,3 @@`
`1`		`-extern crate anymap;`
`2`		`-`
`3`	`1`	`use std::any::Any;`
`4`	`2`	`use std::cell::RefCell;`
`5`	`3`	`use std::collections::HashMap;`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`extern crate env_logger;`
`2`		`-extern crate failure;`
`3`	`2`	`extern crate opener;`
`4`	`3`	`extern crate rayon;`
`5`	`4`	`extern crate structopt;`
`@@ -17,7 +16,7 @@ fn main() {`
`17`	`16`	`}`
`18`	`17`	`}`
`19`	`18`
`20`		`-fn main_() -> Result<(), failure::Error> {`
	`19`	`+fn main_() -> Result<(), anyhow::Error> {`
`21`	`20`	`env_logger::init();`
`22`	`21`
`23`	`22`	`let opt = gluon_doc::Opt::from_args();`
Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,7 @@ quick_error! {`
`42`	`42`	`#[derive(Debug)]`
`43`	`43`	`#[allow(deprecated)]`
`44`	`44`	`enum Error {`
`45`		`- Failure(err: failure::Error) {`
	`45`	`+ Failure(err: anyhow::Error) {`
`46`	`46`	`display("{}", err)`
`47`	`47`	`from()`
`48`	`48`	`}`