Bump iron-fork to 0.3.0 (#411)

It also removes .cargo. Fixes #367

.gitignore

@@ -11,6 +11,7 @@
 /target/
 components/*/target
 components/*/Cargo.lock
+.cargo
 
 # Generated by IPCameraAdapter
 /snapshots/

Cargo.toml

@@ -14,27 +14,33 @@ exclude = [ "**/*.conf",
 default = ["authentication"]
 authentication = []
 
+[replace]
+"iron:0.3.0" = { path = "iron-fork/" }
+
 [build-dependencies]
 pkg-config = "0.3"
 
 [dependencies]
 foxbox_thinkerbell = { path = "components/thinkerbell/" }
 openzwave-adapter = { path = "components/openzwave-adapter/" }
 foxbox_taxonomy = { path = "components/taxonomy/" }
+tls = { path = "components/tls/" }
+
 foxbox_users = { git = "https://github.com/fxbox/users.git", rev = "1033e08" }
+multicast_dns = { git = "https://github.com/fxbox/multicast-dns.git", rev = "a6e4bcc" }
+iron-cors = { git = "https://github.com/fxbox/iron-cors.git", rev = "96ede73" }
+
 chrono = "0.2.19"
 clippy = "0.0.63"
 docopt = "0.6.78"
 docopt_macros = "0.6.80"
 env_logger = "0.3.2"
 get_if_addrs = "0.3.1"
-hyper = "0.7.2"
-multicast_dns = { git = "https://github.com/fxbox/multicast-dns.git", rev = "a6e4bcc" }
-iron-cors = { git = "https://github.com/fxbox/iron-cors.git", rev = "96ede73" }
+hyper = "0.8.1"
 libc = "0.2.7"
 log = "0.3"
 mio = { git = "https://github.com/carllerche/mio.git" }
-mount = "0.0.10"
+mount = "0.1.0"
 nix = { git = "https://github.com/nix-rust/nix.git", rev = "138080" } # Until 0.5.1 is released
 openssl = "0.7.6"
 openssl-sys = "0.7.6"
@@ -46,25 +52,24 @@ rusqlite = "0.6.0"
 serde = "0.7.0"
 serde_json = "0.7.0"
 serde_macros = "0.7.2"
-staticfile = "0.1.0"
+staticfile = "0.2.0"
 transformable_channels = "^0.1"
 unicase = "1.3.0"
-tls = { path = "./components/tls" }
 time = "0.1"
 timer = "0.1.6"
 uuid = "0.1.18"
 url = "0.5.7"
-ws = { git = "https://github.com/housleyjk/ws-rs.git", rev = "d154fc5" }
+ws = { git = "https://github.com/JohanLorenzo/ws-rs.git" , branch = "0.4.6" }
 xml-rs = "0.3.0"
 
 [dependencies.iron]
-version = "0.2.6"
+version = "0.3.0"
 default-features = true
 features = ["ssl"]
 
 [dev-dependencies]
 stainless = "0.1.4"
-iron-test = "0.2.0"
+iron-test = "0.3.0"
 regex = "0.1.55"
 rand = "0.3.14"
 tempdir = "0.3.4"

components/dns_challenge/Cargo.toml

@@ -8,6 +8,9 @@ publish = false
 name = "dnschallenge"
 path = "main.rs"
 
+[replace]
+"iron:0.3.0" = { path = "../../iron-fork/" }
+
 [dependencies.tls]
 path = "../tls"
 

components/tls/Cargo.toml

@@ -8,14 +8,17 @@ publish = false
 name = "tls"
 path = "lib.rs"
 
+[replace]
+"iron:0.3.0" = { path = "../../iron-fork/" }
+
 [dependencies.iron]
-version = "0.2.6"
+version = "0.3.0"
 default-features = true
 features = ["ssl"]
 
 [dependencies]
 clippy = "0.0.63"
-hyper = "0.7.2"
+hyper = "0.8.1"
 log = "0.3"
 mktemp = "0.1.2"
 openssl = "0.7.6"

iron-fork/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 
 name = "iron"
-version = "0.2.6"
+version = "0.3.0"
 description = "Extensible, Concurrency Focused Web Development in Rust."
 readme = "README.md"
 repository = "https://github.com/iron/iron"
@@ -26,7 +26,7 @@ ssl = ["hyper/ssl"]
 [dependencies]
 typemap = "0.3"
 url = "0.5"
-plugin = "0.2*"
+plugin = "0.2"
 modifier = "0.1"
 error = "0.1"
 log = "0.3"
@@ -35,8 +35,8 @@ lazy_static = "0.1"
 num_cpus = "0.2"
 
 [dependencies.hyper]
-version = "0.7"
+version = "0.8"
 default-features = false
 
 [dev-dependencies]
-time = "*"
+time = "0.1"