Skip to content

Commit

Permalink
Auto merge of #13098 - servo:cssparserup, r=KiChjang
Browse files Browse the repository at this point in the history
Update cssparser

<!-- Please describe your changes on the following line: -->

Today’s Rust Nigthly broke it

---
<!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `__` with appropriate data: -->
- [x] `./mach build -d` does not report any errors
- [x] `./mach test-tidy` does not report any errors
- [ ] These changes fix #__ (github issue number if applicable).

<!-- Either: -->
- [ ] There are tests for these changes OR
- [x] These changes do not require tests because rustup

<!-- Pull requests that do not address these steps are welcome, but they will require additional verification as part of the review process. -->

<!-- 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/13098)
<!-- Reviewable:end -->
  • Loading branch information
bors-servo committed Aug 28, 2016
2 parents 7345905 + 899192e commit 1f2346d
Show file tree
Hide file tree
Showing 13 changed files with 59 additions and 65 deletions.
2 changes: 1 addition & 1 deletion components/canvas_traits/Cargo.toml
Expand Up @@ -11,7 +11,7 @@ path = "lib.rs"

[dependencies]
azure = {git = "https://github.com/servo/rust-azure", features = ["plugins"]}
cssparser = {version = "0.5.7", features = ["heap_size", "serde-serialization"]}
cssparser = {version = "0.6", features = ["heap_size", "serde-serialization"]}
euclid = "0.10.1"
gfx_traits = {path = "../gfx_traits"}
heapsize = "0.3.0"
Expand Down
4 changes: 2 additions & 2 deletions components/layout/Cargo.toml
Expand Up @@ -14,7 +14,7 @@ app_units = "0.3"
azure = {git = "https://github.com/servo/rust-azure", features = ["plugins"]}
bitflags = "0.7"
canvas_traits = {path = "../canvas_traits"}
cssparser = {version = "0.5.7", features = ["heap_size", "serde-serialization"]}
cssparser = {version = "0.6", features = ["heap_size", "serde-serialization"]}
euclid = "0.10.1"
fnv = "1.0"
gfx = {path = "../gfx"}
Expand All @@ -33,7 +33,7 @@ range = {path = "../range"}
rustc-serialize = "0.3"
script_layout_interface = {path = "../script_layout_interface"}
script_traits = {path = "../script_traits"}
selectors = {version = "0.11", features = ["heap_size"]}
selectors = {version = "0.12", features = ["heap_size"]}
serde_macros = "0.8"
smallvec = "0.1"
string_cache = {version = "0.2.26", features = ["heap_size"]}
Expand Down
2 changes: 1 addition & 1 deletion components/msg/Cargo.toml
Expand Up @@ -11,7 +11,7 @@ path = "lib.rs"

[dependencies]
bitflags = "0.7"
cssparser = {version = "0.5.7", features = ["heap_size", "serde-serialization"]}
cssparser = {version = "0.6", features = ["heap_size", "serde-serialization"]}
heapsize = "0.3.0"
heapsize_plugin = "0.1.2"
hyper = "0.9.9"
Expand Down
4 changes: 2 additions & 2 deletions components/script/Cargo.toml
Expand Up @@ -27,7 +27,7 @@ bitflags = "0.7"
canvas_traits = {path = "../canvas_traits"}
caseless = "0.1.0"
cookie = {version = "0.2.5", features = ["serialize-rustc"]}
cssparser = {version = "0.5.7", features = ["heap_size", "serde-serialization"]}
cssparser = {version = "0.6", features = ["heap_size", "serde-serialization"]}
devtools_traits = {path = "../devtools_traits"}
encoding = "0.2"
euclid = "0.10.1"
Expand Down Expand Up @@ -62,7 +62,7 @@ regex = "0.1.43"
rustc-serialize = "0.3"
script_layout_interface = {path = "../script_layout_interface"}
script_traits = {path = "../script_traits"}
selectors = {version = "0.11", features = ["heap_size"]}
selectors = {version = "0.12", features = ["heap_size"]}
serde = "0.8"
smallvec = "0.1"
string_cache = {version = "0.2.26", features = ["heap_size", "unstable"]}
Expand Down
4 changes: 2 additions & 2 deletions components/script_layout_interface/Cargo.toml
Expand Up @@ -13,7 +13,7 @@ path = "lib.rs"
app_units = "0.3"
bitflags = "0.7"
canvas_traits = {path = "../canvas_traits"}
cssparser = {version = "0.5.7", features = ["heap_size", "serde-serialization"]}
cssparser = {version = "0.6", features = ["heap_size", "serde-serialization"]}
euclid = "0.10.1"
gfx_traits = {path = "../gfx_traits"}
heapsize = "0.3.0"
Expand All @@ -27,7 +27,7 @@ plugins = {path = "../plugins"}
profile_traits = {path = "../profile_traits"}
range = {path = "../range"}
script_traits = {path = "../script_traits"}
selectors = {version = "0.11", features = ["heap_size"]}
selectors = {version = "0.12", features = ["heap_size"]}
string_cache = {version = "0.2.26", features = ["heap_size"]}
style = {path = "../style"}
url = {version = "1.2", features = ["heap_size"]}
Expand Down
38 changes: 18 additions & 20 deletions components/servo/Cargo.lock

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

4 changes: 2 additions & 2 deletions components/style/Cargo.toml
Expand Up @@ -22,7 +22,7 @@ servo = ["serde", "serde/unstable", "serde_macros", "heapsize", "heapsize_plugin
[dependencies]
app_units = "0.3"
bitflags = "0.7"
cssparser = "0.5.7"
cssparser = "0.6"
deque = "0.3.1"
encoding = "0.2"
euclid = "0.10.1"
Expand All @@ -40,7 +40,7 @@ ordered-float = "0.2.2"
quickersort = "2.0.0"
rand = "0.3"
rustc-serialize = "0.3"
selectors = "0.11"
selectors = "0.12"
serde = {version = "0.8", optional = true}
serde_macros = {version = "0.8", optional = true}
smallvec = "0.1"
Expand Down
2 changes: 1 addition & 1 deletion components/style_traits/Cargo.toml
Expand Up @@ -14,7 +14,7 @@ servo = ["heapsize", "heapsize_plugin", "serde", "serde_macros",
"cssparser/heap_size", "cssparser/serde-serialization"]

[dependencies]
cssparser = "0.5.7"
cssparser = "0.6"
euclid = "0.10.1"
heapsize = {version = "0.3.0", optional = true}
heapsize_plugin = {version = "0.1.2", optional = true}
Expand Down

0 comments on commit 1f2346d

Please sign in to comment.