diff options
| author | Srinivas Reddy Thatiparthy <thatiparthysreenivas@gmail.com> | 2016-06-05 11:39:17 +0530 |
|---|---|---|
| committer | Srinivas Reddy Thatiparthy <thatiparthysreenivas@gmail.com> | 2016-06-05 11:39:17 +0530 |
| commit | adf2c432dcd3e121ccbd3904c92252b51aa110a5 (patch) | |
| tree | 60989e7d81cbc9c225d1f4a1e6864b3334db89ff /src/liballoc_jemalloc/build.rs | |
| parent | 382ab92ceedc258e794c1a95aef21d3be3fa76c4 (diff) | |
| download | rust-adf2c432dcd3e121ccbd3904c92252b51aa110a5.tar.gz rust-adf2c432dcd3e121ccbd3904c92252b51aa110a5.zip | |
run rustfmt on liballoc_jemalloc folder
Diffstat (limited to 'src/liballoc_jemalloc/build.rs')
| -rw-r--r-- | src/liballoc_jemalloc/build.rs | 29 |
1 files changed, 20 insertions, 9 deletions
diff --git a/src/liballoc_jemalloc/build.rs b/src/liballoc_jemalloc/build.rs index 33a675331ab..e43b9a9df1b 100644 --- a/src/liballoc_jemalloc/build.rs +++ b/src/liballoc_jemalloc/build.rs @@ -33,18 +33,26 @@ fn main() { jemalloc.parent().unwrap().display()); let stem = jemalloc.file_stem().unwrap().to_str().unwrap(); let name = jemalloc.file_name().unwrap().to_str().unwrap(); - let kind = if name.ends_with(".a") {"static"} else {"dylib"}; + let kind = if name.ends_with(".a") { + "static" + } else { + "dylib" + }; println!("cargo:rustc-link-lib={}={}", kind, &stem[3..]); - return + return; } let compiler = gcc::Config::new().get_compiler(); let ar = build_helper::cc2ar(compiler.path(), &target); - let cflags = compiler.args().iter().map(|s| s.to_str().unwrap()) - .collect::<Vec<_>>().join(" "); + let cflags = compiler.args() + .iter() + .map(|s| s.to_str().unwrap()) + .collect::<Vec<_>>() + .join(" "); let mut stack = src_dir.join("../jemalloc") - .read_dir().unwrap() + .read_dir() + .unwrap() .map(|e| e.unwrap()) .collect::<Vec<_>>(); while let Some(entry) = stack.pop() { @@ -57,7 +65,9 @@ fn main() { } let mut cmd = Command::new("sh"); - cmd.arg(src_dir.join("../jemalloc/configure").to_str().unwrap() + cmd.arg(src_dir.join("../jemalloc/configure") + .to_str() + .unwrap() .replace("C:\\", "/c/") .replace("\\", "/")) .current_dir(&build_dir) @@ -117,9 +127,10 @@ fn main() { run(&mut cmd); run(Command::new("make") - .current_dir(&build_dir) - .arg("build_lib_static") - .arg("-j").arg(env::var("NUM_JOBS").unwrap())); + .current_dir(&build_dir) + .arg("build_lib_static") + .arg("-j") + .arg(env::var("NUM_JOBS").unwrap())); if target.contains("windows") { println!("cargo:rustc-link-lib=static=jemalloc"); |
