Skip to content

Commit

Permalink
servo: Merge #10857 - Simplify TOML syntax (from servo:toml); r=nox
Browse files Browse the repository at this point in the history 
* Sections like `[dependencies.foo]` can be entries in a `[dependencies]` section with the `{key = value}` syntax.
* Per-target dependencies can be expressed with more general `cfg(…)` conditions instead of exact target triples: rust-lang/cargo#2328

Source-Repo: https://github.com/servo/servo
Source-Revision: 2729864af73d62719ea0fd55cef417c43bdd951e

UltraBlame original commit: 6710bf1dbafec084574fd82064e1f7896091bacf
  • Loading branch information
@marco-c
marco-c committed Oct 1, 2019
1 parent f5a5c1d commit 42039be
Show file tree
Hide file tree
Showing 36 changed files with 288 additions and 901 deletions.
29 changes: 7 additions & 22 deletions servo/components/canvas/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,29 +8,14 @@ publish = false
name = "canvas"
path = "lib.rs"

[dependencies.azure]
git = "https://github.com/servo/rust-azure"
features = ["plugins"]

[dependencies.canvas_traits]
path = "../canvas_traits"

[dependencies.plugins]
path = "../plugins"

[dependencies.util]
path = "../util"

[dependencies.gfx_traits]
path = "../gfx_traits"

[dependencies.ipc-channel]
git = "https://github.com/servo/ipc-channel"

[dependencies.webrender_traits]
git = "https://github.com/servo/webrender_traits"

[dependencies]
azure = {git = "https://github.com/servo/rust-azure", features = ["plugins"]}
canvas_traits = {path = "../canvas_traits"}
plugins = {path = "../plugins"}
util = {path = "../util"}
gfx_traits = {path = "../gfx_traits"}
ipc-channel = {git = "https://github.com/servo/ipc-channel"}
webrender_traits = {git = "https://github.com/servo/webrender_traits"}
euclid = {version = "0.6.4", features = ["plugins"]}
gleam = "0.2.8"
log = "0.3.5"
Expand Down
26 changes: 6 additions & 20 deletions servo/components/canvas_traits/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,27 +8,13 @@ publish = false
name = "canvas_traits"
path = "lib.rs"

[dependencies.gfx_traits]
path = "../gfx_traits"

[dependencies.azure]
git = "https://github.com/servo/rust-azure"
features = ["plugins"]

[dependencies.ipc-channel]
git = "https://github.com/servo/ipc-channel"

[dependencies.serde]
version = "0.7"
features = [ "nightly" ]

[dependencies.plugins]
path = "../plugins"

[dependencies.webrender_traits]
git = "https://github.com/servo/webrender_traits"

[dependencies]
gfx_traits = {path = "../gfx_traits"}
azure = {git = "https://github.com/servo/rust-azure", features = ["plugins"]}
ipc-channel = {git = "https://github.com/servo/ipc-channel"}
serde = {version = "0.7", features = [ "nightly" ]}
plugins = {path = "../plugins"}
webrender_traits = {git = "https://github.com/servo/webrender_traits"}
cssparser = {version = "0.5.4", features = ["heap_size", "serde-serialization"]}
euclid = {version = "0.6.4", features = ["plugins"]}
heapsize = "0.3.0"
Expand Down
99 changes: 22 additions & 77 deletions servo/components/compositing/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,84 +8,26 @@ publish = false
name = "compositing"
path = "lib.rs"

[dependencies.gfx]
path = "../gfx"

[dependencies.gfx_traits]
path = "../gfx_traits"

[dependencies.layout_traits]
path = "../layout_traits"

[dependencies.script_traits]
path = "../script_traits"

[dependencies.style_traits]
path = "../style_traits"

[dependencies.msg]
path = "../msg"

[dependencies.profile_traits]
path = "../profile_traits"

[dependencies.net_traits]
path = "../net_traits"

[dependencies.util]
path = "../util"

[dependencies.devtools_traits]
path = "../devtools_traits"

[dependencies.canvas_traits]
path = "../canvas_traits"

[dependencies.canvas]
path = "../canvas"

[dependencies.plugins]
path = "../plugins"

[dependencies.azure]
git = "https://github.com/servo/rust-azure"
features = ["plugins"]

[dependencies.layers]
git = "https://github.com/servo/rust-layers"
features = ["plugins"]

[dependencies.clipboard]
git = "https://github.com/aweinstock314/rust-clipboard"

[dependencies.ipc-channel]
git = "https://github.com/servo/ipc-channel"

[target.arm-linux-androideabi.dependencies.gaol]
git = "https://github.com/servo/gaol"

[target.x86_64-apple-darwin.dependencies.gaol]
git = "https://github.com/servo/gaol"

[target.x86_64-unknown-linux-gnu.dependencies.gaol]
git = "https://github.com/servo/gaol"

[target.i686-unknown-linux-gnu.dependencies.gaol]
git = "https://github.com/servo/gaol"

[target.arm-unknown-linux-gnueabihf.dependencies.gaol]
git = "https://github.com/servo/gaol"

[target.aarch64-unknown-linux-gnu.dependencies.gaol]
git = "https://github.com/servo/gaol"

[dependencies.webrender_traits]
git = "https://github.com/servo/webrender_traits"

[dependencies.webrender]
git = "https://github.com/servo/webrender"

[dependencies]
gfx = {path = "../gfx"}
gfx_traits = {path = "../gfx_traits"}
layout_traits = {path = "../layout_traits"}
script_traits = {path = "../script_traits"}
style_traits = {path = "../style_traits"}
msg = {path = "../msg"}
profile_traits = {path = "../profile_traits"}
net_traits = {path = "../net_traits"}
util = {path = "../util"}
devtools_traits = {path = "../devtools_traits"}
canvas_traits = {path = "../canvas_traits"}
canvas = {path = "../canvas"}
plugins = {path = "../plugins"}
azure = {git = "https://github.com/servo/rust-azure", features = ["plugins"]}
layers = {git = "https://github.com/servo/rust-layers", features = ["plugins"]}
clipboard = {git = "https://github.com/aweinstock314/rust-clipboard"}
ipc-channel = {git = "https://github.com/servo/ipc-channel"}
webrender_traits = {git = "https://github.com/servo/webrender_traits"}
webrender = {git = "https://github.com/servo/webrender"}
app_units = {version = "0.2.3", features = ["plugins"]}
euclid = {version = "0.6.4", features = ["plugins"]}
gleam = "0.2.8"
Expand All @@ -98,3 +40,6 @@ serde = "0.7"
serde_macros = "0.7"
time = "0.1.17"
url = {version = "1.0.0", features = ["heap_size"]}

[target.'cfg(not(target_os = "windows"))'.dependencies]
gaol = {git = "https://github.com/servo/gaol"}
20 changes: 5 additions & 15 deletions servo/components/devtools/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,22 +8,12 @@ publish = false
name = "devtools"
path = "lib.rs"

[dependencies.devtools_traits]
path = "../devtools_traits"

[dependencies.msg]
path = "../msg"

[dependencies.util]
path = "../util"

[dependencies.plugins]
path = "../plugins"

[dependencies.ipc-channel]
git = "https://github.com/servo/ipc-channel"

[dependencies]
devtools_traits = {path = "../devtools_traits"}
msg = {path = "../msg"}
util = {path = "../util"}
plugins = {path = "../plugins"}
ipc-channel = {git = "https://github.com/servo/ipc-channel"}
hyper = { version = "0.9", features = [ "serde-serialization" ] }
serde = "0.7"
serde_json = "0.7"
Expand Down
13 changes: 3 additions & 10 deletions servo/components/devtools_traits/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,16 +8,10 @@ publish = false
name = "devtools_traits"
path = "lib.rs"

[dependencies.msg]
path = "../msg"

[dependencies.ipc-channel]
git = "https://github.com/servo/ipc-channel"

[dependencies.plugins]
path = "../plugins"

[dependencies]
msg = {path = "../msg"}
ipc-channel = {git = "https://github.com/servo/ipc-channel"}
plugins = {path = "../plugins"}
heapsize = "0.3.0"
heapsize_plugin = "0.1.2"
hyper = { version = "0.9", features = [ "serde-serialization" ] }
Expand All @@ -26,4 +20,3 @@ bitflags = "0.3"
serde = "0.7"
serde_macros = "0.7"
url = {version = "1.0.0", features = ["heap_size"]}

110 changes: 19 additions & 91 deletions servo/components/gfx/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,100 +31,28 @@ string_cache = {version = "0.2.12", features = ["heap_size"]}
time = "0.1.12"
unicode-script = { version = "0.1", features = ["harfbuzz"] }
url = {version = "1.0.0", features = ["heap_size"]}

[dependencies.plugins]
path = "../plugins"

[dependencies.gfx_traits]
path = "../gfx_traits"

[dependencies.net_traits]
path = "../net_traits"

[dependencies.util]
path = "../util"

[dependencies.msg]
path = "../msg"

