diff --git a/tests/docker_wrapper/mod.rs b/tests/docker_wrapper/mod.rs index a8cd61d..566c742 100644 --- a/tests/docker_wrapper/mod.rs +++ b/tests/docker_wrapper/mod.rs @@ -16,7 +16,7 @@ pub struct PostgresDocker { } impl PostgresDocker { - pub fn new() -> Result> { + pub fn new() -> Result> { let mut pg_docker = PostgresDocker { ip: "".to_string() }; pg_docker.setup()?; Ok(pg_docker) @@ -26,7 +26,7 @@ impl PostgresDocker { format!("{}", self.ip) } - pub fn setup(&mut self) -> Result<(), Box> { + pub fn setup(&mut self) -> Result<(), Box> { info!("Launching the PostgresWrapper docker"); let (name, img) = ("postgres_fafnir_tests", "openmaptiles/postgis"); @@ -76,7 +76,7 @@ impl PostgresDocker { } impl ElasticsearchDocker { - pub fn new() -> Result> { + pub fn new() -> Result> { let mut el_docker = ElasticsearchDocker { ip: "".to_string() }; el_docker.setup()?; let rubber = Rubber::new(&el_docker.host()); @@ -88,7 +88,7 @@ impl ElasticsearchDocker { format!("http://{}:9200", self.ip) } - pub fn setup(&mut self) -> Result<(), Box> { + pub fn setup(&mut self) -> Result<(), Box> { info!("Launching docker"); let (name, img) = ("mimirsbrunn_fafnir_tests", "elasticsearch:2"); diff --git a/tests/tests.rs b/tests/tests.rs index 992b7b1..b2e2caa 100644 --- a/tests/tests.rs +++ b/tests/tests.rs @@ -157,7 +157,7 @@ impl<'a> ElasticSearchWrapper<'a> { &self, word: &str, predicate: F, - ) -> Box + 'b> + ) -> Box + 'b> where F: 'b + FnMut(&mimir::Place) -> bool, { @@ -169,7 +169,7 @@ impl<'a> ElasticSearchWrapper<'a> { word: &str, predicate: F, search_on_global_stops: bool, - ) -> Box + 'b> + ) -> Box + 'b> where F: 'b + FnMut(&mimir::Place) -> bool, { @@ -218,12 +218,12 @@ impl<'a> ElasticSearchWrapper<'a> { }) .filter(predicate), ) - as Box>) + as Box>) } _ => None, } }) - .unwrap_or(Box::new(None.into_iter()) as Box>) + .unwrap_or(Box::new(None.into_iter()) as Box>) } }