Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-05 13:40:08 +01:00
Code Issues Projects Releases Packages Wiki Activity

Fix serde_macros

Browse source
This commit is contained in:
Manish Goregaokar 2015-10-28 21:53:15 +05:30
parent ce5586f74a
commit 184b2bacf3
16 changed files with 94 additions and 131 deletions
Download patch file Download diff file Expand all files Collapse all files

2
components/canvas_traits/Cargo.toml
View file

@ -40,5 +40,5 @@ path = "../util"
[dependencies]
euclid = {version = "0.3", features = ["plugins"]}
serde_macros = "0.5"
serde_macros = "0.6"

2
components/devtools/Cargo.toml
View file

@ -35,5 +35,5 @@ log = "0.3"
time = "0.1"
rustc-serialize = "0.3"
serde = "0.6"
serde_macros = "0.5"
serde_macros = "0.6"

2
components/devtools_traits/Cargo.toml
View file

@ -32,5 +32,5 @@ time = "0.1"
rustc-serialize = "0.3"
bitflags = "0.3"
serde = "0.6"
serde_macros = "0.5"
serde_macros = "0.6"

2
components/gfx/Cargo.toml
View file

@ -20,7 +20,7 @@ log = "0.3"
rand = "0.3"
rustc-serialize = "0.3"
serde = "0.6"
serde_macros = "0.5"
serde_macros = "0.6"
smallvec = "0.1"
string_cache = "0.1"
time = "0.1.12"

2
components/layout/Cargo.toml
View file

@ -80,7 +80,7 @@ string_cache = "0.1"
string_cache_plugin = "0.1"
euclid = {version = "0.3", features = ["plugins"]}
serde = "0.6"
serde_macros = "0.5"
serde_macros = "0.6"
serde_json = "0.5"
unicode-bidi = "0.2"
unicode-script = { version = "0.1", features = ["harfbuzz"] }

2
components/layout_traits/Cargo.toml
View file

@ -35,5 +35,5 @@ features = [ "serde_serialization" ]
[dependencies]
euclid = {version = "0.3", features = ["plugins"]}
serde = "0.6"
serde_macros = "0.5"
serde_macros = "0.6"

2
components/msg/Cargo.toml
View file

@ -48,7 +48,7 @@ bitflags = "0.3"
rustc-serialize = "0.3.4"
euclid = {version = "0.3", features = ["plugins"]}
serde = "0.6"
serde_macros = "0.5"
serde_macros = "0.6"
[target.x86_64-apple-darwin.dependencies]
core-foundation = "0.1"

2
components/net_traits/Cargo.toml
View file

@ -37,4 +37,4 @@ image = "0.4.0"
regex = "0.1.33"
regex_macros = "0.1.19"
serde = "0.6"
serde_macros = "0.5"
serde_macros = "0.6"

2
components/profile_traits/Cargo.toml
View file

@ -31,5 +31,5 @@ path = "../plugins"
[dependencies]
serde = "0.6"
serde_macros = "0.5"
serde_macros = "0.6"
time = "0.1.12"

2
components/script_traits/Cargo.toml
View file

@ -37,5 +37,5 @@ app_units = {version = "0.1", features = ["plugins"]}
libc = "0.1"
euclid = {version = "0.3", features = ["plugins"]}
serde = "0.6"
serde_macros = "0.5"
serde_macros = "0.6"
time = "0.1.12"

79
components/servo/Cargo.lock generated
View file

