Skip to content
Permalink
Browse files

Auto merge of #23958 - Eijebong:toml, r=nox

Update toml to 0.5 and cbindgen to 0.9

<!-- Reviewable:start -->
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/23958)
<!-- Reviewable:end -->
  • Loading branch information...
bors-servo committed Aug 13, 2019
2 parents 9b24798 + f7411db commit bb70858889e5197192d5bb7a24ed138075e5f805
Showing with 18 additions and 17 deletions.
  1. +14 −13 Cargo.lock
  2. +1 −1 components/compositing/Cargo.toml
  3. +2 −2 components/style/Cargo.toml
  4. +1 −1 ports/libsimpleservo/capi/Cargo.toml

Some generated files are not rendered by default. Learn more.

@@ -44,4 +44,4 @@ webvr = {path = "../webvr"}
webxr-api = {git = "https://github.com/servo/webxr"}

[build-dependencies]
toml = "0.4.5"
toml = "0.5"
@@ -46,7 +46,7 @@ indexmap = "1.0"
itertools = "0.8"
itoa = "0.4"
lazy_static = "1"
log = "0.4"
log = { version = "0.4", features = ["std"] }
malloc_size_of = { path = "../malloc_size_of" }
malloc_size_of_derive = "0.1"
matches = "0.1"
@@ -85,4 +85,4 @@ log = "0.4"
bindgen = {version = "0.49", optional = true, default-features = false}
regex = {version = "1.1", optional = true}
walkdir = "2.1.4"
toml = {version = "0.4.5", optional = true, default-features = false}
toml = {version = "0.5", optional = true, default-features = false}
@@ -22,7 +22,7 @@ libc = "0.2"
winapi = {version = "0.3", features = ["wingdi", "winuser", "winnt", "winbase", "processenv", "namedpipeapi", "ntdef", "minwindef", "handleapi", "debugapi"]}

[build-dependencies]
cbindgen = "0.8"
cbindgen = "0.9"

[features]
canvas2d-azure = ["simpleservo/canvas2d-azure"]

0 comments on commit bb70858

Please sign in to comment.
You can’t perform that action at this time.