From 96d8fee7315a8584d44d8e8368c694d6d57a2908 Mon Sep 17 00:00:00 2001 From: Lars Bergstrom Date: Tue, 14 Jul 2015 12:25:43 -0500 Subject: [PATCH] Remove double linking of static libs from task_info and azure --- components/servo/Cargo.lock | 6 +++--- support/rust-task_info/src/task_basic_info.rs | 1 - 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/components/servo/Cargo.lock b/components/servo/Cargo.lock index 486e79961ff..b4cbe59182a 100644 --- a/components/servo/Cargo.lock +++ b/components/servo/Cargo.lock @@ -49,7 +49,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "aster" -version = "0.3.2" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] @@ -1060,7 +1060,7 @@ name = "quasi_codegen" version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "aster 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", + "aster 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1202,7 +1202,7 @@ name = "serde_codegen" version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "aster 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", + "aster 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", "quasi 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", "quasi_macros 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", ] diff --git a/support/rust-task_info/src/task_basic_info.rs b/support/rust-task_info/src/task_basic_info.rs index 78efca0fd4f..d3a9490425e 100644 --- a/support/rust-task_info/src/task_basic_info.rs +++ b/support/rust-task_info/src/task_basic_info.rs @@ -30,7 +30,6 @@ pub fn resident_size() -> Option { if rv == 0 { Some(resident_size as usize) } else { None } } -#[link(name = "task_info", kind = "static")] extern { fn TaskBasicInfoVirtualSize(virtual_size: *mut size_t) -> c_int; fn TaskBasicInfoResidentSize(resident_size: *mut size_t) -> c_int;