@ -73,13 +73,13 @@ dependencies = [
[[package]]
name = "app_units"
version = "0.1.1"
version = "0.1.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"euclid 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
"rustc-serialize 0.3.16 (registry+https://github.com/rust-lang/crates.io-index)",
"serde 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)",
"serde_macros 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)",
"serde_macros 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
@ -174,7 +174,7 @@ dependencies = [
"offscreen_gl_context 0.1.0 (git+https://github.com/ecoal95/rust-offscreen-rendering-context)",
"plugins 0.0.1",
"serde 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)",
"serde_macros 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)",
"serde_macros 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)",
"util 0.0.1",
]
@ -248,7 +248,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
name = "compositing"
version = "0.0.1"
dependencies = [
"app_units 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
"app_units 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
"azure 0.2.0 (git+https://github.com/servo/rust-azure)",
"canvas 0.0.1",
"canvas_traits 0.0.1",
@ -324,7 +324,7 @@ dependencies = [
"encoding 0.2.32 (registry+https://github.com/rust-lang/crates.io-index)",
"matches 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
"serde 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)",
"serde_macros 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)",
"serde_macros 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
@ -352,7 +352,7 @@ dependencies = [
"plugins 0.0.1",
"rustc-serialize 0.3.16 (registry+https://github.com/rust-lang/crates.io-index)",
"serde 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)",
"serde_macros 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)",
"serde_macros 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)",
"time 0.1.32 (registry+https://github.com/rust-lang/crates.io-index)",
"url 0.2.37 (registry+https://github.com/rust-lang/crates.io-index)",
"util 0.0.1",
@ -369,7 +369,7 @@ dependencies = [
"plugins 0.0.1",
"rustc-serialize 0.3.16 (registry+https://github.com/rust-lang/crates.io-index)",
"serde 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)",
"serde_macros 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)",
"serde_macros 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)",
"time 0.1.32 (registry+https://github.com/rust-lang/crates.io-index)",
"url 0.2.37 (registry+https://github.com/rust-lang/crates.io-index)",
"util 0.0.1",
@ -516,19 +516,6 @@ dependencies = [
"regex 0.1.41 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
name = "euclid"
version = "0.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"log 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
"num 0.1.27 (registry+https://github.com/rust-lang/crates.io-index)",
"rand 0.3.11 (registry+https://github.com/rust-lang/crates.io-index)",
"rustc-serialize 0.3.16 (registry+https://github.com/rust-lang/crates.io-index)",
"serde 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)",
"serde_macros 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
name = "euclid"
version = "0.3.2"
@ -636,7 +623,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
name = "gfx"
version = "0.0.1"
dependencies = [
"app_units 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
"app_units 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
"azure 0.2.0 (git+https://github.com/servo/rust-azure)",
"bitflags 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
"canvas_traits 0.0.1",
@ -662,7 +649,7 @@ dependencies = [
"rustc-serialize 0.3.16 (registry+https://github.com/rust-lang/crates.io-index)",
"script_traits 0.0.1",
"serde 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)",
"serde_macros 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)",
"serde_macros 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)",
"simd 0.1.0 (git+https://github.com/huonw/simd)",
"skia 0.0.20130412 (git+https://github.com/servo/skia)",
"smallvec 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
@ -971,7 +958,7 @@ dependencies = [
"libc 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
"rand 0.3.11 (registry+https://github.com/rust-lang/crates.io-index)",
"serde 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)",
"serde_macros 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)",
"serde_macros 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
@ -1029,7 +1016,7 @@ dependencies = [
name = "layout"
version = "0.0.1"
dependencies = [
"app_units 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
"app_units 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
"azure 0.2.0 (git+https://github.com/servo/rust-azure)",
"bitflags 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
"canvas 0.0.1",
@ -1055,7 +1042,7 @@ dependencies = [
"selectors 0.1.0 (git+https://github.com/servo/rust-selectors)",
"serde 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)",
"serde_json 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
"serde_macros 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)",
"serde_macros 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)",
"smallvec 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
"string_cache 0.1.15 (registry+https://github.com/rust-lang/crates.io-index)",
"string_cache_plugin 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
@ -1078,7 +1065,7 @@ dependencies = [
"profile_traits 0.0.1",
"script_traits 0.0.1",
"serde 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)",
"serde_macros 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)",
"serde_macros 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)",
"url 0.2.37 (registry+https://github.com/rust-lang/crates.io-index)",
"util 0.0.1",
]
@ -1189,7 +1176,7 @@ dependencies = [
name = "msg"
version = "0.0.1"
dependencies = [
"app_units 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
"app_units 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
"azure 0.2.0 (git+https://github.com/servo/rust-azure)",
"bitflags 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
"canvas_traits 0.0.1",
@ -1203,7 +1190,7 @@ dependencies = [
"plugins 0.0.1",
"rustc-serialize 0.3.16 (registry+https://github.com/rust-lang/crates.io-index)",
"serde 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)",
"serde_macros 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)",
"serde_macros 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)",
"style_traits 0.0.1",
"url 0.2.37 (registry+https://github.com/rust-lang/crates.io-index)",
"util 0.0.1",
@ -1262,7 +1249,7 @@ dependencies = [
"regex 0.1.41 (registry+https://github.com/rust-lang/crates.io-index)",
"regex_macros 0.1.21 (registry+https://github.com/rust-lang/crates.io-index)",
"serde 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)",
"serde_macros 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)",
"serde_macros 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)",
"stb_image 0.1.0 (git+https://github.com/servo/rust-stb-image)",
"url 0.2.37 (registry+https://github.com/rust-lang/crates.io-index)",
"util 0.0.1",
@ -1329,7 +1316,7 @@ dependencies = [
"libc 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
"log 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
"serde 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)",
"serde_macros 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)",
"serde_macros 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)",
"x11 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
]
@ -1452,7 +1439,7 @@ dependencies = [
"ipc-channel 0.1.0 (git+https://github.com/pcwalton/ipc-channel)",
"plugins 0.0.1",
"serde 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)",
"serde_macros 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)",
"serde_macros 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)",
"time 0.1.32 (registry+https://github.com/rust-lang/crates.io-index)",
"url 0.2.37 (registry+https://github.com/rust-lang/crates.io-index)",
]
@ -1535,7 +1522,7 @@ name = "script"
version = "0.0.1"
dependencies = [
"angle 0.1.0 (git+https://github.com/ecoal95/angle?branch=servo)",
"app_units 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
"app_units 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
"bitflags 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
"canvas 0.0.1",
"canvas_traits 0.0.1",
@ -1588,7 +1575,7 @@ dependencies = [
name = "script_traits"
version = "0.0.1"
dependencies = [
"app_units 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
"app_units 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
"devtools_traits 0.0.1",
"euclid 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
"ipc-channel 0.1.0 (git+https://github.com/pcwalton/ipc-channel)",
@ -1598,7 +1585,7 @@ dependencies = [
"plugins 0.0.1",
"profile_traits 0.0.1",
"serde 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)",
"serde_macros 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)",
"serde_macros 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)",
"time 0.1.32 (registry+https://github.com/rust-lang/crates.io-index)",
"url 0.2.37 (registry+https://github.com/rust-lang/crates.io-index)",
"util 0.0.1",
@ -1646,14 +1633,6 @@ dependencies = [
"serde 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
name = "serde_macros"
version = "0.5.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"serde_codegen 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
name = "serde_macros"
version = "0.6.1"
@ -1760,7 +1739,7 @@ dependencies = [
name = "style"
version = "0.0.1"
dependencies = [
"app_units 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
"app_units 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
"bitflags 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
"cssparser 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)",
"encoding 0.2.32 (registry+https://github.com/rust-lang/crates.io-index)",
@ -1774,7 +1753,7 @@ dependencies = [
"rustc-serialize 0.3.16 (registry+https://github.com/rust-lang/crates.io-index)",
"selectors 0.1.0 (git+https://github.com/servo/rust-selectors)",
"serde 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)",
"serde_macros 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)",
"serde_macros 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)",
"smallvec 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
"string_cache 0.1.15 (registry+https://github.com/rust-lang/crates.io-index)",
"string_cache_plugin 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
@ -1787,9 +1766,9 @@ dependencies = [
name = "style_tests"
version = "0.0.1"
dependencies = [
"app_units 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
"app_units 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
"cssparser 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)",
"euclid 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
"euclid 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
"selectors 0.1.0 (git+https://github.com/servo/rust-selectors)",
"string_cache 0.1.15 (registry+https://github.com/rust-lang/crates.io-index)",
"string_cache_plugin 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
@ -1812,7 +1791,7 @@ dependencies = [
"rustc-serialize 0.3.16 (registry+https://github.com/rust-lang/crates.io-index)",
"selectors 0.1.0 (git+https://github.com/servo/rust-selectors)",
"serde 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)",
"serde_macros 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)",
"serde_macros 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)",
"url 0.2.37 (registry+https://github.com/rust-lang/crates.io-index)",
"util 0.0.1",
]
@ -1936,7 +1915,7 @@ dependencies = [
name = "util"
version = "0.0.1"
dependencies = [
"app_units 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
"app_units 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
"azure 0.2.0 (git+https://github.com/servo/rust-azure)",
"bitflags 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
"cssparser 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)",
@ -1957,7 +1936,7 @@ dependencies = [
"rustc-serialize 0.3.16 (registry+https://github.com/rust-lang/crates.io-index)",
"selectors 0.1.0 (git+https://github.com/servo/rust-selectors)",
"serde 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)",
"serde_macros 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)",
"serde_macros 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)",
"smallvec 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
"string_cache 0.1.15 (registry+https://github.com/rust-lang/crates.io-index)",
"url 0.2.37 (registry+https://github.com/rust-lang/crates.io-index)",
@ -1967,7 +1946,7 @@ dependencies = [
name = "util_tests"
version = "0.0.1"
dependencies = [
"euclid 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
"euclid 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
"libc 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
"plugins 0.0.1",
"util 0.0.1",

2
components/style/Cargo.toml
View file

@ -45,4 +45,4 @@ string_cache = "0.1"
string_cache_plugin = "0.1"
euclid = {version = "0.3", features = ["plugins"]}
serde = "0.6"
serde_macros = "0.5"
serde_macros = "0.6"

2
components/style_traits/Cargo.toml
View file

@ -32,4 +32,4 @@ lazy_static = "0.1.10"
num = "0.1.24"
rustc-serialize = "0.3"
serde = "0.6"
serde_macros = "0.5"
serde_macros = "0.6"

2
components/util/Cargo.toml
View file

@ -56,7 +56,7 @@ num_cpus = "0.2.2"
num = "0.1.24"
euclid = {version = "0.3", features = ["plugins"]}
serde = "0.6"
serde_macros = "0.5"
serde_macros = "0.6"
string_cache = "0.1"
lazy_static = "0.1"
getopts = "0.2.11"