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

cargo fix --edition-idioms

Browse source
This commit is contained in:
Simon Sapin 2018-11-01 21:43:04 +01:00
parent b1fd6237d1
commit 2012be4a8b
203 changed files with 665 additions and 1281 deletions
Download patch file Download diff file Expand all files Collapse all files

8
components/profile/Cargo.toml
View file

@ -1,3 +1,5 @@
cargo-features = ["rename-dependency"]
[package]
name = "profile"
version = "0.0.1"
@ -11,7 +13,7 @@ name = "profile"
path = "lib.rs"
[features]
unstable = ["jemalloc-sys"]
unstable = ["servo_allocator"]
[dependencies]
profile_traits = {path = "../profile_traits"}
@ -22,7 +24,7 @@ log = "0.4"
serde = "1.0"
serde_json = "1.0"
servo_config = {path = "../config"}
time = "0.1.12"
time_crate = {package = "time", version = "0.1.12"}
tokio = "0.1"
[target.'cfg(target_os = "macos")'.dependencies]
@ -33,4 +35,4 @@ regex = "1.0"
[target.'cfg(not(target_os = "windows"))'.dependencies]
libc = "0.2"
jemalloc-sys = {version = "0.1.3", optional = true}
servo_allocator = {path = "../allocator", optional = true}

16
components/profile/lib.rs
View file

@ -4,28 +4,12 @@
#![deny(unsafe_code)]
#[allow(unused_extern_crates)]
extern crate heartbeats_simple;
extern crate influent;
extern crate ipc_channel;
#[cfg(all(feature = "unstable", not(target_os = "windows")))]
extern crate jemalloc_sys;
#[cfg(not(target_os = "windows"))]
extern crate libc;
#[macro_use]
extern crate log;
#[macro_use]
extern crate profile_traits;
#[cfg(target_os = "linux")]
extern crate regex;
#[macro_use]
extern crate serde;
extern crate serde_json;
extern crate servo_config;
#[cfg(target_os = "macos")]
extern crate task_info;
extern crate time as std_time;
extern crate tokio;
#[allow(unsafe_code)]
mod heartbeats;

2
components/profile/mem.rs
View file

@ -496,7 +496,7 @@ mod system_reporter {
}
#[cfg(all(feature = "unstable", not(target_os = "windows")))]
use jemalloc_sys::mallctl;
use servo_allocator::jemalloc_sys::mallctl;
#[cfg(all(feature = "unstable", not(target_os = "windows")))]
fn jemalloc_stat(value_name: &str) -> Option<usize> {

2
components/profile/time.rs
View file

@ -5,7 +5,6 @@
//! Timing functions.
use crate::heartbeats;
use crate::std_time::precise_time_ns;
use crate::trace_dump::TraceDump;
use influent::client::{Client, Credentials};
use influent::create_client;
@ -26,6 +25,7 @@ use std::io::{self, Write};
use std::path::Path;
use std::time::Duration;
use std::{f64, thread, u32, u64};
use time_crate::precise_time_ns;
use tokio;
use tokio::prelude::Future;