Skip to content

Commit

Permalink
Merge pull request #57 from palantir/upgrade-parking-lot
Browse files Browse the repository at this point in the history
Upgrade parking_lot
  • Loading branch information
sfackler authored Jul 17, 2019
2 parents 8b020da + 53a6470 commit 8638814
Show file tree
Hide file tree
Showing 8 changed files with 246 additions and 199 deletions.
402 changes: 225 additions & 177 deletions Cargo.lock

Large diffs are not rendered by default.

10 changes: 5 additions & 5 deletions conjure-codegen/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "conjure-codegen"
version = "0.3.8"
version = "0.3.9"
authors = ["Steven Fackler <[email protected]>"]
edition = "2018"
license = "Apache-2.0"
Expand All @@ -21,7 +21,7 @@ quote = { version = "0.6", default-features = false }
proc-macro2 = { version = "0.4", default-features = false }
failure = "0.1"

conjure-object = { version = "0.3.8", path = "../conjure-object" }
conjure-serde = { version = "0.3.8", path = "../conjure-serde" }
conjure-error = { version = "0.3.8", optional = true, path = "../conjure-error" }
conjure-http = { version = "0.3.8", optional = true, path = "../conjure-http" }
conjure-object = { version = "0.3.9", path = "../conjure-object" }
conjure-serde = { version = "0.3.9", path = "../conjure-serde" }
conjure-error = { version = "0.3.9", optional = true, path = "../conjure-error" }
conjure-http = { version = "0.3.9", optional = true, path = "../conjure-http" }
6 changes: 3 additions & 3 deletions conjure-error/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "conjure-error"
version = "0.3.8"
version = "0.3.9"
authors = ["Steven Fackler <[email protected]>"]
edition = "2018"
license = "Apache-2.0"
Expand All @@ -10,9 +10,9 @@ readme = "../README.md"

[dependencies]
backtrace = "0.3"
parking_lot = "0.8"
parking_lot = "0.9"
serde = "1.0"
serde-value = "0.5"
uuid = { version = "0.7", features = ["v4"] }

conjure-object = { version = "0.3.8", path = "../conjure-object" }
conjure-object = { version = "0.3.9", path = "../conjure-object" }
8 changes: 4 additions & 4 deletions conjure-http/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "conjure-http"
version = "0.3.8"
version = "0.3.9"
authors = ["Steven Fackler <[email protected]>"]
edition = "2018"
license = "Apache-2.0"
Expand All @@ -13,6 +13,6 @@ http = "0.1"
lazy_static = "1.0"
serde = "1.0"

conjure-error = { version = "0.3.8", path = "../conjure-error" }
conjure-object = { version = "0.3.8", path = "../conjure-object" }
conjure-serde = { version = "0.3.8", path = "../conjure-serde" }
conjure-error = { version = "0.3.9", path = "../conjure-error" }
conjure-object = { version = "0.3.9", path = "../conjure-object" }
conjure-serde = { version = "0.3.9", path = "../conjure-serde" }
11 changes: 5 additions & 6 deletions conjure-object/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "conjure-object"
version = "0.3.8"
version = "0.3.9"
authors = ["Steven Fackler <[email protected]>"]
edition = "2018"
license = "Apache-2.0"
Expand All @@ -10,14 +10,13 @@ readme = "../README.md"

[dependencies]
base64 = "0.10"
serde = "1.0"
serde_bytes = "0.10"
serde-value = "0.5"
uuid = { version = "0.7", features = ["serde"] }
chrono = { version = "0.4", features = ["serde"] }

lazy_static = "1.0"
regex = "1.0"
serde = "1.0"
serde-value = "0.5"
serde_bytes = "0.10"
uuid = { version = "0.7", features = ["serde"] }

[dev-dependencies]
proptest = "0.7"
4 changes: 2 additions & 2 deletions conjure-rust/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
[package]
name = "conjure-rust"
version = "0.3.8"
version = "0.3.9"
authors = ["Steven Fackler <[email protected]>"]
edition = "2018"
license = "Apache-2.0"

[dependencies]
structopt = "0.2"

conjure-codegen = { version = "0.3.8", path = "../conjure-codegen" }
conjure-codegen = { version = "0.3.9", path = "../conjure-codegen" }
2 changes: 1 addition & 1 deletion conjure-serde/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "conjure-serde"
version = "0.3.8"
version = "0.3.9"
authors = ["Steven Fackler <[email protected]>"]
edition = "2018"
license = "Apache-2.0"
Expand Down
2 changes: 1 addition & 1 deletion conjure-test/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "conjure-test"
version = "0.3.8"
version = "0.3.9"
authors = ["Steven Fackler <[email protected]>"]
edition = "2018"

Expand Down

0 comments on commit 8638814

Please sign in to comment.