mirror of
https://github.com/servo/servo.git
synced 2025-08-05 21:50:18 +01:00
Auto merge of #14370 - thiagopnts:master, r=Wafflespeanut
use Either type for UrlOrNone Use the Either type for UrlOrNone --- <!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `__` with appropriate data: --> - [x] `./mach build -d` does not report any errors - [x] `./mach test-tidy` does not report any errors - [ ] These changes fix #14298 (github issue number if applicable). <!-- Either: --> - [ ] 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="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/14370) <!-- Reviewable:end -->
This commit is contained in:
commit
290ff5c801
9 changed files with 30 additions and 49 deletions
|
@ -418,9 +418,9 @@ mod shorthand_serialization {
|
|||
}
|
||||
|
||||
mod list_style {
|
||||
use style::properties::longhands::list_style_image::SpecifiedValue as ListStyleImage;
|
||||
use style::properties::longhands::list_style_position::computed_value::T as ListStylePosition;
|
||||
use style::properties::longhands::list_style_type::computed_value::T as ListStyleType;
|
||||
use style::values::Either;
|
||||
use super::*;
|
||||
|
||||
#[test]
|
||||
|
@ -428,7 +428,7 @@ mod shorthand_serialization {
|
|||
let mut properties = Vec::new();
|
||||
|
||||
let position = DeclaredValue::Value(ListStylePosition::inside);
|
||||
let image = DeclaredValue::Value(ListStyleImage::Url(
|
||||
let image = DeclaredValue::Value(Either::First(
|
||||
SpecifiedUrl::new_for_testing("http://servo/test.png")));
|
||||
let style_type = DeclaredValue::Value(ListStyleType::disc);
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue