Skip to content

Commit

Permalink
Auto merge of #15769 - nox:die-codegen-die, r=jdm
Browse files Browse the repository at this point in the history 
Kill serde_codegen 💣

<!-- 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/15769)
<!-- Reviewable:end -->
  • Loading branch information
bors-servo committed Feb 28, 2017
2 parents fbfcfc2 + f8467a2 commit 74e7afa
Show file tree
Hide file tree
Showing 17 changed files with 51 additions and 154 deletions.
94 changes: 31 additions & 63 deletions Cargo.lock
View file

Large diffs are not rendered by default.

6 changes: 1 addition & 5 deletions components/canvas/Cargo.toml
View file
Expand Up @@ -20,8 +20,4 @@ log = "0.3.5"
num-traits = "0.1.32"
offscreen_gl_context = "0.6"
servo_config = {path = "../config"}

[dependencies.webrender_traits]
git = "https://github.com/servo/webrender"
default-features = false
features = ["serde_derive"]
webrender_traits = {git = "https://github.com/servo/webrender", features = ["ipc"]}
6 changes: 1 addition & 5 deletions components/canvas_traits/Cargo.toml
View file
Expand Up @@ -17,8 +17,4 @@ heapsize_derive = "0.1"
ipc-channel = "0.7"
serde = {version = "0.9", features = ["unstable"]}
serde_derive = "0.9"

[dependencies.webrender_traits]
git = "https://github.com/servo/webrender"
default-features = false
features = ["serde_derive", "ipc"]
webrender_traits = {git = "https://github.com/servo/webrender", features = ["ipc"]}
12 changes: 2 additions & 10 deletions components/compositing/Cargo.toml
View file
Expand Up @@ -25,13 +25,5 @@ servo_geometry = {path = "../geometry", features = ["servo"]}
servo_url = {path = "../url", features = ["servo"]}
style_traits = {path = "../style_traits"}
time = "0.1.17"

[dependencies.webrender]
git = "https://github.com/servo/webrender"
default-features = false
features = ["serde_derive"]

[dependencies.webrender_traits]
git = "https://github.com/servo/webrender"
default-features = false
features = ["serde_derive", "ipc"]
webrender = {git = "https://github.com/servo/webrender"}
webrender_traits = {git = "https://github.com/servo/webrender", features = ["ipc"]}
6 changes: 1 addition & 5 deletions components/constellation/Cargo.toml
View file
Expand Up @@ -36,11 +36,7 @@ servo_rand = {path = "../rand"}
servo_remutex = {path = "../remutex"}
servo_url = {path = "../url", features = ["servo"]}
webvr_traits = {path = "../webvr_traits"}

[dependencies.webrender_traits]
git = "https://github.com/servo/webrender"
default-features = false
features = ["serde_derive", "ipc"]
webrender_traits = {git = "https://github.com/servo/webrender", features = ["ipc"]}

[target.'cfg(not(target_os = "windows"))'.dependencies]
gaol = {git = "https://github.com/servo/gaol"}
8 changes: 2 additions & 6 deletions components/gfx/Cargo.toml
View file
Expand Up @@ -38,13 +38,9 @@ style = {path = "../style"}
style_traits = {path = "../style_traits"}
time = "0.1.12"
unicode-script = {version = "0.1", features = ["harfbuzz"]}
webrender_traits = {git = "https://github.com/servo/webrender", features = ["ipc"]}
xi-unicode = "0.1.0"

[dependencies.webrender_traits]
git = "https://github.com/servo/webrender"
default-features = false
features = ["serde_derive", "ipc"]

[target.'cfg(target_os = "macos")'.dependencies]
byteorder = "1.0"
core-foundation = "0.3"
Expand All @@ -59,5 +55,5 @@ servo-fontconfig = "0.2.1"
simd = "0.2.0"

[target.'cfg(target_os = "windows")'.dependencies]
dwrote = "0.2"
dwrote = "0.3"
truetype = "0.26"
6 changes: 1 addition & 5 deletions components/layout/Cargo.toml
View file
Expand Up @@ -45,8 +45,4 @@ style = {path = "../style"}
style_traits = {path = "../style_traits"}
unicode-bidi = "0.2"
unicode-script = {version = "0.1", features = ["harfbuzz"]}

[dependencies.webrender_traits]
git = "https://github.com/servo/webrender"
default-features = false
features = ["serde_derive", "ipc"]
webrender_traits = {git = "https://github.com/servo/webrender", features = ["ipc"]}
6 changes: 1 addition & 5 deletions components/layout_thread/Cargo.toml
View file
Expand Up @@ -36,8 +36,4 @@ servo_config = {path = "../config"}
servo_geometry = {path = "../geometry"}
servo_url = {path = "../url"}
style = {path = "../style"}

[dependencies.webrender_traits]
git = "https://github.com/servo/webrender"
default-features = false
features = ["serde_derive", "ipc"]
webrender_traits = {git = "https://github.com/servo/webrender", features = ["ipc"]}
6 changes: 1 addition & 5 deletions components/layout_traits/Cargo.toml
View file
Expand Up @@ -17,8 +17,4 @@ net_traits = {path = "../net_traits"}
profile_traits = {path = "../profile_traits"}
script_traits = {path = "../script_traits"}
servo_url = {path = "../url"}

