servo: Merge #1388 - Fixed this issue (rust-lang/rust#10683) (from hyunjunekim:cssissues); r=kmcallister

marco-c · marco-c · commit 2bf2b42c6d03 · 2019-09-30T23:55:01.000Z
Fixed this issue ( rust-lang/rust#10683 ) Source-Repo: https://github.com/servo/servo Source-Revision: c5d81f13c167ba46836b78359389e8d1a3f817d6 UltraBlame original commit: 19615f9ab014ee097b16427c1c85db9c1a353b6d
diff --git a/servo/src/components/script/dom/htmliframeelement.rs b/servo/src/components/script/dom/htmliframeelement.rs
@@ -517,15 +517,41 @@ split_iter
 '
 )
 {
-modes
-|
+/
+/
+FIXME
+:
+Workaround
+for
+https
+:
+/
+/
+github
+.
+com
+/
+mozilla
+/
+rust
+/
+issues
+/
+10683
+let
+word_lower
 =
-match
 word
 .
 to_ascii_lower
 (
 )
+;
+modes
+|
+=
+match
+word_lower
 .
 as_slice
 (
diff --git a/servo/src/components/style/common_types.rs b/servo/src/components/style/common_types.rs
@@ -367,12 +367,38 @@ Option
 Length
 >
 {
-match
+/
+/
+FIXME
+:
+Workaround
+for
+https
+:
+/
+/
+github
+.
+com
+/
+mozilla
+/
+rust
+/
+issues
+/
+10683
+let
+unit_lower
+=
 unit
 .
 to_ascii_lower
 (
 )
+;
+match
+unit_lower
 .
 as_slice
 (
diff --git a/servo/src/components/style/media_queries.rs b/servo/src/components/style/media_queries.rs
@@ -408,12 +408,38 @@ value
 =
 >
 {
-match
+/
+/
+FIXME
+:
+Workaround
+for
+https
+:
+/
+/
+github
+.
+com
+/
+mozilla
+/
+rust
+/
+issues
+/
+10683
+let
+value_lower
+=
 value
 .
 to_ascii_lower
 (
 )
+;
+match
+value_lower
 .
 as_slice
 (
diff --git a/servo/src/components/style/properties.rs.mako b/servo/src/components/style/properties.rs.mako
@@ -1452,12 +1452,39 @@ value
 )
 =
 >
-match
+{
+/
+/
+FIXME
+:
+Workaround
+for
+https
+:
+/
+/
+github
+.
+com
+/
+mozilla
+/
+rust
+/
+issues
+/
+10683
+let
+value_lower
+=
 value
 .
 to_ascii_lower
 (
 )
+;
+match
+value_lower
 .
 as_slice
 (
@@ -1525,6 +1552,7 @@ _
 >
 None
 }
+}
 _
 =
 >
@@ -2564,12 +2592,39 @@ value
 )
 =
 >
-match
+{
+/
+/
+FIXME
+:
+Workaround
+for
+https
+:
+/
+/
+github
+.
+com
+/
+mozilla
+/
+rust
+/
+issues
+/
+10683
+let
+value_lower
+=
 value
 .
 to_ascii_lower
 (
 )
+;
+match
+value_lower
 .
 as_slice
 (
@@ -2605,6 +2660,7 @@ _
 >
 None
 }
+}
 _
 =
 >
@@ -3446,6 +3502,27 @@ value
 =
 >
 {
+/
+/
+FIXME
+:
+Workaround
+for
+https
+:
+/
+/
+github
+.
+com
+/
+mozilla
+/
+rust
+/
+issues
+/
+10683
 let
 value
 =
@@ -3455,12 +3532,17 @@ as_slice
 (
 )
 ;
-match
+let
+value_lower
+=
 value
 .
 to_ascii_lower
 (
 )
+;
+match
+value_lower
 .
 as_slice
 (
@@ -3796,12 +3878,39 @@ value
 )
 =
 >
-match
+{
+/
+/
+FIXME
+:
+Workaround
+for
+https
+:
+/
+/
+github
+.
+com
+/
+mozilla
+/
+rust
+/
+issues
+/
+10683
+let
+value_lower
+=
 value
 .
 to_ascii_lower
 (
 )
+;
+match
+value_lower
 .
 as_slice
 (
@@ -3848,6 +3957,7 @@ _
 >
 None
 }
+}
 &
 Number
 (
diff --git a/servo/src/components/style/selectors.rs b/servo/src/components/style/selectors.rs

Original file line number	Diff line number	Diff line change
`@@ -517,15 +517,41 @@ split_iter`
`517`	`517`	`'`
`518`	`518`	`)`
`519`	`519`	`{`
`520`		`-modes`
`521`		`-\|`
	`520`	`+/`
	`521`	`+/`
	`522`	`+FIXME`
	`523`	`+:`
	`524`	`+Workaround`
	`525`	`+for`
	`526`	`+https`
	`527`	`+:`
	`528`	`+/`
	`529`	`+/`
	`530`	`+github`
	`531`	`+.`
	`532`	`+com`
	`533`	`+/`
	`534`	`+mozilla`
	`535`	`+/`
	`536`	`+rust`
	`537`	`+/`
	`538`	`+issues`
	`539`	`+/`
	`540`	`+10683`
	`541`	`+let`
	`542`	`+word_lower`
`522`	`543`	`=`
`523`		`-match`
`524`	`544`	`word`
`525`	`545`	`.`
`526`	`546`	`to_ascii_lower`
`527`	`547`	`(`
`528`	`548`	`)`
	`549`	`+;`
	`550`	`+modes`
	`551`	`+\|`
	`552`	`+=`
	`553`	`+match`
	`554`	`+word_lower`
`529`	`555`	`.`
`530`	`556`	`as_slice`
`531`	`557`	`(`
Original file line number	Diff line number	Diff line change
`@@ -408,12 +408,38 @@ value`
`408`	`408`	`=`
`409`	`409`	`>`
`410`	`410`	`{`
`411`		`-match`
	`411`	`+/`
	`412`	`+/`
	`413`	`+FIXME`
	`414`	`+:`
	`415`	`+Workaround`
	`416`	`+for`
	`417`	`+https`
	`418`	`+:`
	`419`	`+/`
	`420`	`+/`
	`421`	`+github`
	`422`	`+.`
	`423`	`+com`
	`424`	`+/`
	`425`	`+mozilla`
	`426`	`+/`
	`427`	`+rust`
	`428`	`+/`
	`429`	`+issues`
	`430`	`+/`
	`431`	`+10683`
	`432`	`+let`
	`433`	`+value_lower`
	`434`	`+=`
`412`	`435`	`value`
`413`	`436`	`.`
`414`	`437`	`to_ascii_lower`
`415`	`438`	`(`
`416`	`439`	`)`
	`440`	`+;`
	`441`	`+match`
	`442`	`+value_lower`
`417`	`443`	`.`
`418`	`444`	`as_slice`
`419`	`445`	`(`
Original file line number	Diff line number	Diff line change
`@@ -1452,12 +1452,39 @@ value`
`1452`	`1452`	`)`
`1453`	`1453`	`=`
`1454`	`1454`	`>`
`1455`		`-match`
	`1455`	`+{`
	`1456`	`+/`
	`1457`	`+/`
	`1458`	`+FIXME`
	`1459`	`+:`
	`1460`	`+Workaround`
	`1461`	`+for`
	`1462`	`+https`
	`1463`	`+:`
	`1464`	`+/`
	`1465`	`+/`
	`1466`	`+github`
	`1467`	`+.`
	`1468`	`+com`
	`1469`	`+/`
	`1470`	`+mozilla`
	`1471`	`+/`
	`1472`	`+rust`
	`1473`	`+/`
	`1474`	`+issues`
	`1475`	`+/`
	`1476`	`+10683`
	`1477`	`+let`
	`1478`	`+value_lower`
	`1479`	`+=`
`1456`	`1480`	`value`
`1457`	`1481`	`.`
`1458`	`1482`	`to_ascii_lower`
`1459`	`1483`	`(`
`1460`	`1484`	`)`
	`1485`	`+;`
	`1486`	`+match`
	`1487`	`+value_lower`
`1461`	`1488`	`.`
`1462`	`1489`	`as_slice`
`1463`	`1490`	`(`
`@@ -1525,6 +1552,7 @@ _`
`1525`	`1552`	`>`
`1526`	`1553`	`None`
`1527`	`1554`	`}`
	`1555`	`+}`
`1528`	`1556`	`_`
`1529`	`1557`	`=`
`1530`	`1558`	`>`
`@@ -2564,12 +2592,39 @@ value`
`2564`	`2592`	`)`
`2565`	`2593`	`=`
`2566`	`2594`	`>`
`2567`		`-match`
	`2595`	`+{`
	`2596`	`+/`
	`2597`	`+/`
	`2598`	`+FIXME`
	`2599`	`+:`
	`2600`	`+Workaround`
	`2601`	`+for`
	`2602`	`+https`
	`2603`	`+:`
	`2604`	`+/`
	`2605`	`+/`
	`2606`	`+github`
	`2607`	`+.`
	`2608`	`+com`
	`2609`	`+/`
	`2610`	`+mozilla`
	`2611`	`+/`
	`2612`	`+rust`
	`2613`	`+/`
	`2614`	`+issues`
	`2615`	`+/`
	`2616`	`+10683`
	`2617`	`+let`
	`2618`	`+value_lower`
	`2619`	`+=`
`2568`	`2620`	`value`
`2569`	`2621`	`.`
`2570`	`2622`	`to_ascii_lower`
`2571`	`2623`	`(`
`2572`	`2624`	`)`
	`2625`	`+;`
	`2626`	`+match`
	`2627`	`+value_lower`
`2573`	`2628`	`.`
`2574`	`2629`	`as_slice`
`2575`	`2630`	`(`
`@@ -2605,6 +2660,7 @@ _`
`2605`	`2660`	`>`
`2606`	`2661`	`None`
`2607`	`2662`	`}`
	`2663`	`+}`
`2608`	`2664`	`_`
`2609`	`2665`	`=`
`2610`	`2666`	`>`
`@@ -3446,6 +3502,27 @@ value`
`3446`	`3502`	`=`
`3447`	`3503`	`>`
`3448`	`3504`	`{`
	`3505`	`+/`
	`3506`	`+/`
	`3507`	`+FIXME`
	`3508`	`+:`
	`3509`	`+Workaround`
	`3510`	`+for`
	`3511`	`+https`
	`3512`	`+:`
	`3513`	`+/`
	`3514`	`+/`
	`3515`	`+github`
	`3516`	`+.`
	`3517`	`+com`
	`3518`	`+/`
	`3519`	`+mozilla`
	`3520`	`+/`
	`3521`	`+rust`
	`3522`	`+/`
	`3523`	`+issues`
	`3524`	`+/`
	`3525`	`+10683`
`3449`	`3526`	`let`
`3450`	`3527`	`value`
`3451`	`3528`	`=`
`@@ -3455,12 +3532,17 @@ as_slice`
`3455`	`3532`	`(`
`3456`	`3533`	`)`
`3457`	`3534`	`;`
`3458`		`-match`
	`3535`	`+let`
	`3536`	`+value_lower`
	`3537`	`+=`
`3459`	`3538`	`value`
`3460`	`3539`	`.`
`3461`	`3540`	`to_ascii_lower`
`3462`	`3541`	`(`
`3463`	`3542`	`)`
	`3543`	`+;`
	`3544`	`+match`
	`3545`	`+value_lower`
`3464`	`3546`	`.`
`3465`	`3547`	`as_slice`
`3466`	`3548`	`(`
`@@ -3796,12 +3878,39 @@ value`
`3796`	`3878`	`)`
`3797`	`3879`	`=`
`3798`	`3880`	`>`
`3799`		`-match`
	`3881`	`+{`
	`3882`	`+/`
	`3883`	`+/`
	`3884`	`+FIXME`
	`3885`	`+:`
	`3886`	`+Workaround`
	`3887`	`+for`
	`3888`	`+https`
	`3889`	`+:`
	`3890`	`+/`
	`3891`	`+/`
	`3892`	`+github`
	`3893`	`+.`
	`3894`	`+com`
	`3895`	`+/`
	`3896`	`+mozilla`
	`3897`	`+/`
	`3898`	`+rust`
	`3899`	`+/`
	`3900`	`+issues`
	`3901`	`+/`
	`3902`	`+10683`
	`3903`	`+let`
	`3904`	`+value_lower`
	`3905`	`+=`
`3800`	`3906`	`value`
`3801`	`3907`	`.`
`3802`	`3908`	`to_ascii_lower`
`3803`	`3909`	`(`
`3804`	`3910`	`)`
	`3911`	`+;`
	`3912`	`+match`
	`3913`	`+value_lower`
`3805`	`3914`	`.`
`3806`	`3915`	`as_slice`
`3807`	`3916`	`(`
`@@ -3848,6 +3957,7 @@ _`
`3848`	`3957`	`>`
`3849`	`3958`	`None`
`3850`	`3959`	`}`
	`3960`	`+}`
`3851`	`3961`	`&`
`3852`	`3962`	`Number`
`3853`	`3963`	`(`