aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorbors-servo <metajack+bors@gmail.com>2015-09-10 13:31:57 -0600
committerbors-servo <metajack+bors@gmail.com>2015-09-10 13:31:57 -0600
commitf190ba360e41465d43972826b6715eb39e7b9822 (patch)
tree7930502d5720627139ee1215ea326d019f4bcdfb
parent4e69f301e19e6f1d9a1b4f231e5a445888b03370 (diff)
parent7cd953c9d1150b094bbae3e57476b6d1ad76ebbc (diff)
downloadservo-f190ba360e41465d43972826b6715eb39e7b9822.tar.gz
servo-f190ba360e41465d43972826b6715eb39e7b9822.zip
Auto merge of #7595 - connorimes:update-hbs, r=larsbergstrom
Refresh cef and gonk lock files; update heartbeats dependencies <!-- Reviewable:start --> [<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/7595) <!-- Reviewable:end -->
-rw-r--r--components/servo/Cargo.lock4
-rw-r--r--ports/cef/Cargo.lock10
-rw-r--r--ports/gonk/Cargo.lock10
3 files changed, 18 insertions, 6 deletions
diff --git a/components/servo/Cargo.lock b/components/servo/Cargo.lock
index a23c94bea92..b5cd385b3fe 100644
--- a/components/servo/Cargo.lock
+++ b/components/servo/Cargo.lock
@@ -743,7 +743,7 @@ dependencies = [
[[package]]
name = "hbs-common-sys"
version = "0.1.0"
-source = "git+https://github.com/libheartbeats/heartbeats-simple-sys.git#2b415b92cd955e63c4b939b91a3e7dbf5902c8af"
+source = "git+https://github.com/libheartbeats/heartbeats-simple-sys.git#548d28d71795ca81ad12ab61e6616835814981f3"
dependencies = [
"libc 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
]
@@ -760,7 +760,7 @@ dependencies = [
[[package]]
name = "hbs-pow-sys"
version = "0.1.0"
-source = "git+https://github.com/libheartbeats/heartbeats-simple-sys.git#2b415b92cd955e63c4b939b91a3e7dbf5902c8af"
+source = "git+https://github.com/libheartbeats/heartbeats-simple-sys.git#548d28d71795ca81ad12ab61e6616835814981f3"
dependencies = [
"hbs-common-sys 0.1.0 (git+https://github.com/libheartbeats/heartbeats-simple-sys.git)",
"libc 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
diff --git a/ports/cef/Cargo.lock b/ports/cef/Cargo.lock
index 830413b68ba..aa505aca001 100644
--- a/ports/cef/Cargo.lock
+++ b/ports/cef/Cargo.lock
@@ -563,6 +563,7 @@ dependencies = [
"script_traits 0.0.1",
"serde 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)",
"serde_macros 0.5.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)",
"string_cache 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -693,7 +694,7 @@ dependencies = [
[[package]]
name = "hbs-common-sys"
version = "0.1.0"
-source = "git+https://github.com/libheartbeats/heartbeats-simple-sys.git#2b415b92cd955e63c4b939b91a3e7dbf5902c8af"
+source = "git+https://github.com/libheartbeats/heartbeats-simple-sys.git#548d28d71795ca81ad12ab61e6616835814981f3"
dependencies = [
"libc 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
]
@@ -710,7 +711,7 @@ dependencies = [
[[package]]
name = "hbs-pow-sys"
version = "0.1.0"
-source = "git+https://github.com/libheartbeats/heartbeats-simple-sys.git#2b415b92cd955e63c4b939b91a3e7dbf5902c8af"
+source = "git+https://github.com/libheartbeats/heartbeats-simple-sys.git#548d28d71795ca81ad12ab61e6616835814981f3"
dependencies = [
"hbs-common-sys 0.1.0 (git+https://github.com/libheartbeats/heartbeats-simple-sys.git)",
"libc 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1494,6 +1495,11 @@ dependencies = [
]
[[package]]
+name = "simd"
+version = "0.1.0"
+source = "git+https://github.com/huonw/simd#be4242121e081206d8769cc60a7d2fa8e23cdc68"
+
+[[package]]
name = "skia"
version = "0.0.20130412"
source = "git+https://github.com/servo/skia#3be758ea29cbd315febfda5a536ef9984a0ae862"
diff --git a/ports/gonk/Cargo.lock b/ports/gonk/Cargo.lock
index 3900a055f72..9dc67f0f337 100644
--- a/ports/gonk/Cargo.lock
+++ b/ports/gonk/Cargo.lock
@@ -510,6 +510,7 @@ dependencies = [
"script_traits 0.0.1",
"serde 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)",
"serde_macros 0.5.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)",
"string_cache 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -577,7 +578,7 @@ dependencies = [
[[package]]
name = "hbs-common-sys"
version = "0.1.0"
-source = "git+https://github.com/libheartbeats/heartbeats-simple-sys.git#2b415b92cd955e63c4b939b91a3e7dbf5902c8af"
+source = "git+https://github.com/libheartbeats/heartbeats-simple-sys.git#548d28d71795ca81ad12ab61e6616835814981f3"
dependencies = [
"libc 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
]
@@ -594,7 +595,7 @@ dependencies = [
[[package]]
name = "hbs-pow-sys"
version = "0.1.0"
-source = "git+https://github.com/libheartbeats/heartbeats-simple-sys.git#2b415b92cd955e63c4b939b91a3e7dbf5902c8af"
+source = "git+https://github.com/libheartbeats/heartbeats-simple-sys.git#548d28d71795ca81ad12ab61e6616835814981f3"
dependencies = [
"hbs-common-sys 0.1.0 (git+https://github.com/libheartbeats/heartbeats-simple-sys.git)",
"libc 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1340,6 +1341,11 @@ dependencies = [
]
[[package]]
+name = "simd"
+version = "0.1.0"
+source = "git+https://github.com/huonw/simd#be4242121e081206d8769cc60a7d2fa8e23cdc68"
+
+[[package]]
name = "skia"
version = "0.0.20130412"
source = "git+https://github.com/servo/skia#3be758ea29cbd315febfda5a536ef9984a0ae862"