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

Fix error message for invalid combination of style crate feature flags

Browse source 
Instead of ``cannot find value `engine` in this scope``
https://github.com/servo/servo/issues/24284
This commit is contained in:
Simon Sapin 2019-09-25 15:11:00 +02:00
parent a1c911f07f
commit 36e53a39bf
1 changed files with 15 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

38
components/style/build.rs
View file

@ -75,7 +75,7 @@ lazy_static! {
pub static ref PYTHON: String = env::var("PYTHON").ok().unwrap_or_else(find_python); pub static ref PYTHON: String = env::var("PYTHON").ok().unwrap_or_else(find_python);
} }
fn generate_properties() { fn generate_properties(engine: &str) {
for entry in WalkDir::new("properties") { for entry in WalkDir::new("properties") {
let entry = entry.unwrap(); let entry = entry.unwrap();
match entry.path().extension().and_then(|e| e.to_str()) { match entry.path().extension().and_then(|e| e.to_str()) {
@ -90,15 +90,6 @@ fn generate_properties() {
.join("properties") .join("properties")
.join("build.py"); .join("build.py");
#[cfg(feature = "gecko")]
let engine = "gecko";
#[cfg(feature = "servo-layout-2013")]
let engine = "servo-2013";
#[cfg(feature = "servo-layout-2020")]
let engine = "servo-2020";
let status = Command::new(&*PYTHON) let status = Command::new(&*PYTHON)
.arg(&script) .arg(&script)
.arg(engine) .arg(engine)
@ -113,20 +104,21 @@ fn generate_properties() {
fn main() { fn main() {
let gecko = cfg!(feature = "gecko"); let gecko = cfg!(feature = "gecko");
let servo = cfg!(feature = "servo"); let servo = cfg!(feature = "servo");
if !(gecko || servo) { let l2013 = cfg!(feature = "servo-layout-2013");
panic!("The style crate requires enabling one of its 'servo' or 'gecko' feature flags"); let l2020 = cfg!(feature = "servo-layout-2020");
} let engine = match (gecko, servo, l2013, l2020) {
if gecko && servo { (true, false, false, false) => "gecko",
panic!( (false, true, true, false) => "servo-2013",
"The style crate does not support enabling both its 'servo' or 'gecko' \ (false, true, false, true) => "servo-2020",
feature flags at the same time." _ => panic!(
); "\n\n\
} The style crate requires enabling one of its 'servo' or 'gecko' feature flags \
if gecko && (cfg!(feature = "servo-layout-2013") || cfg!(feature = "servo-layout-2020")) { and, in the 'servo' case, one of 'servo-layout-2013' or 'servo-layout-2020'.\
panic!("The 'servo-layout-*' features can only be enabled together with 'servo'."); \n\n"
} ),
};
println!("cargo:rerun-if-changed=build.rs"); println!("cargo:rerun-if-changed=build.rs");
println!("cargo:out_dir={}", env::var("OUT_DIR").unwrap()); println!("cargo:out_dir={}", env::var("OUT_DIR").unwrap());
generate_properties(); generate_properties(engine);
build_gecko::generate(); build_gecko::generate();
} }