Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-06-13 19:04:30 +00:00
Code Issues Projects Releases Packages Wiki Activity

Update servo to use published app units crate

Browse source
This commit is contained in:
Glenn Watson 2015-10-01 11:45:35 +10:00
parent 35888e5a1d
commit 1999ea5e43
11 changed files with 52 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

4
components/compositing/Cargo.toml
View file

@ -7,9 +7,6 @@ authors = ["The Servo Project Developers"]
name = "compositing" name = "compositing"
path = "lib.rs" path = "lib.rs"
[dependencies.app_units]
path = "../app_units"
[dependencies.gfx] [dependencies.gfx]
path = "../gfx" path = "../gfx"
@ -74,6 +71,7 @@ version = "0.2"
features = [ "serde_serialization" ] features = [ "serde_serialization" ]
[dependencies] [dependencies]
app_units = "0.1"
log = "0.3" log = "0.3"
num = "0.1.24" num = "0.1.24"
time = "0.1.17" time = "0.1.17"

4
components/gfx/Cargo.toml
View file

@ -9,6 +9,7 @@ name = "gfx"
path = "lib.rs" path = "lib.rs"
[dependencies] [dependencies]
app_units = "0.1"
bitflags = "0.3" bitflags = "0.3"
euclid = "0.2" euclid = "0.2"
fnv = "1.0" fnv = "1.0"
@ -25,9 +26,6 @@ string_cache = "0.1"
time = "0.1.12" time = "0.1.12"
unicode-script = { version = "0.1", features = ["harfbuzz"] } unicode-script = { version = "0.1", features = ["harfbuzz"] }
[dependencies.app_units]
path = "../app_units"
[dependencies.plugins] [dependencies.plugins]
path = "../plugins" path = "../plugins"

4
components/layout/Cargo.toml
View file

@ -7,9 +7,6 @@ authors = ["The Servo Project Developers"]
name = "layout" name = "layout"
path = "lib.rs" path = "lib.rs"
[dependencies.app_units]
path = "../app_units"
[dependencies.azure] [dependencies.azure]
git = "https://github.com/servo/rust-azure" git = "https://github.com/servo/rust-azure"
@ -70,6 +67,7 @@ version = "0.2"
features = [ "serde_serialization" ] features = [ "serde_serialization" ]
[dependencies] [dependencies]
app_units = "0.1"
log = "0.3" log = "0.3"
encoding = "0.2" encoding = "0.2"
fnv = "1.0" fnv = "1.0"

4
components/msg/Cargo.toml
View file

@ -7,9 +7,6 @@ authors = ["The Servo Project Developers"]
name = "msg" name = "msg"
path = "lib.rs" path = "lib.rs"
[dependencies.app_units]
path = "../app_units"
[dependencies.util] [dependencies.util]
path = "../util" path = "../util"
@ -48,6 +45,7 @@ features = ["texture_surface"]
path = "../plugins" path = "../plugins"
[dependencies] [dependencies]
app_units = "0.1"
bitflags = "0.3" bitflags = "0.3"
rustc-serialize = "0.3.4" rustc-serialize = "0.3.4"
euclid = "0.2" euclid = "0.2"

4
components/script/Cargo.toml
View file

@ -12,9 +12,6 @@ path = "lib.rs"
[features] [features]
debugmozjs = ['js/debugmozjs'] debugmozjs = ['js/debugmozjs']
[dependencies.app_units]
path = "../app_units"
[dependencies.plugins] [dependencies.plugins]
path = "../plugins" path = "../plugins"
@ -74,6 +71,7 @@ version = "0.6"
features = [ "serde-serialization" ] features = [ "serde-serialization" ]
[dependencies] [dependencies]
app_units = "0.1"
log = "0.3" log = "0.3"
encoding = "0.2" encoding = "0.2"
fnv = "1.0" fnv = "1.0"

4
components/script_traits/Cargo.toml
View file

@ -7,9 +7,6 @@ authors = ["The Servo Project Developers"]
name = "script_traits" name = "script_traits"
path = "lib.rs" path = "lib.rs"
[dependencies.app_units]
path = "../app_units"
[dependencies.msg] [dependencies.msg]
path = "../msg" path = "../msg"
@ -36,6 +33,7 @@ version = "0.2"
features = [ "serde_serialization" ] features = [ "serde_serialization" ]
[dependencies] [dependencies]
app_units = "0.1"
libc = "0.1" libc = "0.1"
euclid = "0.2" euclid = "0.2"
serde = "0.6" serde = "0.6"

