From 4be7232b93f957ce585459ac122a7fc64b6125f8 Mon Sep 17 00:00:00 2001
From: Jarrett Ye <jarrett.ye@outlook.com>
Date: Tue, 10 Dec 2024 14:52:23 +0800
Subject: [PATCH 1/2] Update to FSRS-rs v1.4.4 (clipping post-lapse stability)
---
Cargo.lock | 6 +++---
Cargo.toml | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/Cargo.lock b/Cargo.lock
index e9134352c9a..8402e213073 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1860,9 +1860,9 @@ dependencies = [
[[package]]
name = "fsrs"
-version = "1.4.3"
+version = "1.4.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "de570dbbc7b95c5cf5f77c905b3b54b16352c1b48694e6761d716fb92b8db67c"
+checksum = "2352e84a9389aceafb768b79cb53ad2e86cebf68ddd5391f136209fe6ad32d6c"
dependencies = [
"burn",
"itertools 0.12.1",
@@ -3106,7 +3106,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4979f22fdb869068da03c9f7528f8297c6fd2606bc3a4affe42e6a823fdb8da4"
dependencies = [
"cfg-if",
- "windows-targets 0.48.5",
+ "windows-targets 0.52.6",
]
[[package]]
diff --git a/Cargo.toml b/Cargo.toml
index da39632a978..b656e59ebc8 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -35,7 +35,7 @@ git = "https://github.com/ankitects/linkcheck.git"
rev = "184b2ca50ed39ca43da13f0b830a463861adb9ca"
[workspace.dependencies.fsrs]
-version = "=1.4.3"
+version = "=1.4.4"
# git = "https://github.com/open-spaced-repetition/fsrs-rs.git"
# rev = "58ca25ed2bc4bb1dc376208bbcaed7f5a501b941"
# path = "../open-spaced-repetition/fsrs-rs"
From 03441abe185acc71e7b9055618dcd2c182a3daf1 Mon Sep 17 00:00:00 2001
From: Jarrett Ye <jarrett.ye@outlook.com>
Date: Tue, 10 Dec 2024 15:03:18 +0800
Subject: [PATCH 2/2] ./ninja fix:minilints
---
Cargo.lock | 200 +++++++++++++++++++++++++++++++++++++++++---
cargo/licenses.json | 177 ++++++++++++++++++++++++++++++++++++---
2 files changed, 353 insertions(+), 24 deletions(-)
diff --git a/Cargo.lock b/Cargo.lock
index 8402e213073..cf30f6f4c68 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2801,6 +2801,124 @@ dependencies = [
"cc",
]
+[[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.82",
+]
+
[[package]]
name = "id_tree"
version = "1.8.0"
@@ -2812,12 +2930,23 @@ dependencies = [
[[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]]
@@ -3190,6 +3319,12 @@ version = "0.4.14"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89"
+[[package]]
+name = "litemap"
+version = "0.7.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4ee93343901ab17bd981295f2cf0026d4ad018c7c31ba84549a4ddbb47a45104"
+
[[package]]
name = "lock_api"
version = "0.4.12"
@@ -5853,6 +5988,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9117f5d4db391c1cf6927e7bea3db74b9a1c1add8f7eda9ffd5364f40f57b82f"
dependencies = [
"displaydoc",
+ "zerovec",
]
[[package]]
@@ -6334,12 +6470,6 @@ dependencies = [
"version_check",
]
-[[package]]
-name = "unicode-bidi"
-version = "0.3.17"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5ab17db44d7388991a428b2ee655ce0c212e862eff1768a455c58f9aad6e7893"
-
[[package]]
name = "unicode-ident"
version = "1.0.13"
@@ -6411,9 +6541,9 @@ dependencies = [
[[package]]
name = "url"
-version = "2.5.2"
+version = "2.5.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "22784dbdf76fdde8af1aeda5622b546b422b6fc585325248a2bf9f5e41e94d6c"
+checksum = "32f8b686cadd1473f4bd0117a5d28d36b1ade384ea9b5069a1c40aefed7fda60"
dependencies = [
"form_urlencoded",
"idna",
@@ -6427,6 +6557,18 @@ version = "0.7.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "09cc8ee72d2a9becf2f2febe0205bbed8fc6615b7cb429ad062dc7b7ddd036a9"
+[[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.2"
@@ -7104,6 +7246,18 @@ dependencies = [
"url",
]
+[[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 = "xattr"
version = "1.3.1"
@@ -7222,6 +7376,28 @@ version = "1.8.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ced3678a2879b30306d323f4542626697a464a97c0a07c9aebf7ebca65cd4dde"
+[[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.82",
+]
+
[[package]]
name = "zip"
version = "0.6.6"
diff --git a/cargo/licenses.json b/cargo/licenses.json
index 619f5bb5c11..23a9e9ad2fb 100644
--- a/cargo/licenses.json
+++ b/cargo/licenses.json
@@ -1225,7 +1225,7 @@
},
{
"name": "fsrs",
- "version": "1.4.3",
+ "version": "1.4.4",
"authors": "Open Spaced Repetition",
"repository": "https://github.com/open-spaced-repetition/fsrs-rs",
"license": "BSD-3-Clause",
@@ -1808,6 +1808,96 @@
"license_file": null,
"description": "iana-time-zone support crate for Haiku OS"
},
+ {
+ "name": "icu_collections",
+ "version": "1.5.0",
+ "authors": "The ICU4X Project Developers",
+ "repository": "https://github.com/unicode-org/icu4x",
+ "license": "Unicode-3.0",
+ "license_file": null,
+ "description": "Collection of API for use in ICU libraries."
+ },
+ {
+ "name": "icu_locid",
+ "version": "1.5.0",
+ "authors": "The ICU4X Project Developers",
+ "repository": "https://github.com/unicode-org/icu4x",
+ "license": "Unicode-3.0",
+ "license_file": null,
+ "description": "API for managing Unicode Language and Locale Identifiers"
+ },
+ {
+ "name": "icu_locid_transform",
+ "version": "1.5.0",
+ "authors": "The ICU4X Project Developers",
+ "repository": "https://github.com/unicode-org/icu4x",
+ "license": "Unicode-3.0",
+ "license_file": null,
+ "description": "API for Unicode Language and Locale Identifiers canonicalization"
+ },
+ {
+ "name": "icu_locid_transform_data",
+ "version": "1.5.0",
+ "authors": "The ICU4X Project Developers",
+ "repository": "https://github.com/unicode-org/icu4x",
+ "license": "Unicode-3.0",
+ "license_file": null,
+ "description": "Data for the icu_locid_transform crate"
+ },
+ {
+ "name": "icu_normalizer",
+ "version": "1.5.0",
+ "authors": "The ICU4X Project Developers",
+ "repository": "https://github.com/unicode-org/icu4x",
+ "license": "Unicode-3.0",
+ "license_file": null,
+ "description": "API for normalizing text into Unicode Normalization Forms"
+ },
+ {
+ "name": "icu_normalizer_data",
+ "version": "1.5.0",
+ "authors": "The ICU4X Project Developers",
+ "repository": "https://github.com/unicode-org/icu4x",
+ "license": "Unicode-3.0",
+ "license_file": null,
+ "description": "Data for the icu_normalizer crate"
+ },
+ {
+ "name": "icu_properties",
+ "version": "1.5.1",
+ "authors": "The ICU4X Project Developers",
+ "repository": "https://github.com/unicode-org/icu4x",
+ "license": "Unicode-3.0",
+ "license_file": null,
+ "description": "Definitions for Unicode properties"
+ },
+ {
+ "name": "icu_properties_data",
+ "version": "1.5.0",
+ "authors": "The ICU4X Project Developers",
+ "repository": "https://github.com/unicode-org/icu4x",
+ "license": "Unicode-3.0",
+ "license_file": null,
+ "description": "Data for the icu_properties crate"
+ },
+ {
+ "name": "icu_provider",
+ "version": "1.5.0",
+ "authors": "The ICU4X Project Developers",
+ "repository": "https://github.com/unicode-org/icu4x",
+ "license": "Unicode-3.0",
+ "license_file": null,
+ "description": "Trait and struct definitions for the ICU data provider"
+ },
+ {
+ "name": "icu_provider_macros",
+ "version": "1.5.0",
+ "authors": "The ICU4X Project Developers",
+ "repository": "https://github.com/unicode-org/icu4x",
+ "license": "Unicode-3.0",
+ "license_file": null,
+ "description": "Proc macros for ICU data providers"
+ },
{
"name": "id_tree",
"version": "1.8.0",
@@ -1819,13 +1909,22 @@
},
{
"name": "idna",
- "version": "0.5.0",
+ "version": "1.0.3",
"authors": "The rust-url developers",
"repository": "https://github.com/servo/rust-url/",
"license": "Apache-2.0 OR MIT",
"license_file": null,
"description": "IDNA (Internationalizing Domain Names in Applications) and Punycode."
},
+ {
+ "name": "idna_adapter",
+ "version": "1.2.0",
+ "authors": "The rust-url developers",
+ "repository": "https://github.com/hsivonen/idna_adapter",
+ "license": "Apache-2.0 OR MIT",
+ "license_file": null,
+ "description": "Back end adapter for idna"
+ },
{
"name": "image",
"version": "0.24.9",
@@ -2051,6 +2150,15 @@
"license_file": null,
"description": "Generated bindings for Linux's userspace API"
},
+ {
+ "name": "litemap",
+ "version": "0.7.4",
+ "authors": "The ICU4X Project Developers",
+ "repository": "https://github.com/unicode-org/icu4x",
+ "license": "Unicode-3.0",
+ "license_file": null,
+ "description": "A key-value Map implementation based on a flat, sorted Vec."
+ },
{
"name": "lock_api",
"version": "0.4.12",
@@ -4157,15 +4265,6 @@
"license_file": null,
"description": "A case-insensitive wrapper around strings."
},
- {
- "name": "unicode-bidi",
- "version": "0.3.17",
- "authors": "The Servo Project Developers",
- "repository": "https://github.com/servo/unicode-bidi",
- "license": "Apache-2.0 OR MIT",
- "license_file": null,
- "description": "Implementation of the Unicode Bidirectional Algorithm"
- },
{
"name": "unicode-ident",
"version": "1.0.13",
@@ -4231,7 +4330,7 @@
},
{
"name": "url",
- "version": "2.5.2",
+ "version": "2.5.4",
"authors": "The rust-url developers",
"repository": "https://github.com/servo/rust-url",
"license": "Apache-2.0 OR MIT",
@@ -4247,6 +4346,24 @@
"license_file": null,
"description": "Incremental, zero-copy UTF-8 decoding with error handling"
},
+ {
+ "name": "utf16_iter",
+ "version": "1.0.5",
+ "authors": "Henri Sivonen <hsivonen@hsivonen.fi>",
+ "repository": "https://github.com/hsivonen/utf16_iter",
+ "license": "Apache-2.0 OR MIT",
+ "license_file": null,
+ "description": "Iterator by char over potentially-invalid UTF-16 in &[u16]"
+ },
+ {
+ "name": "utf8_iter",
+ "version": "1.0.4",
+ "authors": "Henri Sivonen <hsivonen@hsivonen.fi>",
+ "repository": "https://github.com/hsivonen/utf8_iter",
+ "license": "Apache-2.0 OR MIT",
+ "license_file": null,
+ "description": "Iterator by char over potentially-invalid UTF-8 in &[u8]"
+ },
{
"name": "uuid",
"version": "1.11.0",
@@ -4787,6 +4904,24 @@
"license_file": null,
"description": "HTTP mocking to test Rust applications."
},
+ {
+ "name": "write16",
+ "version": "1.0.0",
+ "authors": null,
+ "repository": "https://github.com/hsivonen/write16",
+ "license": "Apache-2.0 OR MIT",
+ "license_file": null,
+ "description": "A UTF-16 analog of the Write trait"
+ },
+ {
+ "name": "writeable",
+ "version": "0.5.5",
+ "authors": "The ICU4X Project Developers",
+ "repository": "https://github.com/unicode-org/icu4x",
+ "license": "Unicode-3.0",
+ "license_file": null,
+ "description": "A more efficient alternative to fmt::Display"
+ },
{
"name": "xml-rs",
"version": "0.8.22",
@@ -4859,6 +4994,24 @@
"license_file": null,
"description": "Securely clear secrets from memory with a simple trait built on stable Rust primitives which guarantee memory is zeroed using an operation will not be 'optimized away' by the compiler. Uses a portable pure Rust implementation that works everywhere, even WASM!"
},
+ {
+ "name": "zerovec",
+ "version": "0.10.4",
+ "authors": "The ICU4X Project Developers",
+ "repository": "https://github.com/unicode-org/icu4x",
+ "license": "Unicode-3.0",
+ "license_file": null,
+ "description": "Zero-copy vector backed by a byte array"
+ },
+ {
+ "name": "zerovec-derive",
+ "version": "0.10.3",
+ "authors": "Manish Goregaokar <manishsmail@gmail.com>",
+ "repository": "https://github.com/unicode-org/icu4x",
+ "license": "Unicode-3.0",
+ "license_file": null,
+ "description": "Custom derive for the zerovec crate"
+ },
{
"name": "zip",
"version": "0.6.6",