diff --git a/Cargo.lock b/Cargo.lock
index 0c599992e4..bef78ec0bb 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2283,6 +2283,124 @@ dependencies = [
"cxx-build",
]
+[[package]]
+name = "icu_collections"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "db2fa452206ebee18c4b5c2274dbf1de17008e874b4dc4f0aea9d01ca79e4526"
+dependencies = [
+ "displaydoc",
+ "yoke",
+ "zerofrom",
+ "zerovec",
+]
+
+[[package]]
+name = "icu_locid"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "13acbb8371917fc971be86fc8057c41a64b521c184808a698c02acc242dbf637"
+dependencies = [
+ "displaydoc",
+ "litemap",
+ "tinystr",
+ "writeable",
+ "zerovec",
+]
+
+[[package]]
+name = "icu_locid_transform"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "01d11ac35de8e40fdeda00d9e1e9d92525f3f9d887cdd7aa81d727596788b54e"
+dependencies = [
+ "displaydoc",
+ "icu_locid",
+ "icu_locid_transform_data",
+ "icu_provider",
+ "tinystr",
+ "zerovec",
+]
+
+[[package]]
+name = "icu_locid_transform_data"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fdc8ff3388f852bede6b579ad4e978ab004f139284d7b28715f773507b946f6e"
+
+[[package]]
+name = "icu_normalizer"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "19ce3e0da2ec68599d193c93d088142efd7f9c5d6fc9b803774855747dc6a84f"
+dependencies = [
+ "displaydoc",
+ "icu_collections",
+ "icu_normalizer_data",
+ "icu_properties",
+ "icu_provider",
+ "smallvec",
+ "utf16_iter",
+ "utf8_iter",
+ "write16",
+ "zerovec",
+]
+
+[[package]]
+name = "icu_normalizer_data"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f8cafbf7aa791e9b22bec55a167906f9e1215fd475cd22adfcf660e03e989516"
+
+[[package]]
+name = "icu_properties"
+version = "1.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "93d6020766cfc6302c15dbbc9c8778c37e62c14427cb7f6e601d849e092aeef5"
+dependencies = [
+ "displaydoc",
+ "icu_collections",
+ "icu_locid_transform",
+ "icu_properties_data",
+ "icu_provider",
+ "tinystr",
+ "zerovec",
+]
+
+[[package]]
+name = "icu_properties_data"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "67a8effbc3dd3e4ba1afa8ad918d5684b8868b3b26500753effea8d2eed19569"
+
+[[package]]
+name = "icu_provider"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6ed421c8a8ef78d3e2dbc98a973be2f3770cb42b606e3ab18d6237c4dfde68d9"
+dependencies = [
+ "displaydoc",
+ "icu_locid",
+ "icu_provider_macros",
+ "stable_deref_trait",
+ "tinystr",
+ "writeable",
+ "yoke",
+ "zerofrom",
+ "zerovec",
+]
+
+[[package]]
+name = "icu_provider_macros"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1ec89e9337638ecdc08744df490b221a7399bf8d164eb52a665454e60e075ad6"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.89",
+]
+
[[package]]
name = "id-arena"
version = "2.2.1"
@@ -2291,12 +2409,23 @@ checksum = "25a2bc672d1148e28034f176e01fffebb08b35768468cc954630da77a1449005"
[[package]]
name = "idna"
-version = "0.5.0"
+version = "1.0.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "634d9b1461af396cad843f47fdba5597a4f9e6ddd4bfb6ff5d85028c25cb12f6"
+checksum = "686f825264d630750a544639377bae737628043f20d38bbc029e8f29ea968a7e"
dependencies = [
- "unicode-bidi",
- "unicode-normalization",
+ "idna_adapter",
+ "smallvec",
+ "utf8_iter",
+]
+
+[[package]]
+name = "idna_adapter"
+version = "1.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "daca1df1c957320b2cf139ac61e7bd64fed304c5040df000a745aa1de3b4ef71"
+dependencies = [
+ "icu_normalizer",
+ "icu_properties",
]
[[package]]
@@ -2619,6 +2748,12 @@ version = "0.3.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3f508063cc7bb32987c71511216bd5a32be15bccb6a80b52df8b9d7f01fc3aa2"
+[[package]]
+name = "litemap"
+version = "0.7.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4ee93343901ab17bd981295f2cf0026d4ad018c7c31ba84549a4ddbb47a45104"
+
[[package]]
name = "local-ip-address"
version = "0.5.4"
@@ -4844,6 +4979,17 @@ version = "0.1.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2047c6ded9c721764247e62cd3b03c09ffc529b2ba5b10ec482ae507a4a70160"
+[[package]]
+name = "synstructure"
+version = "0.13.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c8af7666ab7b6390ab78131fb5b0fce11d6b7a6951602017c35fa82800708971"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.89",
+]
+
[[package]]
name = "system-configuration"
version = "0.5.1"
@@ -5062,6 +5208,16 @@ dependencies = [
"time-core",
]
+[[package]]
+name = "tinystr"
+version = "0.7.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9117f5d4db391c1cf6927e7bea3db74b9a1c1add8f7eda9ffd5364f40f57b82f"
+dependencies = [
+ "displaydoc",
+ "zerovec",
+]
+
[[package]]
name = "tinytemplate"
version = "1.2.1"
@@ -5303,12 +5459,6 @@ dependencies = [
"version_check",
]
-[[package]]
-name = "unicode-bidi"
-version = "0.3.15"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "08f95100a766bf4f8f28f90d77e0a5461bbdb219042e7679bebe79004fed8d75"
-
[[package]]
name = "unicode-ident"
version = "1.0.1"
@@ -5516,9 +5666,9 @@ dependencies = [
[[package]]
name = "url"
-version = "2.5.0"
+version = "2.5.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "31e6302e3bb753d46e83516cae55ae196fc0c309407cf11ab35cc51a4c2a4633"
+checksum = "32f8b686cadd1473f4bd0117a5d28d36b1ade384ea9b5069a1c40aefed7fda60"
dependencies = [
"form_urlencoded",
"idna",
@@ -5526,6 +5676,18 @@ dependencies = [
"serde",
]
+[[package]]
+name = "utf16_iter"
+version = "1.0.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c8232dd3cdaed5356e0f716d285e4b40b932ac434100fe9b7e0e8e935b9e6246"
+
+[[package]]
+name = "utf8_iter"
+version = "1.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b6c140620e7ffbb22c2dee59cafe6084a59b5ffc27a8859a5f0d494b5d52b6be"
+
[[package]]
name = "utf8parse"
version = "0.2.1"
@@ -6160,6 +6322,18 @@ dependencies = [
"windows-sys 0.48.0",
]
+[[package]]
+name = "write16"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d1890f4022759daae28ed4fe62859b1236caebfc61ede2f63ed4e695f3f6d936"
+
+[[package]]
+name = "writeable"
+version = "0.5.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1e9df38ee2d2c3c5948ea468a8406ff0db0b29ae1ffde1bcf20ef305bcc95c51"
+
[[package]]
name = "x11-clipboard"
version = "0.7.1"
@@ -6221,6 +6395,30 @@ dependencies = [
"linked-hash-map",
]
+[[package]]
+name = "yoke"
+version = "0.7.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "120e6aef9aa629e3d4f52dc8cc43a015c7724194c97dfaf45180d2daf2b77f40"
+dependencies = [
+ "serde",
+ "stable_deref_trait",
+ "yoke-derive",
+ "zerofrom",
+]
+
+[[package]]
+name = "yoke-derive"
+version = "0.7.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2380878cad4ac9aac1e2435f3eb4020e8374b5f13c296cb75b4620ff8e229154"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.89",
+ "synstructure",
+]
+
[[package]]
name = "zerocopy"
version = "0.7.32"
@@ -6241,6 +6439,27 @@ dependencies = [
"syn 2.0.89",
]
+[[package]]
+name = "zerofrom"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cff3ee08c995dee1859d998dea82f7374f2826091dd9cd47def953cae446cd2e"
+dependencies = [
+ "zerofrom-derive",
+]
+
+[[package]]
+name = "zerofrom-derive"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "595eed982f7d355beb85837f651fa22e90b3c044842dc7f2c2842c086f295808"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.89",
+ "synstructure",
+]
+
[[package]]
name = "zeroize"
version = "1.8.1"
@@ -6261,6 +6480,28 @@ dependencies = [
"syn 2.0.89",
]
+[[package]]
+name = "zerovec"
+version = "0.10.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "aa2b893d79df23bfb12d5461018d408ea19dfafe76c2c7ef6d4eba614f8ff079"
+dependencies = [
+ "yoke",
+ "zerofrom",
+ "zerovec-derive",
+]
+
+[[package]]
+name = "zerovec-derive"
+version = "0.10.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6eafa6dfb17584ea3e2bd6e76e0cc15ad7af12b09abdd1ca55961bed9b1063c6"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.89",
+]
+
[[package]]
name = "zip"
version = "2.2.1"
diff --git a/DEPENDENCIES.md b/DEPENDENCIES.md
index 23a2006ad1..0314c8e1db 100644
--- a/DEPENDENCIES.md
+++ b/DEPENDENCIES.md
@@ -30,6 +30,7 @@ the details of which are reproduced below.
* [MIT License: scroll_derive](#mit-license-scroll_derive)
* [MIT License: slab](#mit-license-slab)
* [MIT License: smawk](#mit-license-smawk)
+* [MIT License: synstructure](#mit-license-synstructure)
* [MIT License: textwrap](#mit-license-textwrap)
* [MIT License: tokio](#mit-license-tokio)
* [MIT License: tokio-native-tls, tracing, tracing-core](#mit-license-tokio-native-tls-tracing-tracing-core)
@@ -45,6 +46,7 @@ the details of which are reproduced below.
* [BSD-2-Clause License: arrayref](#bsd-2-clause-license-arrayref)
* [BSD-3-Clause License: bindgen](#bsd-3-clause-license-bindgen)
* [BSD-3-Clause License: protobuf](#bsd-3-clause-license-protobuf)
+* [Unicode-3.0 License: icu_collections, icu_locid, icu_locid_transform, icu_locid_transform_data, icu_normalizer, icu_normalizer_data, icu_properties, icu_properties_data, icu_provider, icu_provider_macros, litemap, tinystr, writeable, yoke, yoke-derive, zerofrom, zerofrom-derive, zerovec, zerovec-derive](#unicode-30-license-icu_collections-icu_locid-icu_locid_transform-icu_locid_transform_data-icu_normalizer-icu_normalizer_data-icu_properties-icu_properties_data-icu_provider-icu_provider_macros-litemap-tinystr-writeable-yoke-yoke-derive-zerofrom-zerofrom-derive-zerovec-zerovec-derive)
* [OpenSSL License](#openssl-license)
* [Optional Notice: SQLite](#optional-notice-sqlite)
* [(Apache-2.0 OR MIT) AND BSD-3-Clause License: encoding_rs](#(apache-20-or-mit)-and-bsd-3-clause-license-encoding_rs)
@@ -473,6 +475,7 @@ The following text applies to code linked from these dependencies:
[cpufeatures](https://github.com/RustCrypto/utils),
[crypto-common](https://github.com/RustCrypto/traits),
[digest](https://github.com/RustCrypto/traits),
+[displaydoc](https://github.com/yaahc/displaydoc),
[dogear](https://github.com/mozilla/dogear),
[either](https://github.com/bluss/either),
[equivalent](https://github.com/cuviper/equivalent),
@@ -505,6 +508,7 @@ The following text applies to code linked from these dependencies:
[iana-time-zone](https://github.com/strawlab/iana-time-zone),
[id-arena](https://github.com/fitzgen/id-arena),
[idna](https://github.com/servo/rust-url/),
+[idna_adapter](https://github.com/hsivonen/idna_adapter),
[indexmap](https://github.com/indexmap-rs/indexmap),
[io-lifetimes](https://github.com/sunfishcode/io-lifetimes),
[ipnet](https://github.com/krisprice/ipnet),
@@ -569,6 +573,7 @@ The following text applies to code linked from these dependencies:
[smallbitvec](https://github.com/servo/smallbitvec),
[smallvec](https://github.com/servo/rust-smallvec),
[socket2](https://github.com/rust-lang/socket2),
+[stable_deref_trait](https://github.com/storyyeller/stable_deref_trait),
[static_assertions](https://github.com/nvzqz/static-assertions-rs),
[syn](https://github.com/dtolnay/syn),
[tempfile](https://github.com/Stebalien/tempfile),
@@ -579,11 +584,12 @@ The following text applies to code linked from these dependencies:
[toml](https://github.com/alexcrichton/toml-rs),
[typenum](https://github.com/paholg/typenum),
[unicase](https://github.com/seanmonstar/unicase),
-[unicode-bidi](https://github.com/servo/unicode-bidi),
[unicode-ident](https://github.com/dtolnay/unicode-ident),
[unicode-normalization](https://github.com/unicode-rs/unicode-normalization),
[unicode-segmentation](https://github.com/unicode-rs/unicode-segmentation),
[url](https://github.com/servo/rust-url),
+[utf16_iter](https://github.com/hsivonen/utf16_iter),
+[utf8_iter](https://github.com/hsivonen/utf8_iter),
[uuid](https://github.com/uuid-rs/uuid),
[vcpkg](https://github.com/mcgoo/vcpkg-rs),
[version_check](https://github.com/SergioBenitez/version_check),
@@ -593,6 +599,7 @@ The following text applies to code linked from these dependencies:
[windows-targets](https://github.com/microsoft/windows-rs),
[windows_x86_64_gnu](https://github.com/microsoft/windows-rs),
[windows_x86_64_msvc](https://github.com/microsoft/windows-rs),
+[write16](https://github.com/hsivonen/write16),
[zerocopy](https://github.com/google/zerocopy)
```
@@ -1527,6 +1534,22 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
+```
+-------------
+## MIT License: synstructure
+
+The following text applies to code linked from these dependencies:
+[synstructure](https://github.com/mystor/synstructure)
+
+```
+Copyright 2016 Nika Layzell
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
```
-------------
## MIT License: textwrap
@@ -2176,6 +2199,79 @@ of the input file used when generating it. This code is not
standalone and requires a support library to be linked with it. This
support library is itself covered by the above license.
+```
+-------------
+## Unicode-3.0 License: icu_collections, icu_locid, icu_locid_transform, icu_locid_transform_data, icu_normalizer, icu_normalizer_data, icu_properties, icu_properties_data, icu_provider, icu_provider_macros, litemap, tinystr, writeable, yoke, yoke-derive, zerofrom, zerofrom-derive, zerovec, zerovec-derive
+
+The following text applies to code linked from these dependencies:
+[icu_collections](https://github.com/unicode-org/icu4x),
+[icu_locid](https://github.com/unicode-org/icu4x),
+[icu_locid_transform](https://github.com/unicode-org/icu4x),
+[icu_locid_transform_data](https://github.com/unicode-org/icu4x),
+[icu_normalizer](https://github.com/unicode-org/icu4x),
+[icu_normalizer_data](https://github.com/unicode-org/icu4x),
+[icu_properties](https://github.com/unicode-org/icu4x),
+[icu_properties_data](https://github.com/unicode-org/icu4x),
+[icu_provider](https://github.com/unicode-org/icu4x),
+[icu_provider_macros](https://github.com/unicode-org/icu4x),
+[litemap](https://github.com/unicode-org/icu4x),
+[tinystr](https://github.com/unicode-org/icu4x),
+[writeable](https://github.com/unicode-org/icu4x),
+[yoke-derive](https://github.com/unicode-org/icu4x),
+[yoke](https://github.com/unicode-org/icu4x),
+[zerofrom-derive](https://github.com/unicode-org/icu4x),
+[zerofrom](https://github.com/unicode-org/icu4x),
+[zerovec-derive](https://github.com/unicode-org/icu4x),
+[zerovec](https://github.com/unicode-org/icu4x)
+
+```
+UNICODE LICENSE V3
+
+COPYRIGHT AND PERMISSION NOTICE
+
+Copyright © 2020-2024 Unicode, Inc.
+
+NOTICE TO USER: Carefully read the following legal agreement. BY
+DOWNLOADING, INSTALLING, COPYING OR OTHERWISE USING DATA FILES, AND/OR
+SOFTWARE, YOU UNEQUIVOCALLY ACCEPT, AND AGREE TO BE BOUND BY, ALL OF THE
+TERMS AND CONDITIONS OF THIS AGREEMENT. IF YOU DO NOT AGREE, DO NOT
+DOWNLOAD, INSTALL, COPY, DISTRIBUTE OR USE THE DATA FILES OR SOFTWARE.
+
+Permission is hereby granted, free of charge, to any person obtaining a
+copy of data files and any associated documentation (the "Data Files") or
+software and any associated documentation (the "Software") to deal in the
+Data Files or Software without restriction, including without limitation
+the rights to use, copy, modify, merge, publish, distribute, and/or sell
+copies of the Data Files or Software, and to permit persons to whom the
+Data Files or Software are furnished to do so, provided that either (a)
+this copyright and permission notice appear with all copies of the Data
+Files or Software, or (b) this copyright and permission notice appear in
+associated Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY
+KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF
+THIRD PARTY RIGHTS.
+
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS NOTICE
+BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL DAMAGES,
+OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
+WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
+ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THE DATA
+FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder shall
+not be used in advertising or otherwise to promote the sale, use or other
+dealings in these Data Files or Software without prior written
+authorization of the copyright holder.
+
+SPDX-License-Identifier: Unicode-3.0
+
+—
+
+Portions of ICU4X may have been adapted from ICU4C and/or ICU4J.
+ICU 1.8.1 to ICU 57.1 © 1995-2016 International Business Machines Corporation and others.
+
```
-------------
## OpenSSL License
diff --git a/components/places/Cargo.toml b/components/places/Cargo.toml
index b57428c453..3d1d1d15f5 100644
--- a/components/places/Cargo.toml
+++ b/components/places/Cargo.toml
@@ -26,7 +26,7 @@ rusqlite = { workspace = true, features = ["functions", "window", "bundled", "un
sql-support = { path = "../support/sql" }
types = { path = "../support/types" }
bitflags = "1.2"
-idna = "0.5"
+idna = "1.0.3"
memchr = "2.3"
dogear = "0.5"
interrupt-support = { path = "../support/interrupt" }
diff --git a/components/remote_settings/Cargo.toml b/components/remote_settings/Cargo.toml
index 46180554f0..e441447e39 100644
--- a/components/remote_settings/Cargo.toml
+++ b/components/remote_settings/Cargo.toml
@@ -23,7 +23,7 @@ serde_json = "1"
parking_lot = "0.12"
error-support = { path = "../support/error" }
viaduct = { path = "../viaduct" }
-url = "2.1" # mozilla-central can't yet take 2.2 (see bug 1734538)
+url = "2"
camino = "1.0"
rusqlite = { workspace = true, features = ["bundled"] }
jexl-eval = { version = "0.3.0", optional = true }
diff --git a/components/sync15/Cargo.toml b/components/sync15/Cargo.toml
index f38ca45d0f..143d541474 100644
--- a/components/sync15/Cargo.toml
+++ b/components/sync15/Cargo.toml
@@ -61,7 +61,7 @@ serde_path_to_error = "0.1"
sync-guid = { path = "../support/guid", features = ["random"] }
thiserror = "1.0"
uniffi = { workspace = true }
-url = { version = "2.1", optional = true } # mozilla-central can't yet take 2.2 (see bug 1734538)
+url = { version = "2", optional = true }
viaduct = { path = "../viaduct", optional = true }
[dev-dependencies]
diff --git a/components/tabs/Cargo.toml b/components/tabs/Cargo.toml
index 8384d7cb12..a590e581d2 100644
--- a/components/tabs/Cargo.toml
+++ b/components/tabs/Cargo.toml
@@ -22,7 +22,7 @@ sync-guid = { path = "../support/guid", features = ["random"] }
sync15 = { path = "../sync15", features = ["sync-engine"] }
thiserror = "1.0"
uniffi = { workspace = true }
-url = "2.1" # mozilla-central can't yet take 2.2 (see bug 1734538)
+url = "2"
types = { path = "../support/types" }
[dev-dependencies]
diff --git a/components/viaduct/Cargo.toml b/components/viaduct/Cargo.toml
index a922be7249..49665762e5 100644
--- a/components/viaduct/Cargo.toml
+++ b/components/viaduct/Cargo.toml
@@ -10,7 +10,7 @@ exclude = ["/android", "/ios"]
crate-type = ["lib"]
[dependencies]
-url = "2.1" # mozilla-central can't yet take 2.2 (see bug 1734538)
+url = "2"
log = "0.4"
serde = "1"
serde_json = "1"
diff --git a/megazords/full/DEPENDENCIES.md b/megazords/full/DEPENDENCIES.md
index c145b13069..eec54dadc6 100644
--- a/megazords/full/DEPENDENCIES.md
+++ b/megazords/full/DEPENDENCIES.md
@@ -22,12 +22,14 @@ the details of which are reproduced below.
* [MIT License: scroll](#mit-license-scroll)
* [MIT License: scroll_derive](#mit-license-scroll_derive)
* [MIT License: smawk](#mit-license-smawk)
+* [MIT License: synstructure](#mit-license-synstructure)
* [MIT License: textwrap](#mit-license-textwrap)
* [MIT License: weedle2](#mit-license-weedle2)
* [CC0-1.0 License: base16](#cc0-10-license-base16)
* [ISC License: ring](#isc-license-ring)
* [BSD-2-Clause License: arrayref](#bsd-2-clause-license-arrayref)
* [BSD-3-Clause License: protobuf](#bsd-3-clause-license-protobuf)
+* [Unicode-3.0 License: icu_collections, icu_locid, icu_locid_transform, icu_locid_transform_data, icu_normalizer, icu_normalizer_data, icu_properties, icu_properties_data, icu_provider, icu_provider_macros, litemap, tinystr, writeable, yoke, yoke-derive, zerofrom, zerofrom-derive, zerovec, zerovec-derive](#unicode-30-license-icu_collections-icu_locid-icu_locid_transform-icu_locid_transform_data-icu_normalizer-icu_normalizer_data-icu_properties-icu_properties_data-icu_provider-icu_provider_macros-litemap-tinystr-writeable-yoke-yoke-derive-zerofrom-zerofrom-derive-zerovec-zerovec-derive)
* [Optional Notice: SQLite](#optional-notice-sqlite)
-------------
## Mozilla Public License 2.0
@@ -450,6 +452,7 @@ The following text applies to code linked from these dependencies:
[cpufeatures](https://github.com/RustCrypto/utils),
[crypto-common](https://github.com/RustCrypto/traits),
[digest](https://github.com/RustCrypto/traits),
+[displaydoc](https://github.com/yaahc/displaydoc),
[dogear](https://github.com/mozilla/dogear),
[either](https://github.com/bluss/either),
[errno](https://github.com/lambda-fairy/rust-errno),
@@ -468,6 +471,7 @@ The following text applies to code linked from these dependencies:
[iana-time-zone](https://github.com/strawlab/iana-time-zone),
[id-arena](https://github.com/fitzgen/id-arena),
[idna](https://github.com/servo/rust-url/),
+[idna_adapter](https://github.com/hsivonen/idna_adapter),
[io-lifetimes](https://github.com/sunfishcode/io-lifetimes),
[itertools](https://github.com/rust-itertools/itertools),
[itoa](https://github.com/dtolnay/itoa),
@@ -512,6 +516,7 @@ The following text applies to code linked from these dependencies:
[siphasher](https://github.com/jedisct1/rust-siphash),
[smallbitvec](https://github.com/servo/smallbitvec),
[smallvec](https://github.com/servo/rust-smallvec),
+[stable_deref_trait](https://github.com/storyyeller/stable_deref_trait),
[static_assertions](https://github.com/nvzqz/static-assertions-rs),
[syn](https://github.com/dtolnay/syn),
[tempfile](https://github.com/Stebalien/tempfile),
@@ -522,11 +527,12 @@ The following text applies to code linked from these dependencies:
[toml](https://github.com/alexcrichton/toml-rs),
[typenum](https://github.com/paholg/typenum),
[unicase](https://github.com/seanmonstar/unicase),
-[unicode-bidi](https://github.com/servo/unicode-bidi),
[unicode-ident](https://github.com/dtolnay/unicode-ident),
[unicode-normalization](https://github.com/unicode-rs/unicode-normalization),
[unicode-segmentation](https://github.com/unicode-rs/unicode-segmentation),
[url](https://github.com/servo/rust-url),
+[utf16_iter](https://github.com/hsivonen/utf16_iter),
+[utf8_iter](https://github.com/hsivonen/utf8_iter),
[uuid](https://github.com/uuid-rs/uuid),
[vcpkg](https://github.com/mcgoo/vcpkg-rs),
[version_check](https://github.com/SergioBenitez/version_check),
@@ -534,6 +540,7 @@ The following text applies to code linked from these dependencies:
[windows-targets](https://github.com/microsoft/windows-rs),
[windows_x86_64_gnu](https://github.com/microsoft/windows-rs),
[windows_x86_64_msvc](https://github.com/microsoft/windows-rs),
+[write16](https://github.com/hsivonen/write16),
[zerocopy](https://github.com/google/zerocopy)
```
@@ -1229,6 +1236,22 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
+```
+-------------
+## MIT License: synstructure
+
+The following text applies to code linked from these dependencies:
+[synstructure](https://github.com/mystor/synstructure)
+
+```
+Copyright 2016 Nika Layzell
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
```
-------------
## MIT License: textwrap
@@ -1594,6 +1617,79 @@ of the input file used when generating it. This code is not
standalone and requires a support library to be linked with it. This
support library is itself covered by the above license.
+```
+-------------
+## Unicode-3.0 License: icu_collections, icu_locid, icu_locid_transform, icu_locid_transform_data, icu_normalizer, icu_normalizer_data, icu_properties, icu_properties_data, icu_provider, icu_provider_macros, litemap, tinystr, writeable, yoke, yoke-derive, zerofrom, zerofrom-derive, zerovec, zerovec-derive
+
+The following text applies to code linked from these dependencies:
+[icu_collections](https://github.com/unicode-org/icu4x),
+[icu_locid](https://github.com/unicode-org/icu4x),
+[icu_locid_transform](https://github.com/unicode-org/icu4x),
+[icu_locid_transform_data](https://github.com/unicode-org/icu4x),
+[icu_normalizer](https://github.com/unicode-org/icu4x),
+[icu_normalizer_data](https://github.com/unicode-org/icu4x),
+[icu_properties](https://github.com/unicode-org/icu4x),
+[icu_properties_data](https://github.com/unicode-org/icu4x),
+[icu_provider](https://github.com/unicode-org/icu4x),
+[icu_provider_macros](https://github.com/unicode-org/icu4x),
+[litemap](https://github.com/unicode-org/icu4x),
+[tinystr](https://github.com/unicode-org/icu4x),
+[writeable](https://github.com/unicode-org/icu4x),
+[yoke-derive](https://github.com/unicode-org/icu4x),
+[yoke](https://github.com/unicode-org/icu4x),
+[zerofrom-derive](https://github.com/unicode-org/icu4x),
+[zerofrom](https://github.com/unicode-org/icu4x),
+[zerovec-derive](https://github.com/unicode-org/icu4x),
+[zerovec](https://github.com/unicode-org/icu4x)
+
+```
+UNICODE LICENSE V3
+
+COPYRIGHT AND PERMISSION NOTICE
+
+Copyright © 2020-2024 Unicode, Inc.
+
+NOTICE TO USER: Carefully read the following legal agreement. BY
+DOWNLOADING, INSTALLING, COPYING OR OTHERWISE USING DATA FILES, AND/OR
+SOFTWARE, YOU UNEQUIVOCALLY ACCEPT, AND AGREE TO BE BOUND BY, ALL OF THE
+TERMS AND CONDITIONS OF THIS AGREEMENT. IF YOU DO NOT AGREE, DO NOT
+DOWNLOAD, INSTALL, COPY, DISTRIBUTE OR USE THE DATA FILES OR SOFTWARE.
+
+Permission is hereby granted, free of charge, to any person obtaining a
+copy of data files and any associated documentation (the "Data Files") or
+software and any associated documentation (the "Software") to deal in the
+Data Files or Software without restriction, including without limitation
+the rights to use, copy, modify, merge, publish, distribute, and/or sell
+copies of the Data Files or Software, and to permit persons to whom the
+Data Files or Software are furnished to do so, provided that either (a)
+this copyright and permission notice appear with all copies of the Data
+Files or Software, or (b) this copyright and permission notice appear in
+associated Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY
+KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF
+THIRD PARTY RIGHTS.
+
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS NOTICE
+BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL DAMAGES,
+OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
+WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
+ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THE DATA
+FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder shall
+not be used in advertising or otherwise to promote the sale, use or other
+dealings in these Data Files or Software without prior written
+authorization of the copyright holder.
+
+SPDX-License-Identifier: Unicode-3.0
+
+—
+
+Portions of ICU4X may have been adapted from ICU4C and/or ICU4J.
+ICU 1.8.1 to ICU 57.1 © 1995-2016 International Business Machines Corporation and others.
+
```
-------------
## Optional Notice: SQLite
diff --git a/megazords/full/android/dependency-licenses.xml b/megazords/full/android/dependency-licenses.xml
index 436879297a..b7310ea639 100644
--- a/megazords/full/android/dependency-licenses.xml
+++ b/megazords/full/android/dependency-licenses.xml
@@ -148,6 +148,10 @@ the details of which are reproduced below.
Apache License 2.0: digest
https://github.com/RustCrypto/traits/blob/master/digest/LICENSE-APACHE
+
+ Apache License 2.0: displaydoc
+ https://github.com/yaahc/displaydoc/blob/master/LICENSE-APACHE
+
Apache License 2.0: dogear
https://github.com/mozilla/dogear/blob/master/LICENSE
@@ -220,6 +224,10 @@ the details of which are reproduced below.
Apache License 2.0: idna
https://github.com/servo/rust-url/blob//main/LICENSE-APACHE
+
+ Apache License 2.0: idna_adapter
+ https://github.com/hsivonen/idna_adapter/blob/main/LICENSE-APACHE
+
Apache License 2.0: io-lifetimes
https://github.com/sunfishcode/io-lifetimes/blob/main/LICENSE-APACHE
@@ -396,6 +404,10 @@ the details of which are reproduced below.
Apache License 2.0: smallvec
https://github.com/servo/rust-smallvec/blob/master/LICENSE-APACHE
+
+ Apache License 2.0: stable_deref_trait
+ https://github.com/storyyeller/stable_deref_trait/blob/master/LICENSE-APACHE
+
Apache License 2.0: static_assertions
https://github.com/nvzqz/static-assertions-rs/blob/master/LICENSE-APACHE
@@ -436,10 +448,6 @@ the details of which are reproduced below.
Apache License 2.0: unicase
https://github.com/seanmonstar/unicase/blob/master/LICENSE-APACHE
-
- Apache License 2.0: unicode-bidi
- https://github.com/servo/unicode-bidi/blob/main/LICENSE-APACHE
-
Apache License 2.0: unicode-ident
https://github.com/dtolnay/unicode-ident/blob/master/LICENSE-APACHE
@@ -456,6 +464,14 @@ the details of which are reproduced below.
Apache License 2.0: url
https://github.com/servo/rust-url/blob/main/LICENSE-APACHE
+
+ Apache License 2.0: utf16_iter
+ https://github.com/hsivonen/utf16_iter/blob/main/LICENSE-APACHE
+
+
+ Apache License 2.0: utf8_iter
+ https://github.com/hsivonen/utf8_iter/blob/main/LICENSE-APACHE
+
Apache License 2.0: uuid
https://github.com/uuid-rs/uuid/blob/main/LICENSE-APACHE
@@ -484,6 +500,10 @@ the details of which are reproduced below.
Apache License 2.0: windows_x86_64_msvc
https://github.com/microsoft/windows-rs/blob/master/license-mit
+
+ Apache License 2.0: write16
+ https://github.com/hsivonen/write16/blob/main/LICENSE-APACHE
+
Apache License 2.0: zerocopy
https://github.com/google/zerocopy/blob/main/LICENSE-APACHE
@@ -568,6 +588,10 @@ the details of which are reproduced below.
MIT License: smawk
https://github.com/mgeisler/smawk/blob/master/LICENSE
+
+ MIT License: synstructure
+ https://github.com/mystor/synstructure/blob/main/LICENSE
+
MIT License: textwrap
https://github.com/mgeisler/textwrap/blob/master/LICENSE
@@ -592,6 +616,82 @@ the details of which are reproduced below.
BSD-3-Clause License: protobuf
https://github.com/protocolbuffers/protobuf/blob/master/LICENSE
+
+ Unicode-3.0 License: icu_collections
+ https://github.com/unicode-org/icu4x/blob/main/LICENSE
+
+
+ Unicode-3.0 License: icu_locid
+ https://github.com/unicode-org/icu4x/blob/main/LICENSE
+
+
+ Unicode-3.0 License: icu_locid_transform
+ https://github.com/unicode-org/icu4x/blob/main/LICENSE
+
+
+ Unicode-3.0 License: icu_locid_transform_data
+ https://github.com/unicode-org/icu4x/blob/main/LICENSE
+
+
+ Unicode-3.0 License: icu_normalizer
+ https://github.com/unicode-org/icu4x/blob/main/LICENSE
+
+
+ Unicode-3.0 License: icu_normalizer_data
+ https://github.com/unicode-org/icu4x/blob/main/LICENSE
+
+
+ Unicode-3.0 License: icu_properties
+ https://github.com/unicode-org/icu4x/blob/main/LICENSE
+
+
+ Unicode-3.0 License: icu_properties_data
+ https://github.com/unicode-org/icu4x/blob/main/LICENSE
+
+
+ Unicode-3.0 License: icu_provider
+ https://github.com/unicode-org/icu4x/blob/main/LICENSE
+
+
+ Unicode-3.0 License: icu_provider_macros
+ https://github.com/unicode-org/icu4x/blob/main/LICENSE
+
+
+ Unicode-3.0 License: litemap
+ https://github.com/unicode-org/icu4x/blob/main/LICENSE
+
+
+ Unicode-3.0 License: tinystr
+ https://github.com/unicode-org/icu4x/blob/main/LICENSE
+
+
+ Unicode-3.0 License: writeable
+ https://github.com/unicode-org/icu4x/blob/main/LICENSE
+
+
+ Unicode-3.0 License: yoke
+ https://github.com/unicode-org/icu4x/blob/main/LICENSE
+
+
+ Unicode-3.0 License: yoke-derive
+ https://github.com/unicode-org/icu4x/blob/main/LICENSE
+
+
+ Unicode-3.0 License: zerofrom
+ https://github.com/unicode-org/icu4x/blob/main/LICENSE
+
+
+ Unicode-3.0 License: zerofrom-derive
+ https://github.com/unicode-org/icu4x/blob/main/LICENSE
+
+
+ Unicode-3.0 License: zerovec
+ https://github.com/unicode-org/icu4x/blob/main/LICENSE
+
+
+ Unicode-3.0 License: zerovec-derive
+ https://github.com/unicode-org/icu4x/blob/main/LICENSE
+
Optional Notice: SQLite
https://sqlite.org/copyright.html
diff --git a/megazords/ios-rust/DEPENDENCIES.md b/megazords/ios-rust/DEPENDENCIES.md
index d79fdce07d..c8b92d4bc4 100644
--- a/megazords/ios-rust/DEPENDENCIES.md
+++ b/megazords/ios-rust/DEPENDENCIES.md
@@ -28,6 +28,7 @@ the details of which are reproduced below.
* [MIT License: scroll_derive](#mit-license-scroll_derive)
* [MIT License: slab](#mit-license-slab)
* [MIT License: smawk](#mit-license-smawk)
+* [MIT License: synstructure](#mit-license-synstructure)
* [MIT License: textwrap](#mit-license-textwrap)
* [MIT License: tokio](#mit-license-tokio)
* [MIT License: tokio-native-tls, tracing, tracing-core](#mit-license-tokio-native-tls-tracing-tracing-core)
@@ -41,6 +42,7 @@ the details of which are reproduced below.
* [ISC License: ring](#isc-license-ring)
* [BSD-2-Clause License: arrayref](#bsd-2-clause-license-arrayref)
* [BSD-3-Clause License: bindgen](#bsd-3-clause-license-bindgen)
+* [Unicode-3.0 License: icu_collections, icu_locid, icu_locid_transform, icu_locid_transform_data, icu_normalizer, icu_normalizer_data, icu_properties, icu_properties_data, icu_provider, icu_provider_macros, litemap, tinystr, writeable, yoke, yoke-derive, zerofrom, zerofrom-derive, zerovec, zerovec-derive](#unicode-30-license-icu_collections-icu_locid-icu_locid_transform-icu_locid_transform_data-icu_normalizer-icu_normalizer_data-icu_properties-icu_properties_data-icu_provider-icu_provider_macros-litemap-tinystr-writeable-yoke-yoke-derive-zerofrom-zerofrom-derive-zerovec-zerovec-derive)
* [Optional Notice: SQLite](#optional-notice-sqlite)
* [(Apache-2.0 OR MIT) AND BSD-3-Clause License: encoding_rs](#(apache-20-or-mit)-and-bsd-3-clause-license-encoding_rs)
-------------
@@ -466,6 +468,7 @@ The following text applies to code linked from these dependencies:
[cpufeatures](https://github.com/RustCrypto/utils),
[crypto-common](https://github.com/RustCrypto/traits),
[digest](https://github.com/RustCrypto/traits),
+[displaydoc](https://github.com/yaahc/displaydoc),
[dogear](https://github.com/mozilla/dogear),
[either](https://github.com/bluss/either),
[equivalent](https://github.com/cuviper/equivalent),
@@ -496,6 +499,7 @@ The following text applies to code linked from these dependencies:
[iana-time-zone](https://github.com/strawlab/iana-time-zone),
[id-arena](https://github.com/fitzgen/id-arena),
[idna](https://github.com/servo/rust-url/),
+[idna_adapter](https://github.com/hsivonen/idna_adapter),
[indexmap](https://github.com/indexmap-rs/indexmap),
[io-lifetimes](https://github.com/sunfishcode/io-lifetimes),
[ipnet](https://github.com/krisprice/ipnet),
@@ -554,6 +558,7 @@ The following text applies to code linked from these dependencies:
[smallbitvec](https://github.com/servo/smallbitvec),
[smallvec](https://github.com/servo/rust-smallvec),
[socket2](https://github.com/rust-lang/socket2),
+[stable_deref_trait](https://github.com/storyyeller/stable_deref_trait),
[static_assertions](https://github.com/nvzqz/static-assertions-rs),
[syn](https://github.com/dtolnay/syn),
[tempfile](https://github.com/Stebalien/tempfile),
@@ -564,14 +569,16 @@ The following text applies to code linked from these dependencies:
[toml](https://github.com/alexcrichton/toml-rs),
[typenum](https://github.com/paholg/typenum),
[unicase](https://github.com/seanmonstar/unicase),
-[unicode-bidi](https://github.com/servo/unicode-bidi),
[unicode-ident](https://github.com/dtolnay/unicode-ident),
[unicode-normalization](https://github.com/unicode-rs/unicode-normalization),
[unicode-segmentation](https://github.com/unicode-rs/unicode-segmentation),
[url](https://github.com/servo/rust-url),
+[utf16_iter](https://github.com/hsivonen/utf16_iter),
+[utf8_iter](https://github.com/hsivonen/utf8_iter),
[uuid](https://github.com/uuid-rs/uuid),
[vcpkg](https://github.com/mcgoo/vcpkg-rs),
[version_check](https://github.com/SergioBenitez/version_check),
+[write16](https://github.com/hsivonen/write16),
[zerocopy](https://github.com/google/zerocopy)
```
@@ -1456,6 +1463,22 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
+```
+-------------
+## MIT License: synstructure
+
+The following text applies to code linked from these dependencies:
+[synstructure](https://github.com/mystor/synstructure)
+
+```
+Copyright 2016 Nika Layzell
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
```
-------------
## MIT License: textwrap
@@ -2036,6 +2059,79 @@ CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+```
+-------------
+## Unicode-3.0 License: icu_collections, icu_locid, icu_locid_transform, icu_locid_transform_data, icu_normalizer, icu_normalizer_data, icu_properties, icu_properties_data, icu_provider, icu_provider_macros, litemap, tinystr, writeable, yoke, yoke-derive, zerofrom, zerofrom-derive, zerovec, zerovec-derive
+
+The following text applies to code linked from these dependencies:
+[icu_collections](https://github.com/unicode-org/icu4x),
+[icu_locid](https://github.com/unicode-org/icu4x),
+[icu_locid_transform](https://github.com/unicode-org/icu4x),
+[icu_locid_transform_data](https://github.com/unicode-org/icu4x),
+[icu_normalizer](https://github.com/unicode-org/icu4x),
+[icu_normalizer_data](https://github.com/unicode-org/icu4x),
+[icu_properties](https://github.com/unicode-org/icu4x),
+[icu_properties_data](https://github.com/unicode-org/icu4x),
+[icu_provider](https://github.com/unicode-org/icu4x),
+[icu_provider_macros](https://github.com/unicode-org/icu4x),
+[litemap](https://github.com/unicode-org/icu4x),
+[tinystr](https://github.com/unicode-org/icu4x),
+[writeable](https://github.com/unicode-org/icu4x),
+[yoke-derive](https://github.com/unicode-org/icu4x),
+[yoke](https://github.com/unicode-org/icu4x),
+[zerofrom-derive](https://github.com/unicode-org/icu4x),
+[zerofrom](https://github.com/unicode-org/icu4x),
+[zerovec-derive](https://github.com/unicode-org/icu4x),
+[zerovec](https://github.com/unicode-org/icu4x)
+
+```
+UNICODE LICENSE V3
+
+COPYRIGHT AND PERMISSION NOTICE
+
+Copyright © 2020-2024 Unicode, Inc.
+
+NOTICE TO USER: Carefully read the following legal agreement. BY
+DOWNLOADING, INSTALLING, COPYING OR OTHERWISE USING DATA FILES, AND/OR
+SOFTWARE, YOU UNEQUIVOCALLY ACCEPT, AND AGREE TO BE BOUND BY, ALL OF THE
+TERMS AND CONDITIONS OF THIS AGREEMENT. IF YOU DO NOT AGREE, DO NOT
+DOWNLOAD, INSTALL, COPY, DISTRIBUTE OR USE THE DATA FILES OR SOFTWARE.
+
+Permission is hereby granted, free of charge, to any person obtaining a
+copy of data files and any associated documentation (the "Data Files") or
+software and any associated documentation (the "Software") to deal in the
+Data Files or Software without restriction, including without limitation
+the rights to use, copy, modify, merge, publish, distribute, and/or sell
+copies of the Data Files or Software, and to permit persons to whom the
+Data Files or Software are furnished to do so, provided that either (a)
+this copyright and permission notice appear with all copies of the Data
+Files or Software, or (b) this copyright and permission notice appear in
+associated Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY
+KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF
+THIRD PARTY RIGHTS.
+
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS NOTICE
+BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL DAMAGES,
+OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
+WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
+ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THE DATA
+FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder shall
+not be used in advertising or otherwise to promote the sale, use or other
+dealings in these Data Files or Software without prior written
+authorization of the copyright holder.
+
+SPDX-License-Identifier: Unicode-3.0
+
+—
+
+Portions of ICU4X may have been adapted from ICU4C and/or ICU4J.
+ICU 1.8.1 to ICU 57.1 © 1995-2016 International Business Machines Corporation and others.
+
```
-------------
## Optional Notice: SQLite
diff --git a/megazords/ios-rust/focus/DEPENDENCIES.md b/megazords/ios-rust/focus/DEPENDENCIES.md
index 431c7926a7..edf98c7620 100644
--- a/megazords/ios-rust/focus/DEPENDENCIES.md
+++ b/megazords/ios-rust/focus/DEPENDENCIES.md
@@ -16,6 +16,7 @@ the details of which are reproduced below.
* [MIT License: h2](#mit-license-h2)
* [MIT License: http-body](#mit-license-http-body)
* [MIT License: hyper](#mit-license-hyper)
+* [MIT License: libsqlite3-sys, rusqlite](#mit-license-libsqlite3-sys-rusqlite)
* [MIT License: mime_guess](#mit-license-mime_guess)
* [MIT License: mio](#mit-license-mio)
* [MIT License: nom](#mit-license-nom)
@@ -24,6 +25,7 @@ the details of which are reproduced below.
* [MIT License: scroll_derive](#mit-license-scroll_derive)
* [MIT License: slab](#mit-license-slab)
* [MIT License: smawk](#mit-license-smawk)
+* [MIT License: synstructure](#mit-license-synstructure)
* [MIT License: textwrap](#mit-license-textwrap)
* [MIT License: tokio](#mit-license-tokio)
* [MIT License: tokio-native-tls, tracing, tracing-core](#mit-license-tokio-native-tls-tracing-tracing-core)
@@ -32,8 +34,9 @@ the details of which are reproduced below.
* [MIT License: try-lock](#mit-license-try-lock)
* [MIT License: want](#mit-license-want)
* [MIT License: weedle2](#mit-license-weedle2)
-* [MIT License: xshell-venv](#mit-license-xshell-venv)
* [BSD-2-Clause License: arrayref](#bsd-2-clause-license-arrayref)
+* [Unicode-3.0 License: icu_collections, icu_locid, icu_locid_transform, icu_locid_transform_data, icu_normalizer, icu_normalizer_data, icu_properties, icu_properties_data, icu_provider, icu_provider_macros, litemap, tinystr, writeable, yoke, yoke-derive, zerofrom, zerofrom-derive, zerovec, zerovec-derive](#unicode-30-license-icu_collections-icu_locid-icu_locid_transform-icu_locid_transform_data-icu_normalizer-icu_normalizer_data-icu_properties-icu_properties_data-icu_provider-icu_provider_macros-litemap-tinystr-writeable-yoke-yoke-derive-zerofrom-zerofrom-derive-zerovec-zerovec-derive)
+* [Optional Notice: SQLite](#optional-notice-sqlite)
* [(Apache-2.0 OR MIT) AND BSD-3-Clause License: encoding_rs](#(apache-20-or-mit)-and-bsd-3-clause-license-encoding_rs)
-------------
## Mozilla Public License 2.0
@@ -431,6 +434,7 @@ Exhibit B - "Incompatible With Secondary Licenses" Notice
## Apache License 2.0
The following text applies to code linked from these dependencies:
+[ahash](https://github.com/tkaitchuck/ahash),
[anyhow](https://github.com/dtolnay/anyhow),
[askama](https://github.com/djc/askama),
[askama_derive](https://github.com/djc/askama),
@@ -442,6 +446,7 @@ The following text applies to code linked from these dependencies:
[block-buffer](https://github.com/RustCrypto/utils),
[camino](https://github.com/camino-rs/camino),
[cargo-platform](https://github.com/rust-lang/cargo),
+[cc](https://github.com/rust-lang/cc-rs),
[cfg-if](https://github.com/alexcrichton/cfg-if),
[chrono](https://github.com/chronotope/chrono),
[core-foundation-sys](https://github.com/servo/core-foundation-rs),
@@ -449,9 +454,12 @@ The following text applies to code linked from these dependencies:
[cpufeatures](https://github.com/RustCrypto/utils),
[crypto-common](https://github.com/RustCrypto/traits),
[digest](https://github.com/RustCrypto/traits),
+[displaydoc](https://github.com/yaahc/displaydoc),
[either](https://github.com/bluss/either),
[equivalent](https://github.com/cuviper/equivalent),
[errno](https://github.com/lambda-fairy/rust-errno),
+[fallible-iterator](https://github.com/sfackler/rust-fallible-iterator),
+[fallible-streaming-iterator](https://github.com/sfackler/fallible-streaming-iterator),
[fastrand](https://github.com/smol-rs/fastrand),
[ffi-support](https://github.com/mozilla/ffi-support),
[fnv](https://github.com/servo/rust-fnv),
@@ -466,6 +474,7 @@ The following text applies to code linked from these dependencies:
[getrandom](https://github.com/rust-random/getrandom),
[glob](https://github.com/rust-lang/glob),
[hashbrown](https://github.com/rust-lang/hashbrown),
+[hashlink](https://github.com/kyren/hashlink),
[heck](https://github.com/withoutboats/heck),
[hex](https://github.com/KokaKiwi/rust-hex),
[http](https://github.com/hyperium/http),
@@ -475,6 +484,7 @@ The following text applies to code linked from these dependencies:
[iana-time-zone](https://github.com/strawlab/iana-time-zone),
[id-arena](https://github.com/fitzgen/id-arena),
[idna](https://github.com/servo/rust-url/),
+[idna_adapter](https://github.com/hsivonen/idna_adapter),
[indexmap](https://github.com/indexmap-rs/indexmap),
[io-lifetimes](https://github.com/sunfishcode/io-lifetimes),
[ipnet](https://github.com/krisprice/ipnet),
@@ -497,6 +507,7 @@ The following text applies to code linked from these dependencies:
[percent-encoding](https://github.com/servo/rust-url/),
[pin-project-lite](https://github.com/taiki-e/pin-project-lite),
[pin-utils](https://github.com/rust-lang-nursery/pin-utils),
+[pkg-config](https://github.com/rust-lang/pkg-config-rs),
[plain](https://github.com/randomites/plain),
[proc-macro2](https://github.com/dtolnay/proc-macro2),
[prost-derive](https://github.com/tokio-rs/prost),
@@ -521,25 +532,25 @@ The following text applies to code linked from these dependencies:
[siphasher](https://github.com/jedisct1/rust-siphash),
[smallvec](https://github.com/servo/rust-smallvec),
[socket2](https://github.com/rust-lang/socket2),
+[stable_deref_trait](https://github.com/storyyeller/stable_deref_trait),
[static_assertions](https://github.com/nvzqz/static-assertions-rs),
[syn](https://github.com/dtolnay/syn),
[tempfile](https://github.com/Stebalien/tempfile),
[thiserror-impl](https://github.com/dtolnay/thiserror),
[thiserror](https://github.com/dtolnay/thiserror),
-[tinyvec](https://github.com/Lokathor/tinyvec),
-[tinyvec_macros](https://github.com/Soveu/tinyvec_macros),
[toml](https://github.com/alexcrichton/toml-rs),
[typenum](https://github.com/paholg/typenum),
[unicase](https://github.com/seanmonstar/unicase),
-[unicode-bidi](https://github.com/servo/unicode-bidi),
[unicode-ident](https://github.com/dtolnay/unicode-ident),
-[unicode-normalization](https://github.com/unicode-rs/unicode-normalization),
[unicode-segmentation](https://github.com/unicode-rs/unicode-segmentation),
[url](https://github.com/servo/rust-url),
+[utf16_iter](https://github.com/hsivonen/utf16_iter),
+[utf8_iter](https://github.com/hsivonen/utf8_iter),
[uuid](https://github.com/uuid-rs/uuid),
+[vcpkg](https://github.com/mcgoo/vcpkg-rs),
[version_check](https://github.com/SergioBenitez/version_check),
-[xshell-macros](https://github.com/matklad/xshell),
-[xshell](https://github.com/matklad/xshell)
+[write16](https://github.com/hsivonen/write16),
+[zerocopy](https://github.com/google/zerocopy)
```
Apache License
@@ -1058,6 +1069,35 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
+```
+-------------
+## MIT License: libsqlite3-sys, rusqlite
+
+The following text applies to code linked from these dependencies:
+[libsqlite3-sys](https://github.com/rusqlite/rusqlite),
+[rusqlite](https://github.com/rusqlite/rusqlite)
+
+```
+Copyright (c) 2014-2021 The rusqlite developers
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+
```
-------------
## MIT License: mime_guess
@@ -1304,6 +1344,22 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
+```
+-------------
+## MIT License: synstructure
+
+The following text applies to code linked from these dependencies:
+[synstructure](https://github.com/mystor/synstructure)
+
+```
+Copyright 2016 Nika Layzell
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
```
-------------
## MIT License: textwrap
@@ -1556,36 +1612,6 @@ THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABI
CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
DEALINGS IN THE SOFTWARE.
-```
--------------
-## MIT License: xshell-venv
-
-The following text applies to code linked from these dependencies:
-[xshell-venv](https://github.com/badboy/xshell-venv)
-
-```
-The MIT License (MIT)
-
-Copyright (c) 2022 Jan-Erik Rediger
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-
```
-------------
## BSD-2-Clause License: arrayref
@@ -1621,6 +1647,88 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+```
+-------------
+## Unicode-3.0 License: icu_collections, icu_locid, icu_locid_transform, icu_locid_transform_data, icu_normalizer, icu_normalizer_data, icu_properties, icu_properties_data, icu_provider, icu_provider_macros, litemap, tinystr, writeable, yoke, yoke-derive, zerofrom, zerofrom-derive, zerovec, zerovec-derive
+
+The following text applies to code linked from these dependencies:
+[icu_collections](https://github.com/unicode-org/icu4x),
+[icu_locid](https://github.com/unicode-org/icu4x),
+[icu_locid_transform](https://github.com/unicode-org/icu4x),
+[icu_locid_transform_data](https://github.com/unicode-org/icu4x),
+[icu_normalizer](https://github.com/unicode-org/icu4x),
+[icu_normalizer_data](https://github.com/unicode-org/icu4x),
+[icu_properties](https://github.com/unicode-org/icu4x),
+[icu_properties_data](https://github.com/unicode-org/icu4x),
+[icu_provider](https://github.com/unicode-org/icu4x),
+[icu_provider_macros](https://github.com/unicode-org/icu4x),
+[litemap](https://github.com/unicode-org/icu4x),
+[tinystr](https://github.com/unicode-org/icu4x),
+[writeable](https://github.com/unicode-org/icu4x),
+[yoke-derive](https://github.com/unicode-org/icu4x),
+[yoke](https://github.com/unicode-org/icu4x),
+[zerofrom-derive](https://github.com/unicode-org/icu4x),
+[zerofrom](https://github.com/unicode-org/icu4x),
+[zerovec-derive](https://github.com/unicode-org/icu4x),
+[zerovec](https://github.com/unicode-org/icu4x)
+
+```
+UNICODE LICENSE V3
+
+COPYRIGHT AND PERMISSION NOTICE
+
+Copyright © 2020-2024 Unicode, Inc.
+
+NOTICE TO USER: Carefully read the following legal agreement. BY
+DOWNLOADING, INSTALLING, COPYING OR OTHERWISE USING DATA FILES, AND/OR
+SOFTWARE, YOU UNEQUIVOCALLY ACCEPT, AND AGREE TO BE BOUND BY, ALL OF THE
+TERMS AND CONDITIONS OF THIS AGREEMENT. IF YOU DO NOT AGREE, DO NOT
+DOWNLOAD, INSTALL, COPY, DISTRIBUTE OR USE THE DATA FILES OR SOFTWARE.
+
+Permission is hereby granted, free of charge, to any person obtaining a
+copy of data files and any associated documentation (the "Data Files") or
+software and any associated documentation (the "Software") to deal in the
+Data Files or Software without restriction, including without limitation
+the rights to use, copy, modify, merge, publish, distribute, and/or sell
+copies of the Data Files or Software, and to permit persons to whom the
+Data Files or Software are furnished to do so, provided that either (a)
+this copyright and permission notice appear with all copies of the Data
+Files or Software, or (b) this copyright and permission notice appear in
+associated Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY
+KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF
+THIRD PARTY RIGHTS.
+
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS NOTICE
+BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL DAMAGES,
+OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
+WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
+ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THE DATA
+FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder shall
+not be used in advertising or otherwise to promote the sale, use or other
+dealings in these Data Files or Software without prior written
+authorization of the copyright holder.
+
+SPDX-License-Identifier: Unicode-3.0
+
+—
+
+Portions of ICU4X may have been adapted from ICU4C and/or ICU4J.
+ICU 1.8.1 to ICU 57.1 © 1995-2016 International Business Machines Corporation and others.
+
+```
+-------------
+## Optional Notice: SQLite
+
+The following text applies to code linked from these dependencies:
+[sqlite](https://www.sqlite.org/)
+
+```
+This software makes use of the 'SQLite' database engine, and we are very grateful to D. Richard Hipp and team for producing it.
```
-------------
## (Apache-2.0 OR MIT) AND BSD-3-Clause License: encoding_rs
diff --git a/tools/dependency_summary.py b/tools/dependency_summary.py
index 6ffe24f7a6..d8ecf416c5 100755
--- a/tools/dependency_summary.py
+++ b/tools/dependency_summary.py
@@ -79,6 +79,8 @@
"BSD-3-Clause",
# Zlib is permissive and compatible with MPL.
"Zlib",
+ # Unicode-3 is acceptable: https://bugzilla.mozilla.org/show_bug.cgi?id=1766221
+ "Unicode-3.0",
# Special one-off licenses for particular projects.
"EXT-OPENSSL",
"EXT-SQLITE",