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

Auto merge of #18408 - emilio:stylo-fixup-fix, r=upsuper

Browse source 
stylo: Don't add boundary characters to the fixups specified in ServoBindings.toml

This allows adjusting the fixups for the patches in bug 1393230 when using
libclang 3.9.

<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/18408)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2017-09-07 08:51:10 -05:00 • committed by GitHub
commit 0c2abbd7ea
1 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
components/style/build_gecko.rs
View file

@ -292,7 +292,7 @@ mod bindings {
}, },
}; };
for fixup in fixups.iter() { for fixup in fixups.iter() {
result = Regex::new(&format!(r"\b{}\b", fixup.pat)).unwrap().replace_all(&result, fixup.rep.as_str()) result = Regex::new(&fixup.pat).unwrap().replace_all(&result, &*fixup.rep)
.into_owned().into(); .into_owned().into();
} }
let bytes = result.into_bytes(); let bytes = result.into_bytes();
@ -426,7 +426,7 @@ mod bindings {
let servo = item["servo"].as_str().unwrap(); let servo = item["servo"].as_str().unwrap();
let gecko_name = gecko.rsplit("::").next().unwrap(); let gecko_name = gecko.rsplit("::").next().unwrap();
fixups.push(Fixup { fixups.push(Fixup {
pat: format!("root::{}", gecko), pat: format!("\\broot::{}\\b", gecko),
rep: format!("::gecko_bindings::structs::{}", gecko_name) rep: format!("::gecko_bindings::structs::{}", gecko_name)
}); });
builder.hide_type(gecko) builder.hide_type(gecko)