19
components/servo/Cargo.lock generated
View file

@ -74,6 +74,7 @@ dependencies = [
[[package]] [[package]]
name = "app_units" name = "app_units"
version = "0.1.0" version = "0.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [ dependencies = [
"euclid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "euclid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
"rustc-serialize 0.3.16 (registry+https://github.com/rust-lang/crates.io-index)", "rustc-serialize 0.3.16 (registry+https://github.com/rust-lang/crates.io-index)",
@ -233,7 +234,7 @@ dependencies = [
name = "compositing" name = "compositing"
version = "0.0.1" version = "0.0.1"
dependencies = [ dependencies = [
"app_units 0.1.0", "app_units 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
"azure 0.1.0 (git+https://github.com/servo/rust-azure)", "azure 0.1.0 (git+https://github.com/servo/rust-azure)",
"canvas 0.0.1", "canvas 0.0.1",
"canvas_traits 0.0.1", "canvas_traits 0.0.1",
@ -591,7 +592,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
name = "gfx" name = "gfx"
version = "0.0.1" version = "0.0.1"
dependencies = [ dependencies = [
"app_units 0.1.0", "app_units 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
"azure 0.1.0 (git+https://github.com/servo/rust-azure)", "azure 0.1.0 (git+https://github.com/servo/rust-azure)",
"bitflags 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", "bitflags 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
"canvas_traits 0.0.1", "canvas_traits 0.0.1",
@ -942,7 +943,7 @@ dependencies = [
name = "layout" name = "layout"
version = "0.0.1" version = "0.0.1"
dependencies = [ dependencies = [
"app_units 0.1.0", "app_units 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
"azure 0.1.0 (git+https://github.com/servo/rust-azure)", "azure 0.1.0 (git+https://github.com/servo/rust-azure)",
"bitflags 0.3.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 0.0.1",
@ -1097,7 +1098,7 @@ dependencies = [
name = "msg" name = "msg"
version = "0.0.1" version = "0.0.1"
dependencies = [ dependencies = [
"app_units 0.1.0", "app_units 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
"azure 0.1.0 (git+https://github.com/servo/rust-azure)", "azure 0.1.0 (git+https://github.com/servo/rust-azure)",
"bitflags 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", "bitflags 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
"canvas_traits 0.0.1", "canvas_traits 0.0.1",
@ -1453,7 +1454,7 @@ name = "script"
version = "0.0.1" version = "0.0.1"
dependencies = [ dependencies = [
"angle 0.1.0 (git+https://github.com/ecoal95/angle?branch=servo)", "angle 0.1.0 (git+https://github.com/ecoal95/angle?branch=servo)",
"app_units 0.1.0", "app_units 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
"bitflags 0.3.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 0.0.1",
"canvas_traits 0.0.1", "canvas_traits 0.0.1",
@ -1504,7 +1505,7 @@ dependencies = [
name = "script_traits" name = "script_traits"
version = "0.0.1" version = "0.0.1"
dependencies = [ dependencies = [
"app_units 0.1.0", "app_units 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
"devtools_traits 0.0.1", "devtools_traits 0.0.1",
"euclid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "euclid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
"ipc-channel 0.1.0 (git+https://github.com/pcwalton/ipc-channel)", "ipc-channel 0.1.0 (git+https://github.com/pcwalton/ipc-channel)",
@ -1667,7 +1668,7 @@ dependencies = [
name = "style" name = "style"
version = "0.0.1" version = "0.0.1"
dependencies = [ dependencies = [
"app_units 0.1.0", "app_units 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
"bitflags 0.3.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)", "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)", "encoding 0.2.32 (registry+https://github.com/rust-lang/crates.io-index)",
@ -1694,7 +1695,7 @@ dependencies = [
name = "style_tests" name = "style_tests"
version = "0.0.1" version = "0.0.1"
dependencies = [ dependencies = [
"app_units 0.1.0", "app_units 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
"cssparser 0.3.9 (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.0 (registry+https://github.com/rust-lang/crates.io-index)", "euclid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
"selectors 0.1.0 (git+https://github.com/servo/rust-selectors)", "selectors 0.1.0 (git+https://github.com/servo/rust-selectors)",
@ -1838,7 +1839,7 @@ dependencies = [
name = "util" name = "util"
version = "0.0.1" version = "0.0.1"
dependencies = [ dependencies = [
"app_units 0.1.0", "app_units 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
"azure 0.1.0 (git+https://github.com/servo/rust-azure)", "azure 0.1.0 (git+https://github.com/servo/rust-azure)",
"bitflags 0.3.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)", "cssparser 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)",

4
components/style/Cargo.toml
View file

@ -30,10 +30,8 @@ features = [ "serde-serialization" ]
version = "0.2" version = "0.2"
features = [ "serde_serialization" ] features = [ "serde_serialization" ]
[dependencies.app_units]
path = "../app_units"
[dependencies] [dependencies]
app_units = "0.1"
log = "0.3" log = "0.3"
encoding = "0.2" encoding = "0.2"
fnv = "1.0" fnv = "1.0"

4
components/util/Cargo.toml
View file

@ -41,10 +41,8 @@ features = [ "serde_serialization" ]
[dependencies.selectors] [dependencies.selectors]
git = "https://github.com/servo/rust-selectors" git = "https://github.com/servo/rust-selectors"
[dependencies.app_units]
path = "../app_units"
[dependencies] [dependencies]
app_units = "0.1"
log = "0.3" log = "0.3"
bitflags = "0.3" bitflags = "0.3"
html5ever = { version = "0.2.1", features = ["unstable"] } html5ever = { version = "0.2.1", features = ["unstable"] }

36
ports/cef/Cargo.lock generated
View file

@ -63,6 +63,17 @@ dependencies = [
"libc 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
] ]
[[package]]
name = "app_units"
version = "0.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"euclid 0.2.0 (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.0 (registry+https://github.com/rust-lang/crates.io-index)",
"serde_macros 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]] [[package]]
name = "aster" name = "aster"
version = "0.4.7" version = "0.4.7"
@ -215,6 +226,7 @@ dependencies = [
name = "compositing" name = "compositing"
version = "0.0.1" version = "0.0.1"
dependencies = [ dependencies = [
"app_units 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
"azure 0.1.0 (git+https://github.com/servo/rust-azure)", "azure 0.1.0 (git+https://github.com/servo/rust-azure)",
"canvas 0.0.1", "canvas 0.0.1",
"canvas_traits 0.0.1", "canvas_traits 0.0.1",
@ -538,6 +550,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
name = "gfx" name = "gfx"
version = "0.0.1" version = "0.0.1"
dependencies = [ dependencies = [
"app_units 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
"azure 0.1.0 (git+https://github.com/servo/rust-azure)", "azure 0.1.0 (git+https://github.com/servo/rust-azure)",
"bitflags 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", "bitflags 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
"canvas_traits 0.0.1", "canvas_traits 0.0.1",
@ -549,7 +562,7 @@ dependencies = [
"fontconfig 0.1.0 (git+https://github.com/servo/rust-fontconfig)", "fontconfig 0.1.0 (git+https://github.com/servo/rust-fontconfig)",
"freetype 0.1.0 (git+https://github.com/servo/rust-freetype)", "freetype 0.1.0 (git+https://github.com/servo/rust-freetype)",
"gfx_traits 0.0.1", "gfx_traits 0.0.1",
"harfbuzz 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", "harfbuzz-sys 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
"ipc-channel 0.1.0 (git+https://github.com/pcwalton/ipc-channel)", "ipc-channel 0.1.0 (git+https://github.com/pcwalton/ipc-channel)",
"layers 0.1.0 (git+https://github.com/servo/rust-layers)", "layers 0.1.0 (git+https://github.com/servo/rust-layers)",
"lazy_static 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)",
@ -570,6 +583,7 @@ dependencies = [
"string_cache 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)", "string_cache 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)",
"style 0.0.1", "style 0.0.1",
"time 0.1.32 (registry+https://github.com/rust-lang/crates.io-index)", "time 0.1.32 (registry+https://github.com/rust-lang/crates.io-index)",
"unicode-script 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
"url 0.2.37 (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", "util 0.0.1",
] ]
@ -685,11 +699,12 @@ dependencies = [
] ]
[[package]] [[package]]
name = "harfbuzz" name = "harfbuzz-sys"
version = "0.1.2" version = "0.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [ dependencies = [
"libc 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
"pkg-config 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)",
] ]
[[package]] [[package]]
@ -879,6 +894,7 @@ dependencies = [
name = "layout" name = "layout"
version = "0.0.1" version = "0.0.1"
dependencies = [ dependencies = [
"app_units 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
"azure 0.1.0 (git+https://github.com/servo/rust-azure)", "azure 0.1.0 (git+https://github.com/servo/rust-azure)",
"bitflags 0.3.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 0.0.1",
@ -910,6 +926,7 @@ dependencies = [
"string_cache_plugin 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", "string_cache_plugin 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
"style 0.0.1", "style 0.0.1",
"unicode-bidi 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", "unicode-bidi 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
"unicode-script 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
"url 0.2.37 (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", "util 0.0.1",
] ]
@ -1032,6 +1049,7 @@ dependencies = [
name = "msg" name = "msg"
version = "0.0.1" version = "0.0.1"
dependencies = [ dependencies = [
"app_units 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
"azure 0.1.0 (git+https://github.com/servo/rust-azure)", "azure 0.1.0 (git+https://github.com/servo/rust-azure)",
"bitflags 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", "bitflags 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
"canvas_traits 0.0.1", "canvas_traits 0.0.1",
@ -1369,6 +1387,7 @@ name = "script"
version = "0.0.1" version = "0.0.1"
dependencies = [ dependencies = [
"angle 0.1.0 (git+https://github.com/ecoal95/angle?branch=servo)", "angle 0.1.0 (git+https://github.com/ecoal95/angle?branch=servo)",
"app_units 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
"bitflags 0.3.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 0.0.1",
"canvas_traits 0.0.1", "canvas_traits 0.0.1",
@ -1411,6 +1430,7 @@ dependencies = [
name = "script_traits" name = "script_traits"
version = "0.0.1" version = "0.0.1"
dependencies = [ dependencies = [
"app_units 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
"devtools_traits 0.0.1", "devtools_traits 0.0.1",
"euclid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "euclid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
"ipc-channel 0.1.0 (git+https://github.com/pcwalton/ipc-channel)", "ipc-channel 0.1.0 (git+https://github.com/pcwalton/ipc-channel)",
@ -1606,6 +1626,7 @@ dependencies = [
name = "style" name = "style"
version = "0.0.1" version = "0.0.1"
dependencies = [ dependencies = [
"app_units 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
"bitflags 0.3.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)", "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)", "encoding 0.2.32 (registry+https://github.com/rust-lang/crates.io-index)",
@ -1720,6 +1741,14 @@ dependencies = [
"matches 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", "matches 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
] ]
[[package]]
name = "unicode-script"
version = "0.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"harfbuzz-sys 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]] [[package]]
name = "unreachable" name = "unreachable"
version = "0.0.2" version = "0.0.2"
@ -1752,6 +1781,7 @@ dependencies = [
name = "util" name = "util"
version = "0.0.1" version = "0.0.1"
dependencies = [ dependencies = [
"app_units 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
"azure 0.1.0 (git+https://github.com/servo/rust-azure)", "azure 0.1.0 (git+https://github.com/servo/rust-azure)",
"bitflags 0.3.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)", "cssparser 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)",

4
tests/unit/style/Cargo.toml
View file

@ -8,9 +8,6 @@ name = "style_tests"
path = "lib.rs" path = "lib.rs"
doctest = false doctest = false
[dependencies.app_units]
path = "../../../components/app_units"
[dependencies.style] [dependencies.style]
path = "../../../components/style" path = "../../../components/style"
@ -24,6 +21,7 @@ path = "../../../components/util"
git = "https://github.com/servo/rust-selectors" git = "https://github.com/servo/rust-selectors"
[dependencies] [dependencies]
app_units = "0.1"
url = "0.2" url = "0.2"
cssparser = "0.3.1" cssparser = "0.3.1"
string_cache = "0.1" string_cache = "0.1"