mirror of
https://github.com/servo/servo.git
synced 2025-08-03 04:30:10 +01:00
Auto merge of #12243 - TravisDean:else-brace-check, r=ConnorGBrewster
Add style check and test for else braces <!-- Please describe your changes on the following line: --> Added a regex check to enforce project style guidelines. Added unit check. Catches: ``` } else { ``` when it should be `} else {` --- <!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `__` with appropriate data: --> - [ ] `./mach build -d` does not report any errors (no core files changed) - [X] `./mach test-tidy` does not report any errors - [X] These changes fix #12234 (github issue number if applicable). <!-- Either: --> - [X] There are tests for these changes OR - [ ] These changes do not require tests because _____ <!-- Pull requests that do not address these steps are welcome, but they will require additional verification as part of the review process. --> <!-- Reviewable:start --> --- This change is [<img src="https://reviewable.io/review_button.svg" height="35" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/12243) <!-- Reviewable:end -->
This commit is contained in:
commit
e21b47c2cc
9 changed files with 26 additions and 20 deletions
|
@ -2261,8 +2261,7 @@ impl<Window: WindowMethods> IOCompositor<Window> {
|
|||
rendergl::render_scene(layer.clone(), context, &self.scene);
|
||||
gl::disable(gl::SCISSOR_TEST);
|
||||
|
||||
}
|
||||
else {
|
||||
} else {
|
||||
rendergl::render_scene(layer.clone(), context, &self.scene);
|
||||
}
|
||||
}
|
||||
|
|
|
@ -1788,8 +1788,11 @@ impl ScaledFontExtensionMethods for ScaledFont {
|
|||
let mut options = struct__AzDrawOptions {
|
||||
mAlpha: 1f64 as AzFloat,
|
||||
mCompositionOp: CompositionOp::Over as u8,
|
||||
mAntialiasMode: if antialias { AntialiasMode::Subpixel as u8 }
|
||||
else { AntialiasMode::None as u8 }
|
||||
mAntialiasMode: if antialias {
|
||||
AntialiasMode::Subpixel as u8
|
||||
} else {
|
||||
AntialiasMode::None as u8
|
||||
}
|
||||
};
|
||||
|
||||
let mut origin = baseline_origin.clone();
|
||||
|
|
|
@ -81,12 +81,12 @@ pub fn load_from_memory(buffer: &[u8]) -> Option<Image> {
|
|||
|
||||
// https://developer.mozilla.org/en-US/docs/Web/HTML/Element/img
|
||||
pub fn detect_image_format(buffer: &[u8]) -> Result<ImageFormat, &str> {
|
||||
if is_gif(buffer) { Ok(ImageFormat::GIF) }
|
||||
else if is_jpeg(buffer) { Ok(ImageFormat::JPEG) }
|
||||
else if is_png(buffer) { Ok(ImageFormat::PNG) }
|
||||
else if is_bmp(buffer) { Ok(ImageFormat::BMP) }
|
||||
else if is_ico(buffer) { Ok(ImageFormat::ICO) }
|
||||
else { Err("Image Format Not Supported") }
|
||||
if is_gif(buffer) { Ok(ImageFormat::GIF)
|
||||
} else if is_jpeg(buffer) { Ok(ImageFormat::JPEG)
|
||||
} else if is_png(buffer) { Ok(ImageFormat::PNG)
|
||||
} else if is_bmp(buffer) { Ok(ImageFormat::BMP)
|
||||
} else if is_ico(buffer) { Ok(ImageFormat::ICO)
|
||||
} else { Err("Image Format Not Supported") }
|
||||
}
|
||||
|
||||
fn is_gif(buffer: &[u8]) -> bool {
|
||||
|
|
|
@ -133,9 +133,8 @@ impl AsyncResponseListener for HTMLMediaElementContext {
|
|||
|
||||
// Step 5
|
||||
elem.fire_simple_event("error");
|
||||
}
|
||||
// => "If the media data cannot be fetched at all..."
|
||||
else {
|
||||
} else {
|
||||
// => "If the media data cannot be fetched at all..."
|
||||
elem.queue_dedicated_media_source_failure_steps();
|
||||
}
|
||||
|
||||
|
|
|
@ -1128,9 +1128,8 @@ impl XMLHttpRequest {
|
|||
// Step 5
|
||||
if self.response_type.get() == XMLHttpRequestResponseType::_empty {
|
||||
return None;
|
||||
}
|
||||
// Step 6
|
||||
else {
|
||||
} else {
|
||||
// Step 6
|
||||
temp_doc = self.document_text_html();
|
||||
}
|
||||
},
|
||||
|
@ -1143,8 +1142,7 @@ impl XMLHttpRequest {
|
|||
Some(Mime(_, mime::SubLevel::Ext(sub), _)) => {
|
||||
if sub.ends_with("+xml") {
|
||||
temp_doc = self.handle_xml();
|
||||
}
|
||||
else {
|
||||
} else {
|
||||
return None;
|
||||
}
|
||||
},
|
||||
|
|
|
@ -374,8 +374,7 @@ pub fn handle_is_selected(context: &BrowsingContext,
|
|||
}
|
||||
else if let Some(_) = node.downcast::<HTMLElement>() {
|
||||
Ok(false) // regular elements are not selectable
|
||||
}
|
||||
else {
|
||||
} else {
|
||||
Err(())
|
||||
}
|
||||
},
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue