From 025f3d2d56d07e77269c5e48d7dea8d79e7b0e09 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 23 Nov 2020 06:33:07 +0000 Subject: [PATCH 1/2] Bump url from 2.1.1 to 2.2.0 Bumps [url](https://github.com/servo/rust-url) from 2.1.1 to 2.2.0. - [Release notes](https://github.com/servo/rust-url/releases) - [Commits](https://github.com/servo/rust-url/compare/v2.1.1...v2.2.0) Signed-off-by: dependabot-preview[bot] --- Cargo.lock | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index e7974cd580d..dc722b92cd2 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1651,6 +1651,16 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" +[[package]] +name = "form_urlencoded" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ece68d15c92e84fa4f19d3780f1294e5ca82a78a6d515f1efaabcc144688be00" +dependencies = [ + "matches", + "percent-encoding", +] + [[package]] name = "freetype" version = "0.7.0" @@ -6616,10 +6626,11 @@ dependencies = [ [[package]] name = "url" -version = "2.1.1" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "829d4a8476c35c9bf0bbce5a3b23f4106f79728039b726d292bb93bc106787cb" +checksum = "5909f2b0817350449ed73e8bcd81c8c3c8d9a7a5d8acba4b27db277f1868976e" dependencies = [ + "form_urlencoded", "idna", "matches", "percent-encoding", From a1263ab5086ff628b440172a0eba1377410ff67b Mon Sep 17 00:00:00 2001 From: Josh Matthews Date: Mon, 23 Nov 2020 21:23:52 -0500 Subject: [PATCH 2/2] Update test expectations. --- ...lementFromPoint-float-in-relative.html.ini | 4 - .../elementFromPoint-list-001.html.ini | 9 ++ .../embedded-opener-remove-frame.html.ini | 1 - .../url/a-element-origin-xhtml.xhtml.ini | 19 --- .../metadata/url/a-element-origin.html.ini | 19 --- .../metadata/url/a-element-xhtml.xhtml.ini | 51 ------- tests/wpt/metadata/url/a-element.html.ini | 51 ------- tests/wpt/metadata/url/failure.html.ini | 135 ------------------ tests/wpt/metadata/url/toascii.window.js.ini | 9 -- .../wpt/metadata/url/url-constructor.html.ini | 51 ------- tests/wpt/metadata/url/url-origin.html.ini | 19 --- .../url/url-setters-stripping.any.js.ini | 36 ----- .../metadata/xhr/send-timeout-events.htm.ini | 2 - 13 files changed, 9 insertions(+), 397 deletions(-) delete mode 100644 tests/wpt/metadata/css/cssom-view/elementFromPoint-float-in-relative.html.ini delete mode 100644 tests/wpt/metadata/url/a-element-origin-xhtml.xhtml.ini delete mode 100644 tests/wpt/metadata/url/a-element-origin.html.ini delete mode 100644 tests/wpt/metadata/url/url-origin.html.ini delete mode 100644 tests/wpt/metadata/xhr/send-timeout-events.htm.ini diff --git a/tests/wpt/metadata/css/cssom-view/elementFromPoint-float-in-relative.html.ini b/tests/wpt/metadata/css/cssom-view/elementFromPoint-float-in-relative.html.ini deleted file mode 100644 index fa416a1a5eb..00000000000 --- a/tests/wpt/metadata/css/cssom-view/elementFromPoint-float-in-relative.html.ini +++ /dev/null @@ -1,4 +0,0 @@ -[elementFromPoint-float-in-relative.html] - [elementFromPoint-float-in-relative] - expected: FAIL - diff --git a/tests/wpt/metadata/css/cssom-view/elementFromPoint-list-001.html.ini b/tests/wpt/metadata/css/cssom-view/elementFromPoint-list-001.html.ini index 668c3f52a5b..a07ac75a027 100644 --- a/tests/wpt/metadata/css/cssom-view/elementFromPoint-list-001.html.ini +++ b/tests/wpt/metadata/css/cssom-view/elementFromPoint-list-001.html.ini @@ -14,3 +14,12 @@ [
  • Outside 3
    • ] expected: FAIL + [
  • Inside 1
    • ] + expected: FAIL + + [
  • Inside 2
    • ] + expected: FAIL + + [
  • Inside 3
    • ] + expected: FAIL + diff --git a/tests/wpt/metadata/html/browsers/windows/embedded-opener-remove-frame.html.ini b/tests/wpt/metadata/html/browsers/windows/embedded-opener-remove-frame.html.ini index 2532dceabac..442db3cb549 100644 --- a/tests/wpt/metadata/html/browsers/windows/embedded-opener-remove-frame.html.ini +++ b/tests/wpt/metadata/html/browsers/windows/embedded-opener-remove-frame.html.ini @@ -1,5 +1,4 @@ [embedded-opener-remove-frame.html] - expected: CRASH [opener and "removed" embedded documents] expected: FAIL diff --git a/tests/wpt/metadata/url/a-element-origin-xhtml.xhtml.ini b/tests/wpt/metadata/url/a-element-origin-xhtml.xhtml.ini deleted file mode 100644 index 6a12ac69036..00000000000 --- a/tests/wpt/metadata/url/a-element-origin-xhtml.xhtml.ini +++ /dev/null @@ -1,19 +0,0 @@ -[a-element-origin-xhtml.xhtml] - [Parsing origin: against ] - expected: FAIL - - [Parsing origin: against ] - expected: FAIL - - [Parsing origin: against ] - expected: FAIL - - [Parsing origin: against ] - expected: FAIL - - [Parsing origin: against ] - expected: FAIL - - [Parsing origin: against ] - expected: FAIL - diff --git a/tests/wpt/metadata/url/a-element-origin.html.ini b/tests/wpt/metadata/url/a-element-origin.html.ini deleted file mode 100644 index d3d6cfeed08..00000000000 --- a/tests/wpt/metadata/url/a-element-origin.html.ini +++ /dev/null @@ -1,19 +0,0 @@ -[a-element-origin.html] - [Parsing origin: against ] - expected: FAIL - - [Parsing origin: against ] - expected: FAIL - - [Parsing origin: against ] - expected: FAIL - - [Parsing origin: against ] - expected: FAIL - - [Parsing origin: against ] - expected: FAIL - - [Parsing origin: against ] - expected: FAIL - diff --git a/tests/wpt/metadata/url/a-element-xhtml.xhtml.ini b/tests/wpt/metadata/url/a-element-xhtml.xhtml.ini index ae589ffadbf..daa90654c59 100644 --- a/tests/wpt/metadata/url/a-element-xhtml.xhtml.ini +++ b/tests/wpt/metadata/url/a-element-xhtml.xhtml.ini @@ -9,57 +9,6 @@ [Parsing: against ] expected: FAIL - [Parsing: against ] - expected: FAIL - - [Parsing: against ] - expected: FAIL - - [Parsing: against ] - expected: FAIL - - [Parsing: against ] - expected: FAIL - - [Parsing: against ] - expected: FAIL - - [Parsing: against ] - expected: FAIL - - [Parsing: against ] - expected: FAIL - - [Parsing: against ] - expected: FAIL - - [Parsing: against ] - expected: FAIL - - [Parsing: against ] - expected: FAIL - - [Parsing: against ] - expected: FAIL - - [Parsing: b> against ] - expected: FAIL - - [Parsing: against ] - expected: FAIL - - [Parsing: b> against ] - expected: FAIL - - [Parsing: against ] - expected: FAIL - - [Parsing: against ] - expected: FAIL - - [Parsing: against ] - expected: FAIL - [Parsing: <> against ] expected: FAIL diff --git a/tests/wpt/metadata/url/a-element.html.ini b/tests/wpt/metadata/url/a-element.html.ini index 2035e52d05e..5b685a81788 100644 --- a/tests/wpt/metadata/url/a-element.html.ini +++ b/tests/wpt/metadata/url/a-element.html.ini @@ -9,57 +9,6 @@ [Parsing: against ] expected: FAIL - [Parsing: against ] - expected: FAIL - - [Parsing: against ] - expected: FAIL - - [Parsing: against ] - expected: FAIL - - [Parsing: against ] - expected: FAIL - - [Parsing: against ] - expected: FAIL - - [Parsing: against ] - expected: FAIL - - [Parsing: against ] - expected: FAIL - - [Parsing: against ] - expected: FAIL - - [Parsing: against ] - expected: FAIL - - [Parsing: against ] - expected: FAIL - - [Parsing: against ] - expected: FAIL - - [Parsing: b> against ] - expected: FAIL - - [Parsing: against ] - expected: FAIL - - [Parsing: b> against ] - expected: FAIL - - [Parsing: against ] - expected: FAIL - - [Parsing: against ] - expected: FAIL - - [Parsing: against ] - expected: FAIL - [Parsing: <> against ] expected: FAIL diff --git a/tests/wpt/metadata/url/failure.html.ini b/tests/wpt/metadata/url/failure.html.ini index 83d958ccc64..939531bb0d0 100644 --- a/tests/wpt/metadata/url/failure.html.ini +++ b/tests/wpt/metadata/url/failure.html.ini @@ -102,51 +102,6 @@ [window.open(): a// should throw] expected: FAIL - [URL's constructor's base argument: file://xn--/p should throw] - expected: FAIL - - [window.open(): file://xn--/p should throw] - expected: FAIL - - [URL's href: file://%C2%AD/p should throw] - expected: FAIL - - [Location's href: file://­/p should throw] - expected: FAIL - - [window.open(): file://%C2%AD/p should throw] - expected: FAIL - - [XHR: file://xn--/p should throw] - expected: FAIL - - [URL's constructor's base argument: file://%C2%AD/p should throw] - expected: FAIL - - [window.open(): file://­/p should throw] - expected: FAIL - - [XHR: file://%C2%AD/p should throw] - expected: FAIL - - [Location's href: file://xn--/p should throw] - expected: FAIL - - [URL's href: file://xn--/p should throw] - expected: FAIL - - [URL's constructor's base argument: file://­/p should throw] - expected: FAIL - - [URL's href: file://­/p should throw] - expected: FAIL - - [XHR: file://­/p should throw] - expected: FAIL - - [Location's href: file://%C2%AD/p should throw] - expected: FAIL - [XHR: \\\\\\.\\y: should throw] expected: FAIL @@ -165,93 +120,3 @@ [Location's href: \\\\\\.\\Y: should throw] expected: FAIL - [XHR: http://a>b should throw] - expected: FAIL - - [Location's href: non-special://a>b should throw] - expected: FAIL - - [Location's href: non-special://a^b should throw] - expected: FAIL - - [URL's href: http://ab should throw] - expected: FAIL - - [window.open(): http://ab should throw] - expected: FAIL - - [XHR: http://a^b should throw] - expected: FAIL - - [URL's href: non-special://ab should throw] - expected: FAIL - - [window.open(): non-special://ab should throw] - expected: FAIL - - [XHR: non-special://ab should throw] - expected: FAIL - - [Location's href: http://ab should throw] - expected: FAIL - - [URL's href: http://a^b should throw] - expected: FAIL - - [XHR: http://ab should throw] - expected: FAIL - - [Location's href: non-special://ab should throw] - expected: FAIL - diff --git a/tests/wpt/metadata/url/toascii.window.js.ini b/tests/wpt/metadata/url/toascii.window.js.ini index 9ce2c70f814..fb2d8fb8646 100644 --- a/tests/wpt/metadata/url/toascii.window.js.ini +++ b/tests/wpt/metadata/url/toascii.window.js.ini @@ -195,9 +195,6 @@ [a­b (using .host)] expected: FAIL - [­ (using URL.host)] - expected: FAIL - [xn-- (using .hostname)] expected: FAIL @@ -207,9 +204,6 @@ [­ (using .hostname)] expected: FAIL - [%C2%AD (using URL.host)] - expected: FAIL - [­ (using )] expected: FAIL @@ -228,9 +222,6 @@ [xn-- (using .host)] expected: FAIL - [xn-- (using URL.host)] - expected: FAIL - [%C2%AD (using .host)] expected: FAIL diff --git a/tests/wpt/metadata/url/url-constructor.html.ini b/tests/wpt/metadata/url/url-constructor.html.ini index efe62b0f67e..186afe4906a 100644 --- a/tests/wpt/metadata/url/url-constructor.html.ini +++ b/tests/wpt/metadata/url/url-constructor.html.ini @@ -1,56 +1,5 @@ [url-constructor.html] type: testharness - [Parsing: against ] - expected: FAIL - - [Parsing: against ] - expected: FAIL - - [Parsing: against ] - expected: FAIL - - [Parsing: against ] - expected: FAIL - - [Parsing: against ] - expected: FAIL - - [Parsing: against ] - expected: FAIL - - [Parsing: against ] - expected: FAIL - - [Parsing: against ] - expected: FAIL - - [Parsing: against ] - expected: FAIL - - [Parsing: against ] - expected: FAIL - - [Parsing: against ] - expected: FAIL - - [Parsing: b> against ] - expected: FAIL - - [Parsing: against ] - expected: FAIL - - [Parsing: b> against ] - expected: FAIL - - [Parsing: against ] - expected: FAIL - - [Parsing: against ] - expected: FAIL - - [Parsing: against ] - expected: FAIL - [Parsing: <> against ] expected: FAIL diff --git a/tests/wpt/metadata/url/url-origin.html.ini b/tests/wpt/metadata/url/url-origin.html.ini deleted file mode 100644 index 1eb7e71b8b1..00000000000 --- a/tests/wpt/metadata/url/url-origin.html.ini +++ /dev/null @@ -1,19 +0,0 @@ -[url-origin.html] - [Origin parsing: against ] - expected: FAIL - - [Origin parsing: against ] - expected: FAIL - - [Origin parsing: against ] - expected: FAIL - - [Origin parsing: against ] - expected: FAIL - - [Origin parsing: against ] - expected: FAIL - - [Origin parsing: against ] - expected: FAIL - diff --git a/tests/wpt/metadata/url/url-setters-stripping.any.js.ini b/tests/wpt/metadata/url/url-setters-stripping.any.js.ini index 53fd0219a47..941d1b10f0f 100644 --- a/tests/wpt/metadata/url/url-setters-stripping.any.js.ini +++ b/tests/wpt/metadata/url/url-setters-stripping.any.js.ini @@ -17,18 +17,6 @@ [Setting protocol with leading U+0000 (https:)] expected: FAIL - [Setting hash with trailing U+0000 (https:)] - expected: FAIL - - [Setting hash with middle U+0000 (wpt++:)] - expected: FAIL - - [Setting hash with leading U+0000 (wpt++:)] - expected: FAIL - - [Setting hash with leading U+0000 (https:)] - expected: FAIL - [Setting protocol with U+001F before inserted colon (wpt++:)] expected: FAIL @@ -47,9 +35,6 @@ [Setting pathname with trailing U+0000 (wpt++:)] expected: FAIL - [Setting hash with trailing U+0000 (wpt++:)] - expected: FAIL - [Setting protocol with leading U+001F (wpt++:)] expected: FAIL @@ -59,9 +44,6 @@ [Setting port with leading U+001F (https:)] expected: FAIL - [Setting hash with middle U+0000 (https:)] - expected: FAIL - [Setting port with leading U+001F (wpt++:)] expected: FAIL @@ -85,18 +67,6 @@ [Setting protocol with leading U+0000 (https:)] expected: FAIL - [Setting hash with trailing U+0000 (https:)] - expected: FAIL - - [Setting hash with middle U+0000 (wpt++:)] - expected: FAIL - - [Setting hash with leading U+0000 (wpt++:)] - expected: FAIL - - [Setting hash with leading U+0000 (https:)] - expected: FAIL - [Setting protocol with U+001F before inserted colon (wpt++:)] expected: FAIL @@ -115,9 +85,6 @@ [Setting pathname with trailing U+0000 (wpt++:)] expected: FAIL - [Setting hash with trailing U+0000 (wpt++:)] - expected: FAIL - [Setting protocol with leading U+001F (wpt++:)] expected: FAIL @@ -127,9 +94,6 @@ [Setting port with leading U+001F (https:)] expected: FAIL - [Setting hash with middle U+0000 (https:)] - expected: FAIL - [Setting port with leading U+001F (wpt++:)] expected: FAIL diff --git a/tests/wpt/metadata/xhr/send-timeout-events.htm.ini b/tests/wpt/metadata/xhr/send-timeout-events.htm.ini deleted file mode 100644 index 667372a9597..00000000000 --- a/tests/wpt/metadata/xhr/send-timeout-events.htm.ini +++ /dev/null @@ -1,2 +0,0 @@ -[send-timeout-events.htm] - expected: TIMEOUT