Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-04 05:00:08 +01:00
Code Issues Projects Releases Packages Wiki Activity

Auto merge of #8962 - Ms2ger:energymon, r=jdm

Browse source 
Remove the pinned revision from profile_traits/Cargo.toml.

<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/8962)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2015-12-14 06:21:24 +05:30
commit e4f86829d7
2 changed files with 2 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

1
components/profile_traits/Cargo.toml
View file

@ -15,7 +15,6 @@ git = "https://github.com/servo/ipc-channel"
[dependencies.energymon] [dependencies.energymon]
git = "https://github.com/energymon/energymon-rust.git" git = "https://github.com/energymon/energymon-rust.git"
rev = "eba1d8a"
optional = true optional = true
[dependencies.energy-monitor] [dependencies.energy-monitor]

4
components/servo/Cargo.lock generated
View file

@ -472,7 +472,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
[[package]] [[package]]
name = "energymon" name = "energymon"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/energymon/energymon-rust.git?rev=eba1d8a#637e537934cdfc2142011a910490a408ea135af2" source = "git+https://github.com/energymon/energymon-rust.git#637e537934cdfc2142011a910490a408ea135af2"
dependencies = [ dependencies = [
"energy-monitor 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "energy-monitor 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
"energymon-default-sys 0.1.0 (git+https://github.com/energymon/energymon-sys.git)", "energymon-default-sys 0.1.0 (git+https://github.com/energymon/energymon-sys.git)",
@ -1410,7 +1410,7 @@ name = "profile_traits"
version = "0.0.1" version = "0.0.1"
dependencies = [ dependencies = [
"energy-monitor 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "energy-monitor 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
"energymon 0.1.0 (git+https://github.com/energymon/energymon-rust.git?rev=eba1d8a)", "energymon 0.1.0 (git+https://github.com/energymon/energymon-rust.git)",
"ipc-channel 0.1.0 (git+https://github.com/servo/ipc-channel)", "ipc-channel 0.1.0 (git+https://github.com/servo/ipc-channel)",
"plugins 0.0.1", "plugins 0.0.1",
"serde 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)", "serde 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)",