Skip to content

Commit

Permalink
Bump iron-fork to 0.3.0
Browse files Browse the repository at this point in the history
It also removes .cargo. Fixes #367
  • Loading branch information
JohanLorenzo committed Apr 22, 2016
1 parent 4036f9e commit 3f9d7dd
Show file tree
Hide file tree
Showing 5 changed files with 27 additions and 82 deletions.
1 change: 0 additions & 1 deletion .cargo/config

This file was deleted.

1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@

# Generated by Cargo
/target/
.cargo

# Generated by IPCameraAdapter
/snapshots/
Expand Down
86 changes: 14 additions & 72 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

13 changes: 8 additions & 5 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,9 @@ exclude = [ "**/*.conf",
default = ["authentication"]
authentication = []

[replace]
"iron:0.3.0" = { path = "iron-fork/" }

[dependencies]
foxbox_thinkerbell = { path = "components/thinkerbell/" }
openzwave-adapter = { path = "components/openzwave-adapter/" }
Expand All @@ -28,12 +31,12 @@ docopt = "0.6.78"
docopt_macros = "0.6.80"
env_logger = "0.3.2"
get_if_addrs = "0.3.1"
hyper = "0.7.2"
hyper = "0.8.1"
mktemp = "0.1.2"
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"
Expand All @@ -45,7 +48,7 @@ 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"
time = "0.1"
Expand All @@ -56,13 +59,13 @@ ws = { git = "https://github.com/housleyjk/ws-rs.git", rev = "d154fc5" }
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"
8 changes: 4 additions & 4 deletions iron-fork/Cargo.toml
Original file line number Diff line number Diff line change
@@ -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"
Expand All @@ -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"
Expand All @@ -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"

0 comments on commit 3f9d7dd

Please sign in to comment.