[dependencies.profile_traits]
path = "../profile_traits"

[dependencies.range]
path = "../range"

[dependencies.style]
path = "../style"

[dependencies.style_traits]
path = "../style_traits"

[dependencies.azure]
git = "https://github.com/servo/rust-azure"
features = ["plugins"]

[dependencies.layers]
git = "https://github.com/servo/rust-layers"
features = ["plugins"]

[dependencies.ipc-channel]
git = "https://github.com/servo/ipc-channel"

[dependencies.webrender_traits]
git = "https://github.com/servo/webrender_traits"

[target.x86_64-apple-darwin.dependencies]
plugins = {path = "../plugins"}
gfx_traits = {path = "../gfx_traits"}
net_traits = {path = "../net_traits"}
util = {path = "../util"}
msg = {path = "../msg"}
profile_traits = {path = "../profile_traits"}
range = {path = "../range"}
style = {path = "../style"}
style_traits = {path = "../style_traits"}
azure = {git = "https://github.com/servo/rust-azure", features = ["plugins"]}
layers = {git = "https://github.com/servo/rust-layers", features = ["plugins"]}
ipc-channel = {git = "https://github.com/servo/ipc-channel"}
webrender_traits = {git = "https://github.com/servo/webrender_traits"}

[target.'cfg(target_os = "macos")'.dependencies]
core-foundation = "0.2"
core-graphics = "0.3"
core-text = "1.1"

[target.i686-unknown-linux-gnu.dependencies]
servo-fontconfig = "0.2"

[target.x86_64-unknown-linux-gnu.dependencies]
servo-fontconfig = "0.2"

[target.arm-unknown-linux-gnueabihf.dependencies]
servo-fontconfig = "0.2"

[target.aarch64-unknown-linux-gnu.dependencies]
servo-fontconfig = "0.2"

[target.arm-linux-androideabi.dependencies]
[target.'cfg(any(target_os = "linux", target_os = "android", target_os = "windows"))'.dependencies]
servo-fontconfig = "0.2"
freetype = {git = "https://github.com/servo/rust-freetype"}

[target.x86_64-pc-windows-gnu.dependencies]
servo-fontconfig = "0.2"

[target.i686-unknown-linux-gnu.dependencies.freetype]
git = "https://github.com/servo/rust-freetype"

[target.x86_64-unknown-linux-gnu.dependencies.freetype]
git = "https://github.com/servo/rust-freetype"

[target.arm-unknown-linux-gnueabihf.dependencies.freetype]
git = "https://github.com/servo/rust-freetype"

[target.aarch64-unknown-linux-gnu.dependencies.freetype]
git = "https://github.com/servo/rust-freetype"

[target.arm-linux-androideabi.dependencies.freetype]
git = "https://github.com/servo/rust-freetype"

[target.x86_64-pc-windows-gnu.dependencies.freetype]
git = "https://github.com/servo/rust-freetype"

[target.x86_64-unknown-linux-gnu.dependencies.simd]
git = "https://github.com/huonw/simd"

[target.x86_64-apple-darwin.dependencies.simd]
git = "https://github.com/huonw/simd"

[target.aarch64-unknown-linux-gnu.dependencies.simd]
git = "https://github.com/huonw/simd"

[target.x86_64-pc-windows-gnu.dependencies.simd]
git = "https://github.com/huonw/simd"

[target.x86_64-pc-windows-msvc.dependencies.simd]
git = "https://github.com/huonw/simd"
[target.'cfg(any(target_arch = "x86_64", target_arch = "aarch64"))'.dependencies]
simd = {git = "https://github.com/huonw/simd"}
18 changes: 4 additions & 14 deletions servo/components/gfx_traits/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,21 +8,11 @@ publish = false
name = "gfx_traits"
path = "lib.rs"

[dependencies.azure]
git = "https://github.com/servo/rust-azure"
features = ["plugins"]

[dependencies.layers]
git = "https://github.com/servo/rust-layers"
features = ["plugins"]

[dependencies.msg]
path = "../msg"

[dependencies.plugins]
path = "../plugins"

[dependencies]
azure = {git = "https://github.com/servo/rust-azure", features = ["plugins"]}
layers = {git = "https://github.com/servo/rust-layers", features = ["plugins"]}
msg = {path = "../msg"}
plugins = {path = "../plugins"}
euclid = {version = "0.6.5", features = ["plugins"]}
heapsize = "0.3.0"
heapsize_plugin = "0.1.2"
Expand Down
Loading

0 comments on commit 42039be

Please sign in to comment.