Merge pull request #22 from indiv0/dev

Apply rustfmt

Author: indiv0

rustfmt.toml

@@ -1,14 +1,18 @@
 enum_trailing_comma = true
+fn_args_density = "Compressed"
 fn_args_layout = "Block"
 format_strings = false
+ideal_width = 80
 match_block_trailing_comma = true
 match_wildcard_trailing_comma = true
+max_width = 99
 normalize_comments = false
-struct_trailing_comma = "Always"
-struct_lit_trailing_comma = "Always"
-reorder_imports = true
 reorder_imported_names = true
-report_todo = "Always"
+reorder_imports = true
 report_fixme = "Always"
+report_todo = "Always"
+struct_lit_trailing_comma = "Vertical"
+struct_trailing_comma = "Vertical"
 where_trailing_comma = true
+wrap_comments = true
 write_mode = "Overwrite"

src/lib.rs

@@ -66,22 +66,15 @@ pub trait WolframAlphaRequestSender {
     ///
     /// Takes a map of parameters which get appended to the request as query
     /// parameters. Returns the response body string.
-    fn send<'a>(
-        &self,
-        method: &str,
-        params: &mut HashMap<&str, &'a str>
-    ) -> HttpRequestResult<String>;
+    fn send<'a>(&self, method: &str, params: &mut HashMap<&str, &'a str>)
+        -> HttpRequestResult<String>;
 
     /// Make an API call to Wolfram|Alpha that contains the configured App ID.
     ///
     /// Takes a map of parameters which get appended to the request as query
     /// parameters. Returns the response body string.
-    fn send_authed<'a>(
-        &self,
-        method: &str,
-        app_id: &'a str,
-        params: &mut HashMap<&str, &'a str>
-    ) -> HttpRequestResult<String> {
+    fn send_authed<'a>(&self, method: &str, app_id: &'a str, params: &mut HashMap<&str, &'a str>)
+        -> HttpRequestResult<String> {
         params.insert("appid", app_id);
         self.send(method, params)
     }
@@ -97,11 +90,8 @@ mod hyper_support {
     use url::Url;
 
     impl WolframAlphaRequestSender for hyper::Client {
-        fn send<'a>(
-            &self,
-            method: &str,
-            params: &mut HashMap<&str, &'a str>
-        ) -> HttpRequestResult<String> {
+        fn send<'a>(&self, method: &str, params: &mut HashMap<&str, &'a str>)
+            -> HttpRequestResult<String> {
             let url_string = format!("https://api.wolframalpha.com/v2/{}", method);
             let mut url = url_string.parse::<Url>().expect("Unable to parse URL");
 

src/query.rs

@@ -50,9 +50,7 @@ pub struct OptionalQueryParameters<'a> {
 
 /// Performs a query to the Wolfram|Alpha API.
 pub fn query<R>(
-    client: &R,
-    appid: &str,
-    input: &str,
+    client: &R, appid: &str, input: &str,
     optional_query_parameters: Option<OptionalQueryParameters>
 ) -> Result<QueryResult>
     where R: WolframAlphaRequestSender,