formatting

This commit is contained in:
gnzlbg 2018-11-07 00:25:54 +01:00 committed by gnzlbg
parent 81b15f1322
commit b857155821
1 changed files with 12 additions and 10 deletions

View File

@ -134,7 +134,7 @@ fn main() {
assert!(jemalloc_src_dir.exists());
// Configuration files
let config_files = ["configure", /*"VERSION"*/];
let config_files = ["configure" /*"VERSION"*/];
// Verify that the configuration files are up-to-date
if env::var("JEMALLOC_SYS_VERIFY_CONFIGURE").is_ok() {
@ -142,8 +142,10 @@ fn main() {
// The configuration file from the configure/directory should be used.
// The jemalloc git submodule shouldn't contain any configuration files.
assert!(!jemalloc_src_dir.join("configure").exists(),
"the jemalloc submodule contains configuration files");
assert!(
!jemalloc_src_dir.join("configure").exists(),
"the jemalloc submodule contains configuration files"
);
// Run autoconf:
let mut cmd = Command::new("autoconf");
@ -167,17 +169,17 @@ fn main() {
let current = read_content(&jemalloc_src_dir.join(f));
let reference = read_content(&Path::new("configure").join(f));
assert_eq!(current, reference,
"the current and reference configuration files \"{}\" differ", f);
assert_eq!(
current, reference,
"the current and reference configuration files \"{}\" differ",
f
);
}
} else {
// Copy the configuration files to jemalloc's source directory
for f in &config_files {
fs::copy(
Path::new("configure").join(f),
jemalloc_src_dir.join(f),
)
.expect("failed to copy config file to OUT_DIR");
fs::copy(Path::new("configure").join(f), jemalloc_src_dir.join(f))
.expect("failed to copy config file to OUT_DIR");
}
}