[dependencies.webrender_traits]
git = "https://github.com/servo/webrender"
default-features = false
features = ["serde_derive", "ipc"]
webrender_traits = {git = "https://github.com/servo/webrender", features = ["ipc"]}
6 changes: 1 addition & 5 deletions components/msg/Cargo.toml
View file
Expand Up @@ -16,8 +16,4 @@ heapsize = "0.3.0"
heapsize_derive = "0.1"
serde = "0.9"
serde_derive = "0.9"

[dependencies.webrender_traits]
git = "https://github.com/servo/webrender"
default-features = false
features = ["serde_derive", "ipc"]
webrender_traits = {git = "https://github.com/servo/webrender", features = ["ipc"]}
6 changes: 1 addition & 5 deletions components/net/Cargo.toml
View file
Expand Up @@ -40,12 +40,8 @@ time = "0.1.17"
unicase = "1.4.0"
url = {version = "1.2", features = ["heap_size"]}
uuid = {version = "0.4", features = ["v4"]}
webrender_traits = {git = "https://github.com/servo/webrender", features = ["ipc"]}
websocket = "0.17"

[dependencies.webrender_traits]
git = "https://github.com/servo/webrender"
default-features = false
features = ["serde_derive", "ipc"]

[target.'cfg(any(target_os = "macos", target_os = "linux", target_os = "windows"))'.dependencies]
tinyfiledialogs = "2.5.9"
6 changes: 1 addition & 5 deletions components/net_traits/Cargo.toml
View file
Expand Up @@ -27,9 +27,5 @@ servo_config = {path = "../config", features = ["servo"]}
servo_url = {path = "../url", features = ["servo"]}
url = {version = "1.2", features = ["heap_size"]}
uuid = {version = "0.4", features = ["v4", "serde"]}
webrender_traits = {git = "https://github.com/servo/webrender", features = ["ipc"]}
websocket = "0.17"

[dependencies.webrender_traits]
git = "https://github.com/servo/webrender"
default-features = false
features = ["serde_derive", "ipc"]
6 changes: 1 addition & 5 deletions components/script/Cargo.toml
View file
Expand Up @@ -88,10 +88,6 @@ url = {version = "1.2", features = ["heap_size", "query_encoding"]}
uuid = {version = "0.4", features = ["v4"]}
websocket = "0.17"
xml5ever = {version = "0.4", features = ["unstable"]}
webrender_traits = {git = "https://github.com/servo/webrender", features = ["ipc"]}
webvr = {path = "../webvr"}
webvr_traits = {path = "../webvr_traits"}

[dependencies.webrender_traits]
git = "https://github.com/servo/webrender"
default-features = false
features = ["nightly", "serde_derive", "ipc"]
14 changes: 3 additions & 11 deletions components/servo/Cargo.toml
View file
Expand Up @@ -49,19 +49,11 @@ servo_geometry = {path = "../geometry"}
servo_url = {path = "../url"}
style = {path = "../style", features = ["servo"]}
style_traits = {path = "../style_traits", features = ["servo"]}
webrender = {git = "https://github.com/servo/webrender"}
webrender_traits = {git = "https://github.com/servo/webrender", features = ["ipc"]}
webdriver_server = {path = "../webdriver_server", optional = true}
webvr = {path = "../webvr"}
webvr_traits = {path = "../webvr_traits"}
webdriver_server = {path = "../webdriver_server", optional = true}

[dependencies.webrender]
git = "https://github.com/servo/webrender"
default-features = false
features = ["serde_derive"]

[dependencies.webrender_traits]
git = "https://github.com/servo/webrender"
default-features = false
features = ["serde_derive", "ipc"]

[target.'cfg(not(target_os = "windows"))'.dependencies]
gaol = {git = "https://github.com/servo/gaol"}
6 changes: 1 addition & 5 deletions components/webvr/Cargo.toml
View file
Expand Up @@ -16,8 +16,4 @@ msg = {path = "../msg"}
script_traits = {path = "../script_traits"}
servo_config = {path = "../config"}
webvr_traits = {path = "../webvr_traits" }

[dependencies.webrender_traits]
git = "https://github.com/servo/webrender"
default_features = false
features = ["serde_derive"]
webrender_traits = {git = "https://github.com/servo/webrender", features = ["ipc"]}
6 changes: 1 addition & 5 deletions ports/cef/Cargo.toml
View file
Expand Up @@ -33,11 +33,7 @@ servo_config = {path = "../../components/config"}
servo_geometry = {path = "../../components/geometry"}
servo_url = {path = "../../components/url"}
style_traits = {path = "../../components/style_traits"}

[dependencies.webrender_traits]
git = "https://github.com/servo/webrender"
default-features = false
features = ["serde_derive", "ipc"]
webrender_traits = {git = "https://github.com/servo/webrender", features = ["ipc"]}

[target.'cfg(target_os="macos")'.dependencies]
objc = "0.2"
Expand Down
5 changes: 1 addition & 4 deletions ports/glutin/Cargo.toml
View file
Expand Up @@ -22,10 +22,7 @@ servo_geometry = {path = "../../components/geometry"}
servo_config = {path = "../../components/config"}
servo_url = {path = "../../components/url"}
style_traits = {path = "../../components/style_traits"}

[dependencies.webrender_traits]
git = "https://github.com/servo/webrender"
default_features = false
webrender_traits = {git = "https://github.com/servo/webrender", features = ["ipc"]}

[target.'cfg(any(target_os = "linux", target_os = "macos"))'.dependencies]
osmesa-sys = "0.1.2"
Expand Down

0 comments on commit 74e7afa

Please sign in to comment.