aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--components/profile/Cargo.toml2
-rw-r--r--components/profile/heartbeats.rs4
-rw-r--r--components/profile/lib.rs2
-rw-r--r--components/servo/Cargo.lock43
-rw-r--r--ports/cef/Cargo.lock43
5 files changed, 30 insertions, 64 deletions
diff --git a/components/profile/Cargo.toml b/components/profile/Cargo.toml
index 3a0e74321ca..ad7ab35a9d8 100644
--- a/components/profile/Cargo.toml
+++ b/components/profile/Cargo.toml
@@ -13,7 +13,7 @@ profile_traits = {path = "../profile_traits"}
plugins = {path = "../plugins"}
util = {path = "../util"}
ipc-channel = {git = "https://github.com/servo/ipc-channel"}
-hbs-pow = "0.2"
+heartbeats-simple = "0.3"
log = "0.3.5"
serde = "0.7"
serde_json = "0.7"
diff --git a/components/profile/heartbeats.rs b/components/profile/heartbeats.rs
index 90a6ffb13bf..5769939843b 100644
--- a/components/profile/heartbeats.rs
+++ b/components/profile/heartbeats.rs
@@ -3,8 +3,8 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-use hbs_pow::HeartbeatPow as Heartbeat;
-use hbs_pow::HeartbeatPowContext as HeartbeatContext;
+use heartbeats_simple::HeartbeatPow as Heartbeat;
+use heartbeats_simple::HeartbeatPowContext as HeartbeatContext;
use profile_traits::time::ProfilerCategory;
use std::collections::HashMap;
use std::env::var_os;
diff --git a/components/profile/lib.rs b/components/profile/lib.rs
index be6c2840ba1..c9326d93cac 100644
--- a/components/profile/lib.rs
+++ b/components/profile/lib.rs
@@ -15,7 +15,7 @@
#[allow(unused_extern_crates)]
#[cfg(not(target_os = "windows"))]
extern crate alloc_jemalloc;
-extern crate hbs_pow;
+extern crate heartbeats_simple;
extern crate ipc_channel;
#[cfg(not(target_os = "windows"))]
extern crate libc;
diff --git a/components/servo/Cargo.lock b/components/servo/Cargo.lock
index 0b3c9855b79..2c822279c77 100644
--- a/components/servo/Cargo.lock
+++ b/components/servo/Cargo.lock
@@ -897,55 +897,38 @@ dependencies = [
]
[[package]]
-name = "hbs-builder"
-version = "0.2.1"
+name = "heapsize"
+version = "0.3.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
- "cmake 0.1.17 (registry+https://github.com/rust-lang/crates.io-index)",
- "pkg-config 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "kernel32-sys 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
-name = "hbs-common-sys"
-version = "0.2.1"
+name = "heapsize_plugin"
+version = "0.1.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "libc 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)",
-]
[[package]]
-name = "hbs-pow"
-version = "0.2.0"
+name = "heartbeats-simple"
+version = "0.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
- "hbs-pow-sys 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "heartbeats-simple-sys 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
"libc 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
-name = "hbs-pow-sys"
-version = "0.2.1"
+name = "heartbeats-simple-sys"
+version = "0.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
- "hbs-builder 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "hbs-common-sys 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cmake 0.1.17 (registry+https://github.com/rust-lang/crates.io-index)",
"libc 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)",
+ "pkg-config 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
-name = "heapsize"
-version = "0.3.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "kernel32-sys 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "heapsize_plugin"
-version = "0.1.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-
-[[package]]
name = "hpack"
version = "0.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -1724,7 +1707,7 @@ dependencies = [
name = "profile"
version = "0.0.1"
dependencies = [
- "hbs-pow 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "heartbeats-simple 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
"ipc-channel 0.2.3 (git+https://github.com/servo/ipc-channel)",
"libc 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)",
"log 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
diff --git a/ports/cef/Cargo.lock b/ports/cef/Cargo.lock
index a5fc590683d..743ac648f23 100644
--- a/ports/cef/Cargo.lock
+++ b/ports/cef/Cargo.lock
@@ -809,55 +809,38 @@ dependencies = [
]
[[package]]
-name = "hbs-builder"
-version = "0.2.1"
+name = "heapsize"
+version = "0.3.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
- "cmake 0.1.17 (registry+https://github.com/rust-lang/crates.io-index)",
- "pkg-config 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "kernel32-sys 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
-name = "hbs-common-sys"
-version = "0.2.1"
+name = "heapsize_plugin"
+version = "0.1.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "libc 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)",
-]
[[package]]
-name = "hbs-pow"
-version = "0.2.0"
+name = "heartbeats-simple"
+version = "0.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
- "hbs-pow-sys 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "heartbeats-simple-sys 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
"libc 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
-name = "hbs-pow-sys"
-version = "0.2.1"
+name = "heartbeats-simple-sys"
+version = "0.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
- "hbs-builder 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "hbs-common-sys 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cmake 0.1.17 (registry+https://github.com/rust-lang/crates.io-index)",
"libc 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)",
+ "pkg-config 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
-name = "heapsize"
-version = "0.3.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "kernel32-sys 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "heapsize_plugin"
-version = "0.1.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-
-[[package]]
name = "hpack"
version = "0.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -1592,7 +1575,7 @@ dependencies = [
name = "profile"
version = "0.0.1"
dependencies = [
- "hbs-pow 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "heartbeats-simple 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
"ipc-channel 0.2.3 (git+https://github.com/servo/ipc-channel)",
"libc 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)",
"log 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",