aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--components/compositing/Cargo.toml4
-rw-r--r--components/gfx/Cargo.toml4
-rw-r--r--components/layout/Cargo.toml4
-rw-r--r--components/msg/Cargo.toml4
-rw-r--r--components/script/Cargo.toml4
-rw-r--r--components/script_traits/Cargo.toml4
-rw-r--r--components/servo/Cargo.lock19
-rw-r--r--components/style/Cargo.toml4
-rw-r--r--components/util/Cargo.toml4
-rw-r--r--ports/cef/Cargo.lock36
-rw-r--r--tests/unit/style/Cargo.toml4
11 files changed, 52 insertions, 39 deletions
diff --git a/components/compositing/Cargo.toml b/components/compositing/Cargo.toml
index bfd8e7578d8..c1dfc58938b 100644
--- a/components/compositing/Cargo.toml
+++ b/components/compositing/Cargo.toml
@@ -7,9 +7,6 @@ authors = ["The Servo Project Developers"]
name = "compositing"
path = "lib.rs"
-[dependencies.app_units]
-path = "../app_units"
-
[dependencies.gfx]
path = "../gfx"
@@ -74,6 +71,7 @@ version = "0.2"
features = [ "serde_serialization" ]
[dependencies]
+app_units = "0.1"
log = "0.3"
num = "0.1.24"
time = "0.1.17"
diff --git a/components/gfx/Cargo.toml b/components/gfx/Cargo.toml
index 227f96ecac7..204386757db 100644
--- a/components/gfx/Cargo.toml
+++ b/components/gfx/Cargo.toml
@@ -9,6 +9,7 @@ name = "gfx"
path = "lib.rs"
[dependencies]
+app_units = "0.1"
bitflags = "0.3"
euclid = "0.2"
fnv = "1.0"
@@ -25,9 +26,6 @@ string_cache = "0.1"
time = "0.1.12"
unicode-script = { version = "0.1", features = ["harfbuzz"] }
-[dependencies.app_units]
-path = "../app_units"
-
[dependencies.plugins]
path = "../plugins"
diff --git a/components/layout/Cargo.toml b/components/layout/Cargo.toml
index 8cccb371428..9856c81b27b 100644
--- a/components/layout/Cargo.toml
+++ b/components/layout/Cargo.toml
@@ -7,9 +7,6 @@ authors = ["The Servo Project Developers"]
name = "layout"
path = "lib.rs"
-[dependencies.app_units]
-path = "../app_units"
-
[dependencies.azure]
git = "https://github.com/servo/rust-azure"
@@ -70,6 +67,7 @@ version = "0.2"
features = [ "serde_serialization" ]
[dependencies]
+app_units = "0.1"
log = "0.3"
encoding = "0.2"
fnv = "1.0"
diff --git a/components/msg/Cargo.toml b/components/msg/Cargo.toml
index 82f845a7c15..966c7c3b732 100644
--- a/components/msg/Cargo.toml
+++ b/components/msg/Cargo.toml
@@ -7,9 +7,6 @@ authors = ["The Servo Project Developers"]
name = "msg"
path = "lib.rs"
-[dependencies.app_units]
-path = "../app_units"
-
[dependencies.util]
path = "../util"
@@ -48,6 +45,7 @@ features = ["texture_surface"]
path = "../plugins"
[dependencies]
+app_units = "0.1"
bitflags = "0.3"
rustc-serialize = "0.3.4"
euclid = "0.2"
diff --git a/components/script/Cargo.toml b/components/script/Cargo.toml
index b34aa09b258..f6171914dc9 100644
--- a/components/script/Cargo.toml
+++ b/components/script/Cargo.toml
@@ -12,9 +12,6 @@ path = "lib.rs"
[features]
debugmozjs = ['js/debugmozjs']
-[dependencies.app_units]
-path = "../app_units"
-
[dependencies.plugins]
path = "../plugins"
@@ -74,6 +71,7 @@ version = "0.6"
features = [ "serde-serialization" ]
[dependencies]
+app_units = "0.1"
log = "0.3"
encoding = "0.2"
fnv = "1.0"
diff --git a/components/script_traits/Cargo.toml b/components/script_traits/Cargo.toml
index 6c8d79567b0..d038ce36f39 100644
--- a/components/script_traits/Cargo.toml
+++ b/components/script_traits/Cargo.toml
@@ -7,9 +7,6 @@ authors = ["The Servo Project Developers"]
name = "script_traits"
path = "lib.rs"
-[dependencies.app_units]
-path = "../app_units"
-
[dependencies.msg]
path = "../msg"
@@ -36,6 +33,7 @@ version = "0.2"
features = [ "serde_serialization" ]
[dependencies]
+app_units = "0.1"
libc = "0.1"
euclid = "0.2"
serde = "0.6"
diff --git a/components/servo/Cargo.lock b/components/servo/Cargo.lock
index 020b9b9bfe8..353fd34cbd9 100644
--- a/components/servo/Cargo.lock
+++ b/components/servo/Cargo.lock
@@ -74,6 +74,7 @@ dependencies = [
[[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)",
@@ -233,7 +234,7 @@ dependencies = [
name = "compositing"
version = "0.0.1"
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)",
"canvas 0.0.1",
"canvas_traits 0.0.1",
@@ -591,7 +592,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
name = "gfx"
version = "0.0.1"
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)",
"bitflags 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
"canvas_traits 0.0.1",
@@ -942,7 +943,7 @@ dependencies = [
name = "layout"
version = "0.0.1"
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)",
"bitflags 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
"canvas 0.0.1",
@@ -1097,7 +1098,7 @@ dependencies = [
name = "msg"
version = "0.0.1"
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)",
"bitflags 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
"canvas_traits 0.0.1",
@@ -1453,7 +1454,7 @@ name = "script"
version = "0.0.1"
dependencies = [
"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)",
"canvas 0.0.1",
"canvas_traits 0.0.1",
@@ -1504,7 +1505,7 @@ dependencies = [
name = "script_traits"
version = "0.0.1"
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",
"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)",
@@ -1667,7 +1668,7 @@ dependencies = [
name = "style"
version = "0.0.1"
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)",
"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)",
@@ -1694,7 +1695,7 @@ dependencies = [
name = "style_tests"
version = "0.0.1"
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)",
"euclid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
"selectors 0.1.0 (git+https://github.com/servo/rust-selectors)",
@@ -1838,7 +1839,7 @@ dependencies = [
name = "util"
version = "0.0.1"
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)",
"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)",
diff --git a/components/style/Cargo.toml b/components/style/Cargo.toml
index bbc24072aef..3d035b379a9 100644
--- a/components/style/Cargo.toml
+++ b/components/style/Cargo.toml
@@ -30,10 +30,8 @@ features = [ "serde-serialization" ]
version = "0.2"
features = [ "serde_serialization" ]
-[dependencies.app_units]
-path = "../app_units"
-
[dependencies]
+app_units = "0.1"
log = "0.3"
encoding = "0.2"
fnv = "1.0"
diff --git a/components/util/Cargo.toml b/components/util/Cargo.toml
index 7ddaff1e50b..dbed5e468cb 100644
--- a/components/util/Cargo.toml
+++ b/components/util/Cargo.toml
@@ -41,10 +41,8 @@ features = [ "serde_serialization" ]
[dependencies.selectors]
git = "https://github.com/servo/rust-selectors"
-[dependencies.app_units]
-path = "../app_units"
-
[dependencies]
+app_units = "0.1"
log = "0.3"
bitflags = "0.3"
html5ever = { version = "0.2.1", features = ["unstable"] }
diff --git a/ports/cef/Cargo.lock b/ports/cef/Cargo.lock
index 3cd6f105719..eddd018498f 100644
--- a/ports/cef/Cargo.lock
+++ b/ports/cef/Cargo.lock
@@ -64,6 +64,17 @@ dependencies = [
]
[[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]]
name = "aster"
version = "0.4.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -215,6 +226,7 @@ dependencies = [
name = "compositing"
version = "0.0.1"
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)",
"canvas 0.0.1",
"canvas_traits 0.0.1",
@@ -538,6 +550,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
name = "gfx"
version = "0.0.1"
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)",
"bitflags 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
"canvas_traits 0.0.1",
@@ -549,7 +562,7 @@ dependencies = [
"fontconfig 0.1.0 (git+https://github.com/servo/rust-fontconfig)",
"freetype 0.1.0 (git+https://github.com/servo/rust-freetype)",
"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)",
"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)",
@@ -570,6 +583,7 @@ dependencies = [
"string_cache 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)",
"style 0.0.1",
"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)",
"util 0.0.1",
]
@@ -685,11 +699,12 @@ dependencies = [
]
[[package]]
-name = "harfbuzz"
-version = "0.1.2"
+name = "harfbuzz-sys"
+version = "0.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"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]]
@@ -879,6 +894,7 @@ dependencies = [
name = "layout"
version = "0.0.1"
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)",
"bitflags 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
"canvas 0.0.1",
@@ -910,6 +926,7 @@ dependencies = [
"string_cache_plugin 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
"style 0.0.1",
"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)",
"util 0.0.1",
]
@@ -1032,6 +1049,7 @@ dependencies = [
name = "msg"
version = "0.0.1"
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)",
"bitflags 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
"canvas_traits 0.0.1",
@@ -1369,6 +1387,7 @@ name = "script"
version = "0.0.1"
dependencies = [
"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)",
"canvas 0.0.1",
"canvas_traits 0.0.1",
@@ -1411,6 +1430,7 @@ dependencies = [
name = "script_traits"
version = "0.0.1"
dependencies = [
+ "app_units 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
"devtools_traits 0.0.1",
"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)",
@@ -1606,6 +1626,7 @@ dependencies = [
name = "style"
version = "0.0.1"
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)",
"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)",
@@ -1721,6 +1742,14 @@ dependencies = [
]
[[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]]
name = "unreachable"
version = "0.0.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -1752,6 +1781,7 @@ dependencies = [
name = "util"
version = "0.0.1"
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)",
"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)",
diff --git a/tests/unit/style/Cargo.toml b/tests/unit/style/Cargo.toml
index ad9d8d1fc6d..c1f690dec33 100644
--- a/tests/unit/style/Cargo.toml
+++ b/tests/unit/style/Cargo.toml
@@ -8,9 +8,6 @@ name = "style_tests"
path = "lib.rs"
doctest = false
-[dependencies.app_units]
-path = "../../../components/app_units"
-
[dependencies.style]
path = "../../../components/style"
@@ -24,6 +21,7 @@ path = "../../../components/util"
git = "https://github.com/servo/rust-selectors"
[dependencies]
+app_units = "0.1"
url = "0.2"
cssparser = "0.3.1"
string_cache = "0.1"