Skip to content

Commit

Permalink
servo: Merge #18808 - Use the current parser location for CSS error (…
Browse files Browse the repository at this point in the history
…from servo:error-location_); r=emilio

… rather than the start location of the current construct. This likely places the error just *after* of the unexpected token whereas before would be best, but that’s likely a much bigger change.

See https://bugzilla.mozilla.org/show_bug.cgi?id=1378861

Source-Repo: https://github.com/servo/servo
Source-Revision: c79a54dbd9d3a590f5fd8191b8e57a0b9d1d0fdb

--HG--
extra : subtree_source : https%3A//hg.mozilla.org/projects/converted-servo-linear
extra : subtree_revision : 7a78da26aa9801972da42123730f90bcddc92930
  • Loading branch information
SimonSapin committed Oct 10, 2017
1 parent a31bec0 commit 4f4b90d
Show file tree
Hide file tree
Showing 91 changed files with 1,149 additions and 929 deletions.
28 changes: 14 additions & 14 deletions servo/Cargo.lock

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

2 changes: 1 addition & 1 deletion servo/components/canvas/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ path = "lib.rs"
azure = {git = "https://github.com/servo/rust-azure"}
canvas_traits = {path = "../canvas_traits"}
compositing = {path = "../compositing"}
cssparser = "0.21.1"
cssparser = "0.22.0"
euclid = "0.15"
fnv = "1.0"
gleam = "0.4"
Expand Down
2 changes: 1 addition & 1 deletion servo/components/canvas_traits/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ name = "canvas_traits"
path = "lib.rs"

[dependencies]
cssparser = "0.21.1"
cssparser = "0.22.0"
euclid = "0.15"
heapsize = "0.4"
heapsize_derive = "0.1"
Expand Down
2 changes: 1 addition & 1 deletion servo/components/malloc_size_of/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ path = "lib.rs"

[dependencies]
app_units = "0.5.5"
cssparser = "0.21.1"
cssparser = "0.22.0"
euclid = "0.15"
hashglobe = { path = "../hashglobe" }
servo_arc = { path = "../servo_arc" }
Expand Down
2 changes: 1 addition & 1 deletion servo/components/script/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ byteorder = "1.0"
canvas_traits = {path = "../canvas_traits"}
caseless = "0.1.0"
cookie = "0.6"
cssparser = "0.21.1"
cssparser = "0.22.0"
deny_public_fields = {path = "../deny_public_fields"}
devtools_traits = {path = "../devtools_traits"}
dom_struct = {path = "../dom_struct"}
Expand Down
2 changes: 1 addition & 1 deletion servo/components/script_layout_interface/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ path = "lib.rs"
app_units = "0.5"
atomic_refcell = "0.1"
canvas_traits = {path = "../canvas_traits"}
cssparser = "0.21.1"
cssparser = "0.22.0"
euclid = "0.15"
gfx_traits = {path = "../gfx_traits"}
heapsize = "0.4"
Expand Down
2 changes: 1 addition & 1 deletion servo/components/selectors/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ unstable = []
[dependencies]
bitflags = "0.7"
matches = "0.1"
cssparser = "0.21.1"
cssparser = "0.22.0"
log = "0.3"
fnv = "1.0"
malloc_size_of = { path = "../malloc_size_of" }
Expand Down
Loading

0 comments on commit 4f4b90d

Please sign in to comment.