upgrade dependencies

softprops · Apr 26, 2017 · cae358b · cae358b
1 parent 9425300
commit cae358b
Show file tree

Hide file tree

Showing 10 changed files with 279 additions and 225 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,25 +1,24 @@
 [package]
 name = "commodore"
-version = "0.2.2"
+version = "0.3.0"
 authors = ["softprops <d.tangren@gmail.com>"]
 description = "Slack Command API handler library"
 documentation = "https://softprops.github.io/commodore"
 homepage = "https://github.com/softprops/commodore"
 repository = "https://github.com/softprops/commodore"
 keywords = ["hyper", "slack", "webhook"]
 license = "MIT"
-build = "build.rs"
 
 [dev-dependencies]
 env_logger = "0.3"
 
-[build-dependencies]
-serde_codegen = "0.8"
-
 [dependencies]
-hyper = "0.9"
+hyper = "0.10"
+hyper-native-tls = "0.2"
 log = "0.3"
-regex = "0.1"
-serde = "0.8"
-serde_json = "0.8"
-url = "1.2"
+regex = "0.2"
+serde = "0.9"
+serde_derive = "0.9"
+serde_json = "0.9"
+url = "1.4"
+error-chain = "0.10"
diff --git a/LICENSE b/LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2016 Doug Tangren
+Copyright (c) 2016-2017 Doug Tangren
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the
@@ -17,4 +17,4 @@ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
 NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
 LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
 OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/README.md b/README.md
@@ -6,18 +6,16 @@
 
 Commodore allows you to easily extend your [Slack](https://slack.com/) experience with [Rust](https://www.rust-lang.org/) via Slack's [Command API](https://api.slack.com/slash-commands).
 
-## rust docs
-
-Find them [here](https://softprops.github.io/commodore)
+[Documentation](https://softprops.github.io/commodore)
 
 ## Install
 
-Note this crate relies on hyper for handling http. You will want to include the following in your `Cargo.toml` file.
+> Note: this crate relies on hyper for handling http. You will want to include the following in your `Cargo.toml` file.
 
 ```toml
 [dependencies]
-commodore = "0.2"
-hyper = "0.9"
+commodore = "0.3"
+hyper = "0.10"
 ```
 
 ## usage
@@ -84,4 +82,4 @@ fn main() {
 }
 ```
 
-Doug Tangren (softprops) 2016
+Doug Tangren (softprops) 2016-2017
diff --git a/build.rs b/build.rs
diff --git a/examples/response.rs b/examples/response.rs
@@ -3,21 +3,22 @@ extern crate commodore;
 use commodore::{Attachment, Field, Response};
 
 fn main() {
-  let response = Response::builder()
-    .text("hallo")
-    .in_channel()
-    .attach(
-      Attachment::builder()
-        .text("attached")
-        .color("red")
-        .field(
-          Field {
-            title: "foo".to_owned(),
-            value: "value".to_owned(),
-            short: false
-          }
+    let response = Response::builder()
+        .text("hallo")
+        .in_channel()
+        .attach(
+            Attachment::builder()
+                .text("attached")
+                .color("red")
+                .field(
+                    Field {
+                        title: "foo".to_owned(),
+                        value: "value".to_owned(),
+                        short: false,
+                    },
+                )
+                .build(),
         )
-        .build()
-    ).build();
+        .build();
     println!("{:#?}", response);
 }
diff --git a/examples/server.rs b/examples/server.rs
@@ -13,21 +13,24 @@ use std::time::Duration;
 pub fn main() {
     env_logger::init().unwrap();
     let mut mux = Mux::new();
-    mux.command("/commodore", "secrettoken", |c: &Command,
-                 _: &Option<Captures>,
-                 responder: Box<Responder>|
-                 -> Option<Response> {
-        info!("handler recv cmd {:#?}", c);
-        thread::spawn(move || {
-            // simulate doing something important
-            thread::sleep(Duration::from_secs(3));
-            responder.respond(Response::ephemeral("some time later"));
-        });
-        Some(Response::ephemeral("got it"))
-    });
+    mux.command(
+        "/commodore",
+        "secrettoken",
+        |c: &Command, _: &Option<Captures>, responder: Box<Responder>| -> Option<Response> {
+            info!("handler recv cmd {:#?}", c);
+            thread::spawn(
+                move || {
+                    // simulate doing something important
+                    thread::sleep(Duration::from_secs(3));
+                    responder.respond(Response::ephemeral("some time later"));
+                },
+            );
+            Some(Response::ephemeral("got it"))
+        },
+    );
     let svc = Server::http("0.0.0.0:4567")
-                   .unwrap()
-                   .handle(mux)
-                   .unwrap();
+        .unwrap()
+        .handle(mux)
+        .unwrap();
     println!("listening on {}", svc.socket);
 }
diff --git a/rustfmt.toml b/rustfmt.toml
@@ -1 +1,6 @@
-reorder_imports = true
+reorder_imports = true
+fn_args_layout = "Block"
+array_layout = "Block"
+where_style = "Rfc"
+generics_indent = "Block"
+fn_call_style = "Block"