mirror of
https://github.com/servo/servo.git
synced 2025-08-01 03:30:33 +01:00
style: Rustfmt bindings on automation, and locally under an env variable.
Bug: 1432153 Reviewed-by: xidorn MozReview-Commit-ID: HJ9J5NtYVk2
This commit is contained in:
parent
8778b46d57
commit
c04fc0a269
1 changed files with 14 additions and 4 deletions
|
@ -204,15 +204,25 @@ mod bindings {
|
|||
|
||||
// Disable rust unions, because we replace some types inside of
|
||||
// them.
|
||||
//
|
||||
// FIXME(emilio, bug 1432153): Make the bindings rustfmt'd on
|
||||
// automation.
|
||||
let mut builder = Builder::default()
|
||||
.rustfmt_bindings(false)
|
||||
.rust_target(RustTarget::Stable_1_0);
|
||||
let rustfmt_path = env::var_os("MOZ_AUTOMATION").and_then(|_| {
|
||||
env::var_os("TOOLTOOL_DIR")
|
||||
}).map(PathBuf::from);
|
||||
|
||||
builder = match rustfmt_path {
|
||||
Some(path) => {
|
||||
builder.with_rustfmt(path.join("rustc").join("bin").join("rustfmt"))
|
||||
},
|
||||
None => {
|
||||
builder.rustfmt_bindings(env::var_os("STYLO_RUSTFMT_BINDINGS").is_some())
|
||||
}
|
||||
};
|
||||
|
||||
for dir in SEARCH_PATHS.iter() {
|
||||
builder = builder.clang_arg("-I").clang_arg(dir.to_str().unwrap());
|
||||
}
|
||||
|
||||
builder = builder.include(add_include("mozilla-config.h"));
|
||||
|
||||
if env::var("CARGO_FEATURE_GECKO_DEBUG").is_ok() {
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue