cleaned up lifetimes.

Author: David Barsky

.rustfmt.toml

@@ -1,3 +1,2 @@
-reorder_imports = true
 merge_imports = true
 max_width = 120

lambda-runtime-client/src/client.rs

@@ -308,18 +308,21 @@ impl RuntimeClient {
     pub fn fail_init(&self, e: &RuntimeApiError) {
         let uri: Uri = format!("http://{}/{}/runtime/init/error", self.endpoint, RUNTIME_API_VERSION)
             .parse()
-            .expect("Could not generate Runtime API URI");
+            .expect("Could not generate Runtime URI");
         error!("Calling fail_init Runtime API: {}", e.to_response().error_message);
         let err_body = serde_json::to_vec(&e.to_response()).expect("Could not serialize error object");
         let req = self.get_runtime_post_request(&uri, err_body);
 
-        match self.http_client.request(req).wait() {
-            Ok(_) => {}
-            Err(e) => {
+        let resp = self
+            .http_client
+            .request(req)
+            .map_err(|e| {
                 error!("Error while sending init failed message: {}", e);
                 panic!("Error while sending init failed message: {}", e);
-            }
-        }
+            }).map(|resp| {
+                info!("Successfully sent error response to the runtime API: {:?}", resp);
+            });
+        tokio::spawn(resp);
     }
 
     /// Returns the endpoint configured for this HTTP Runtime client.

lambda-runtime/examples/basic.rs

@@ -1,11 +1,11 @@
 extern crate lambda_runtime as lambda;
-extern crate serde_derive;
 extern crate log;
+extern crate serde_derive;
 extern crate simple_logger;
 
-use serde_derive::{Serialize, Deserialize};
-use lambda::{lambda, error::HandlerError};
+use lambda::{error::HandlerError, lambda};
 use log::error;
+use serde_derive::{Deserialize, Serialize};
 use std::error::Error;
 
 #[derive(Deserialize)]

lambda-runtime/examples/with_custom_runtime.rs

@@ -1,14 +1,14 @@
 extern crate lambda_runtime as lambda;
-extern crate serde_derive;
 extern crate log;
+extern crate serde_derive;
 extern crate simple_logger;
 extern crate tokio;
 
-use lambda::{lambda, error::HandlerError};
-use tokio::runtime::Runtime;
-use serde_derive::{Serialize, Deserialize};
+use lambda::{error::HandlerError, lambda};
 use log::error;
+use serde_derive::{Deserialize, Serialize};
 use std::error::Error;
+use tokio::runtime::Runtime;
 
 #[derive(Deserialize, Clone)]
 struct CustomEvent {

lambda-runtime/src/env.rs

@@ -41,7 +41,7 @@ pub struct EnvConfigProvider;
 
 impl EnvConfigProvider {
     pub fn new() -> Self {
-        EnvConfigProvider { }
+        EnvConfigProvider {}
     }
 }
 

lambda-runtime/src/runtime.rs

@@ -3,10 +3,10 @@ use std::{error::Error, result};
 use serde;
 use serde_json;
 
-use lambda_runtime_client::RuntimeClient;
 use context::Context;
 use env::{ConfigProvider, EnvConfigProvider, FunctionSettings};
 use error::{HandlerError, RuntimeError};
+use lambda_runtime_client::RuntimeClient;
 use tokio::runtime::Runtime as TokioRuntime;
 
 const MAX_RETRIES: i8 = 3;
@@ -53,11 +53,8 @@ macro_rules! lambda {
 /// The function panics if the `ConfigProvider` returns an error from the `get_runtime_api_endpoint()`
 /// or `get_function_settings()` methods. The panic forces AWS Lambda to terminate the environment
 /// and spin up a new one for the next invocation.
-pub(crate) fn start_with_config<E, O, C>(
-    f: Handler<E, O>,
-    config: C,
-    runtime: Option<TokioRuntime>,
-) where
+pub(crate) fn start_with_config<E, O, C>(f: Handler<E, O>, config: C, runtime: Option<TokioRuntime>)
+where
     for<'invocation> E: serde::Deserialize<'invocation>,
     O: serde::Serialize,
     C: ConfigProvider,
@@ -103,11 +100,8 @@ pub(crate) fn start_with_config<E, O, C>(
 ///
 /// # Panics
 /// The function panics if we cannot instantiate a new `RustRuntime` object.
-pub(crate) fn start_with_runtime_client<E, O>(
-    f: Handler<E, O>,
-    func_settings: FunctionSettings,
-    client: RuntimeClient,
-) where
+pub(crate) fn start_with_runtime_client<E, O>(f: Handler<E, O>, func_settings: FunctionSettings, client: RuntimeClient)
+where
     for<'invocation> E: serde::Deserialize<'invocation>,
     O: serde::Serialize,
 {

lambda-runtime/tests/skeptic.rs

@@ -1 +1 @@
-include!(concat!(env!("OUT_DIR"), "/skeptic-tests.rs"));
+include!(concat!(env!("OUT_DIR"), "/skeptic-tests.rs"));