Skip to content

Commit d812e19

Browse files
author
bors-servo
authored
Auto merge of #104 - waywardmonkeys:rustfmt, r=jdm
Run rustfmt. <!-- Reviewable:start --> This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/rust-harfbuzz/104) <!-- Reviewable:end -->
2 parents 8274e80 + 7d6f1a0 commit d812e19

File tree

2 files changed

+17
-10
lines changed

2 files changed

+17
-10
lines changed

harfbuzz-sys/build.rs

+17-9
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ use std::path::PathBuf;
88
fn main() {
99
if env::var_os("HARFBUZZ_SYS_NO_PKG_CONFIG").is_none() {
1010
if pkg_config::find_library("harfbuzz").is_ok() {
11-
return
11+
return;
1212
}
1313
}
1414

@@ -21,18 +21,26 @@ fn main() {
2121
println!("cargo:rustc-link-search=native={}/lib", dst.display());
2222
println!("cargo:rustc-link-lib=static=harfbuzz");
2323
} else {
24-
assert!(Command::new("make")
25-
.env("MAKEFLAGS", env::var("CARGO_MAKEFLAGS").unwrap_or_default())
26-
.args(&["-R", "-f", "makefile.cargo"])
27-
.status()
28-
.unwrap()
29-
.success());
24+
assert!(
25+
Command::new("make")
26+
.env("MAKEFLAGS", env::var("CARGO_MAKEFLAGS").unwrap_or_default())
27+
.args(&["-R", "-f", "makefile.cargo"])
28+
.status()
29+
.unwrap()
30+
.success()
31+
);
3032

3133
let out_dir = PathBuf::from(env::var_os("OUT_DIR").unwrap());
32-
println!("cargo:rustc-link-search=native={}", out_dir.join("lib").to_str().unwrap());
34+
println!(
35+
"cargo:rustc-link-search=native={}",
36+
out_dir.join("lib").to_str().unwrap()
37+
);
3338
println!("cargo:rustc-link-lib=static=harfbuzz");
3439
}
3540

3641
// Dependent crates that need to find hb.h can use DEP_HARFBUZZ_INCLUDE from their build.rs.
37-
println!("cargo:include={}", env::current_dir().unwrap().join("harfbuzz/src").display());
42+
println!(
43+
"cargo:include={}",
44+
env::current_dir().unwrap().join("harfbuzz/src").display()
45+
);
3846
}

harfbuzz-sys/src/lib.rs

-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
#![allow(non_camel_case_types)]
2-
32
#![cfg_attr(feature = "cargo-clippy", allow(unreadable_literal))]
43

54
#[cfg(any(target_os = "android", all(unix, not(target_os = "macos"))))]

0 commit comments

Comments
 (0)