diff options
author | Philipp Korber <philippkorber@gmail.com> | 2018-03-13 14:18:09 +0100 |
---|---|---|
committer | Philipp Korber <philippkorber@gmail.com> | 2018-03-13 14:18:09 +0100 |
commit | 132d76ebcabe6f5d728f856e83e7f3c74b993636 (patch) | |
tree | 9b65a342671ca1ef1baf0775978540a2f60e8c47 | |
parent | 3841d9bd0b887d5d0ea40d7e2d4243b0079b9b74 (diff) |
fix(deps): fix futures-cpupool imports
- before the default_impl_simple_context feature did not state that
it depended on futures-cpupool
- but it still happend to work in test sas futures-cpupool was a
dev-dependency
- now (only) default_impl_simple_context uses it and the exmaple
uses the default_impl_simple_context feature
-rw-r--r-- | Cargo.toml | 4 | ||||
-rw-r--r-- | examples/composition.rs | 27 |
2 files changed, 6 insertions, 25 deletions
@@ -45,7 +45,6 @@ version="0.4.0" [dev-dependencies] serde_json = "1.0.2" regex = "0.2.6" -futures-cpupool="0.1.5" [features] debug_trace_tokens = [] @@ -59,7 +58,8 @@ default_impl = [ default_impl_name_composer = [] default_impl_component_id = [] default_impl_simple_context = [ - "default_impl_component_id", "mail-codec/default_impl_fs", "mail-codec/default_impl_cpupool" + "default_impl_component_id", "mail-codec/default_impl_fs", "mail-codec/default_impl_cpupool", + "futures-cpupool" ] traceing = [ "mail-codec/traceing" ] diff --git a/examples/composition.rs b/examples/composition.rs index b9a0528..1286068 100644 --- a/examples/composition.rs +++ b/examples/composition.rs @@ -9,11 +9,9 @@ extern crate serde; extern crate serde_json; #[macro_use] extern crate serde_derive; -extern crate futures_cpupool; use std::borrow::Cow; -use futures_cpupool::{CpuPool, Builder as CpuPoolBuilder}; use futures::Future; use template_engine::Teng; @@ -22,30 +20,15 @@ use compose::error::Error; use compose::composition_prelude::*; use compose::resource_prelude::*; -use compose::default_impl::{RandomContentId, NoNameComposer}; -use compose::CompositeContext; -use mail::default_impl::FsResourceLoader; -use mail::context::CompositeBuilderContext; - -type MyContext = -CompositeContext<RandomContentId, CompositeBuilderContext<FsResourceLoader, CpuPool>>; - -fn setup_context() -> MyContext { - CompositeContext::new( - RandomContentId::new("content_id_postfix.is.this"), - CompositeBuilderContext::new( - FsResourceLoader::with_cwd_root().unwrap(), - CpuPoolBuilder::new().create() - ) - ) -} +use compose::default_impl::simple_context; + fn main() { _main().unwrap(); } fn _main() -> Result<(), Error> { - let context = setup_context(); + let context = simple_context::new("blablup").unwrap(); let template_engine = Teng::new(); let data = Resorts { @@ -63,7 +46,7 @@ fn _main() -> Result<(), Error> { ] }; - let mut send_data = MailSendData::simple_new( + let send_data = MailSendData::simple_new( Email::try_from( "my@sender.yupyup" )?.into(), Email::try_from( "goblin@dog.spider" )?.into(), "Dear randomness", @@ -71,8 +54,6 @@ fn _main() -> Result<(), Error> { data ); - //this doesn't realy do anything as the NoNameComposer is used - send_data.auto_gen_display_names(NoNameComposer)?; let (mail, _envelop) = (&context, &template_engine).compose_mail(send_data)?; |