Merging upstream version 1.66.0+dfsg1.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

4 files changed, 45 insertions, 13 deletions

diff --git a/vendor/unicode-xid/.cargo-checksum.json b/vendor/unicode-xid/.cargo-checksum.json
index 0f93609e5..be3630543 100644
--- a/vendor/unicode-xid/.cargo-checksum.json
+++ b/vendor/unicode-xid/.cargo-checksum.json
@@ -1 +1 @@
-{"files":{"COPYRIGHT":"23860c2a7b5d96b21569afedf033469bab9fe14a1b24a35068b8641c578ce24d","Cargo.toml":"50d9e34c8bf5a28d7e160844ed52b641c7975414e8be75166a8979710c17bcf2","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"7b63ecd5f1902af1b63729947373683c32745c16a10e8e6292e2e2dcd7e90ae0","README.md":"2d01a2c43c4ec10fb3b74bf84fe06995d3d53d06c968fb4e27e64682058ba9e3","benches/xid.rs":"a2986ce1df5d93bff51e73dc234bffb341d4fe5d749247296f02396dde16a72b","src/lib.rs":"3cdd204115af45e9ece70db737d711e1798eac40eaa6cc4e8280bb3342e1408e","src/tables.rs":"1c8650d5bed6c75c4071f5cac2127aaab578d887622d2fdde8808492caec5c91","src/tests.rs":"b866f890acd631e667635785c34b1723709f10a9515ca525b41de8a062c7b204","tests/exhaustive_tests.rs":"ec91e9124d61e5b3e2fbbbf37a2fd30d6c7a8fa22639d6720b416d9ebc1007c5"},"package":"957e51f3646910546462e67d5f7599b9e4fb8acdd304b087a6494730f9eebf04"}
\ No newline at end of file
+{"files":{"COPYRIGHT":"23860c2a7b5d96b21569afedf033469bab9fe14a1b24a35068b8641c578ce24d","Cargo.toml":"289ae8b5c1859b5556dd663b31efae72255f69e3c05408ce7a51c8ba65573677","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"7b63ecd5f1902af1b63729947373683c32745c16a10e8e6292e2e2dcd7e90ae0","README.md":"d13b0abf515d4b41b684a2255169f4340c32256c91e6a4835cafaec2161b5e5f","benches/xid.rs":"a2986ce1df5d93bff51e73dc234bffb341d4fe5d749247296f02396dde16a72b","src/lib.rs":"3cdd204115af45e9ece70db737d711e1798eac40eaa6cc4e8280bb3342e1408e","src/tables.rs":"e4c2e9b70f45d262b78fde8435a969eb2478ca6d9dacd061953f54cf344f0f4d","src/tests.rs":"b866f890acd631e667635785c34b1723709f10a9515ca525b41de8a062c7b204","tests/exhaustive_tests.rs":"ec91e9124d61e5b3e2fbbbf37a2fd30d6c7a8fa22639d6720b416d9ebc1007c5"},"package":"f962df74c8c05a667b5ee8bcf162993134c104e96440b663c8daa176dc772d8c"}
\ No newline at end of file
diff --git a/vendor/unicode-xid/Cargo.toml b/vendor/unicode-xid/Cargo.toml
index 04afa4c60..817a4f42f 100644
--- a/vendor/unicode-xid/Cargo.toml
+++ b/vendor/unicode-xid/Cargo.toml
@@ -12,7 +12,7 @@
 [package]
 rust-version = "1.17"
 name = "unicode-xid"
-version = "0.2.3"
+version = "0.2.4"
 authors = [
     "erick.tryzelaar <erick.tryzelaar@gmail.com>",
     "kwantam <kwantam@gmail.com>",
diff --git a/vendor/unicode-xid/README.md b/vendor/unicode-xid/README.md
index 325d35e95..747684303 100644
--- a/vendor/unicode-xid/README.md
+++ b/vendor/unicode-xid/README.md
@@ -26,6 +26,15 @@ on std, and instead uses equivalent functions from core.
 
 # changelog
 
+## 0.2.4
+
+- Update to Unicode 15.0.0
+- Replace `const` tables with `static` tables.
+
+## 0.2.3
+
+- Update to Unicode 14.0.0
+
 ## 0.2.2
 
 - Add an ASCII fast-path
diff --git a/vendor/unicode-xid/src/tables.rs b/vendor/unicode-xid/src/tables.rs
index a4a072f36..c12e76c0b 100644
--- a/vendor/unicode-xid/src/tables.rs
+++ b/vendor/unicode-xid/src/tables.rs
@@ -14,7 +14,7 @@
 
 /// The version of [Unicode](http://www.unicode.org/)
 /// that this version of unicode-xid is based on.
-pub const UNICODE_VERSION: (u64, u64, u64) = (14, 0, 0);
+pub const UNICODE_VERSION: (u64, u64, u64) = (15, 0, 0);
 
 fn bsearch_range_table(c: char, r: &[(char, char)]) -> bool {
     use core::cmp::Ordering::{Equal, Greater, Less};
@@ -37,7 +37,7 @@ fn bsearch_range_table(c: char, r: &[(char, char)]) -> bool {
 }
 
 pub mod derived_property {
-    pub const XID_Continue_table: &[(char, char)] = &[
+    static XID_Continue_table: &[(char, char)] = &[
         ('\u{30}', '\u{39}'),
         ('\u{41}', '\u{5a}'),
         ('\u{5f}', '\u{5f}'),
@@ -196,7 +196,7 @@ pub mod derived_property {
         ('\u{cdd}', '\u{cde}'),
         ('\u{ce0}', '\u{ce3}'),
         ('\u{ce6}', '\u{cef}'),
-        ('\u{cf1}', '\u{cf2}'),
+        ('\u{cf1}', '\u{cf3}'),
         ('\u{d00}', '\u{d0c}'),
         ('\u{d0e}', '\u{d10}'),
         ('\u{d12}', '\u{d44}'),
@@ -229,7 +229,7 @@ pub mod derived_property {
         ('\u{ea7}', '\u{ebd}'),
         ('\u{ec0}', '\u{ec4}'),
         ('\u{ec6}', '\u{ec6}'),
-        ('\u{ec8}', '\u{ecd}'),
+        ('\u{ec8}', '\u{ece}'),
         ('\u{ed0}', '\u{ed9}'),
         ('\u{edc}', '\u{edf}'),
         ('\u{f00}', '\u{f00}'),
@@ -549,7 +549,7 @@ pub mod derived_property {
         ('\u{10e80}', '\u{10ea9}'),
         ('\u{10eab}', '\u{10eac}'),
         ('\u{10eb0}', '\u{10eb1}'),
-        ('\u{10f00}', '\u{10f1c}'),
+        ('\u{10efd}', '\u{10f1c}'),
         ('\u{10f27}', '\u{10f27}'),
         ('\u{10f30}', '\u{10f50}'),
         ('\u{10f70}', '\u{10f85}'),
@@ -572,7 +572,7 @@ pub mod derived_property {
         ('\u{111dc}', '\u{111dc}'),
         ('\u{11200}', '\u{11211}'),
         ('\u{11213}', '\u{11237}'),
-        ('\u{1123e}', '\u{1123e}'),
+        ('\u{1123e}', '\u{11241}'),
         ('\u{11280}', '\u{11286}'),
         ('\u{11288}', '\u{11288}'),
         ('\u{1128a}', '\u{1128d}'),
@@ -653,12 +653,17 @@ pub mod derived_property {
         ('\u{11d93}', '\u{11d98}'),
         ('\u{11da0}', '\u{11da9}'),
         ('\u{11ee0}', '\u{11ef6}'),
+        ('\u{11f00}', '\u{11f10}'),
+        ('\u{11f12}', '\u{11f3a}'),
+        ('\u{11f3e}', '\u{11f42}'),
+        ('\u{11f50}', '\u{11f59}'),
         ('\u{11fb0}', '\u{11fb0}'),
         ('\u{12000}', '\u{12399}'),
         ('\u{12400}', '\u{1246e}'),
         ('\u{12480}', '\u{12543}'),
         ('\u{12f90}', '\u{12ff0}'),
-        ('\u{13000}', '\u{1342e}'),
+        ('\u{13000}', '\u{1342f}'),
+        ('\u{13440}', '\u{13455}'),
         ('\u{14400}', '\u{14646}'),
         ('\u{16800}', '\u{16a38}'),
         ('\u{16a40}', '\u{16a5e}'),
@@ -686,7 +691,9 @@ pub mod derived_property {
         ('\u{1aff5}', '\u{1affb}'),
         ('\u{1affd}', '\u{1affe}'),
         ('\u{1b000}', '\u{1b122}'),
+        ('\u{1b132}', '\u{1b132}'),
         ('\u{1b150}', '\u{1b152}'),
+        ('\u{1b155}', '\u{1b155}'),
         ('\u{1b164}', '\u{1b167}'),
         ('\u{1b170}', '\u{1b2fb}'),
         ('\u{1bc00}', '\u{1bc6a}'),
@@ -740,17 +747,21 @@ pub mod derived_property {
         ('\u{1da9b}', '\u{1da9f}'),
         ('\u{1daa1}', '\u{1daaf}'),
         ('\u{1df00}', '\u{1df1e}'),
+        ('\u{1df25}', '\u{1df2a}'),
         ('\u{1e000}', '\u{1e006}'),
         ('\u{1e008}', '\u{1e018}'),
         ('\u{1e01b}', '\u{1e021}'),
         ('\u{1e023}', '\u{1e024}'),
         ('\u{1e026}', '\u{1e02a}'),
+        ('\u{1e030}', '\u{1e06d}'),
+        ('\u{1e08f}', '\u{1e08f}'),
         ('\u{1e100}', '\u{1e12c}'),
         ('\u{1e130}', '\u{1e13d}'),
         ('\u{1e140}', '\u{1e149}'),
         ('\u{1e14e}', '\u{1e14e}'),
         ('\u{1e290}', '\u{1e2ae}'),
         ('\u{1e2c0}', '\u{1e2f9}'),
+        ('\u{1e4d0}', '\u{1e4f9}'),
         ('\u{1e7e0}', '\u{1e7e6}'),
         ('\u{1e7e8}', '\u{1e7eb}'),
         ('\u{1e7ed}', '\u{1e7ee}'),
@@ -794,12 +805,13 @@ pub mod derived_property {
         ('\u{1eeab}', '\u{1eebb}'),
         ('\u{1fbf0}', '\u{1fbf9}'),
         ('\u{20000}', '\u{2a6df}'),
-        ('\u{2a700}', '\u{2b738}'),
+        ('\u{2a700}', '\u{2b739}'),
         ('\u{2b740}', '\u{2b81d}'),
         ('\u{2b820}', '\u{2cea1}'),
         ('\u{2ceb0}', '\u{2ebe0}'),
         ('\u{2f800}', '\u{2fa1d}'),
         ('\u{30000}', '\u{3134a}'),
+        ('\u{31350}', '\u{323af}'),
         ('\u{e0100}', '\u{e01ef}'),
     ];
 
@@ -807,7 +819,7 @@ pub mod derived_property {
         super::bsearch_range_table(c, XID_Continue_table)
     }
 
-    pub const XID_Start_table: &[(char, char)] = &[
+    static XID_Start_table: &[(char, char)] = &[
         ('\u{41}', '\u{5a}'),
         ('\u{61}', '\u{7a}'),
         ('\u{aa}', '\u{aa}'),
@@ -1283,6 +1295,7 @@ pub mod derived_property {
         ('\u{111dc}', '\u{111dc}'),
         ('\u{11200}', '\u{11211}'),
         ('\u{11213}', '\u{1122b}'),
+        ('\u{1123f}', '\u{11240}'),
         ('\u{11280}', '\u{11286}'),
         ('\u{11288}', '\u{11288}'),
         ('\u{1128a}', '\u{1128d}'),
@@ -1345,12 +1358,16 @@ pub mod derived_property {
         ('\u{11d6a}', '\u{11d89}'),
         ('\u{11d98}', '\u{11d98}'),
         ('\u{11ee0}', '\u{11ef2}'),
+        ('\u{11f02}', '\u{11f02}'),
+        ('\u{11f04}', '\u{11f10}'),
+        ('\u{11f12}', '\u{11f33}'),
         ('\u{11fb0}', '\u{11fb0}'),
         ('\u{12000}', '\u{12399}'),
         ('\u{12400}', '\u{1246e}'),
         ('\u{12480}', '\u{12543}'),
         ('\u{12f90}', '\u{12ff0}'),
-        ('\u{13000}', '\u{1342e}'),
+        ('\u{13000}', '\u{1342f}'),
+        ('\u{13441}', '\u{13446}'),
         ('\u{14400}', '\u{14646}'),
         ('\u{16800}', '\u{16a38}'),
         ('\u{16a40}', '\u{16a5e}'),
@@ -1373,7 +1390,9 @@ pub mod derived_property {
         ('\u{1aff5}', '\u{1affb}'),
         ('\u{1affd}', '\u{1affe}'),
         ('\u{1b000}', '\u{1b122}'),
+        ('\u{1b132}', '\u{1b132}'),
         ('\u{1b150}', '\u{1b152}'),
+        ('\u{1b155}', '\u{1b155}'),
         ('\u{1b164}', '\u{1b167}'),
         ('\u{1b170}', '\u{1b2fb}'),
         ('\u{1bc00}', '\u{1bc6a}'),
@@ -1411,11 +1430,14 @@ pub mod derived_property {
         ('\u{1d7aa}', '\u{1d7c2}'),
         ('\u{1d7c4}', '\u{1d7cb}'),
         ('\u{1df00}', '\u{1df1e}'),
+        ('\u{1df25}', '\u{1df2a}'),
+        ('\u{1e030}', '\u{1e06d}'),
         ('\u{1e100}', '\u{1e12c}'),
         ('\u{1e137}', '\u{1e13d}'),
         ('\u{1e14e}', '\u{1e14e}'),
         ('\u{1e290}', '\u{1e2ad}'),
         ('\u{1e2c0}', '\u{1e2eb}'),
+        ('\u{1e4d0}', '\u{1e4eb}'),
         ('\u{1e7e0}', '\u{1e7e6}'),
         ('\u{1e7e8}', '\u{1e7eb}'),
         ('\u{1e7ed}', '\u{1e7ee}'),
@@ -1457,12 +1479,13 @@ pub mod derived_property {
         ('\u{1eea5}', '\u{1eea9}'),
         ('\u{1eeab}', '\u{1eebb}'),
         ('\u{20000}', '\u{2a6df}'),
-        ('\u{2a700}', '\u{2b738}'),
+        ('\u{2a700}', '\u{2b739}'),
         ('\u{2b740}', '\u{2b81d}'),
         ('\u{2b820}', '\u{2cea1}'),
         ('\u{2ceb0}', '\u{2ebe0}'),
         ('\u{2f800}', '\u{2fa1d}'),
         ('\u{30000}', '\u{3134a}'),
+        ('\u{31350}', '\u{323af}'),
     ];
 
     pub fn XID_Start(c: char) -> bool {