Use icu crates instead of caseless/unicode_normalization in places (#7115)

I don't fully understand why we can't just `starts_with`, but I didn't
dig too deep and left the core logic alone.

Author: mhammond

Cargo.lock

@@ -11,7 +11,6 @@ the details of which are reproduced below.
 * [MIT License: bincode](#mit-license-bincode)
 * [MIT License: bytes](#mit-license-bytes)
 * [MIT License: cargo_metadata, winnow](#mit-license-cargo_metadata-winnow)
-* [MIT License: caseless](#mit-license-caseless)
 * [MIT License: core_maths](#mit-license-core_maths)
 * [MIT License: extend](#mit-license-extend)
 * [MIT License: generic-array](#mit-license-generic-array)
@@ -582,11 +581,8 @@ The following text applies to code linked from these dependencies:
 [thiserror-impl](https://github.com/dtolnay/thiserror),
 [thiserror](https://github.com/dtolnay/thiserror),
 [thread_local](https://github.com/Amanieu/thread_local-rs),
-[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),
-[unicode-normalization](https://github.com/unicode-rs/unicode-normalization),
 [url](https://github.com/servo/rust-url),
 [utf8_iter](https://github.com/hsivonen/utf8_iter),
 [uuid](https://github.com/uuid-rs/uuid),
@@ -963,37 +959,6 @@ 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: caseless
-
-The following text applies to code linked from these dependencies:
-[caseless](https://github.com/SimonSapin/rust-caseless)
-
-```
-Copyright (c) 2017 Simon Sapin
-
-MIT License
-
-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: core_maths

DEPENDENCIES.md

@@ -20,7 +20,7 @@ parking_lot = "0.12"
 lazy_static = "1.4"
 url = { version = "2.1", features = ["serde"] }
 percent-encoding = "2.1"
-caseless = "0.2"
+icu_casemap = "2"
 rusqlite = { version = "0.37.0", features = ["functions", "window", "bundled", "unlock_notify"] }
 sql-support = { path = "../support/sql" }
 types = { path = "../support/types" }

components/places/Cargo.toml

@@ -4,7 +4,7 @@
 
 use crate::util;
 use bitflags::bitflags;
-use caseless::Caseless;
+use icu_casemap::CaseMapperBorrowed;
 use rusqlite::{
     self,
     types::{FromSql, FromSqlError, FromSqlResult, ToSql, ToSqlOutput, ValueRef},
@@ -13,6 +13,8 @@ use std::borrow::Cow;
 
 const MAX_CHARS_TO_SEARCH_THROUGH: usize = 255;
 
+static CASE_MAPPER: CaseMapperBorrowed<'_> = CaseMapperBorrowed::new();
+
 #[derive(Clone, Copy, PartialEq, Eq, Debug)]
 #[repr(u32)]
 pub enum MatchBehavior {
@@ -225,8 +227,10 @@ fn string_match(token: &str, source: &str) -> bool {
     if source.len() < token.len() {
         return false;
     }
-    let mut ti = token.chars().default_case_fold();
-    let mut si = source.chars().default_case_fold();
+    let t_folded = CASE_MAPPER.fold_string(token);
+    let mut ti = t_folded.chars();
+    let s_folded = CASE_MAPPER.fold_string(source);
+    let mut si = s_folded.chars();
     loop {
         match (ti.next(), si.next()) {
             (None, _) => return true,

components/places/src/match_impl.rs

@@ -10,7 +10,6 @@ the details of which are reproduced below.
 * [MIT License: bincode](#mit-license-bincode)
 * [MIT License: bytes](#mit-license-bytes)
 * [MIT License: cargo_metadata, winnow](#mit-license-cargo_metadata-winnow)
-* [MIT License: caseless](#mit-license-caseless)
 * [MIT License: core_maths](#mit-license-core_maths)
 * [MIT License: extend](#mit-license-extend)
 * [MIT License: generic-array](#mit-license-generic-array)
@@ -532,11 +531,8 @@ The following text applies to code linked from these dependencies:
 [thiserror-impl](https://github.com/dtolnay/thiserror),
 [thiserror](https://github.com/dtolnay/thiserror),
 [thread_local](https://github.com/Amanieu/thread_local-rs),
-[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),
-[unicode-normalization](https://github.com/unicode-rs/unicode-normalization),
 [url](https://github.com/servo/rust-url),
 [utf8_iter](https://github.com/hsivonen/utf8_iter),
 [uuid](https://github.com/uuid-rs/uuid),
@@ -880,37 +876,6 @@ 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: caseless
-
-The following text applies to code linked from these dependencies:
-[caseless](https://github.com/SimonSapin/rust-caseless)
-
-```
-Copyright (c) 2017 Simon Sapin
-
-MIT License
-
-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: core_maths

megazords/full/DEPENDENCIES.md

@@ -456,14 +456,6 @@ the details of which are reproduced below.
     <name>Apache License 2.0: thread_local</name>
     <url>https://github.com/Amanieu/thread_local-rs/blob/master/LICENSE-APACHE</url>
   </license>
-  <license>
-    <name>Apache License 2.0: tinyvec</name>
-    <url>https://github.com/Lokathor/tinyvec/blob/main/LICENSE-ZLIB.md</url>
-  </license>
-  <license>
-    <name>Apache License 2.0: tinyvec_macros</name>
-    <url>https://github.com/Soveu/tinyvec_macros/blob/master/LICENSE-APACHE.md</url>
-  </license>
   <license>
     <name>Apache License 2.0: toml</name>
     <url>https://github.com/alexcrichton/toml-rs/blob/master/LICENSE-APACHE</url>
@@ -472,10 +464,6 @@ the details of which are reproduced below.
     <name>Apache License 2.0: typenum</name>
     <url>https://github.com/paholg/typenum/blob/main/LICENSE-APACHE</url>
   </license>
-  <license>
-    <name>Apache License 2.0: unicode-normalization</name>
-    <url>https://github.com/unicode-rs/unicode-normalization/blob/master/LICENSE-APACHE</url>
-  </license>
   <license>
     <name>Apache License 2.0: url</name>
     <url>https://github.com/servo/rust-url/blob/main/LICENSE-APACHE</url>
@@ -544,10 +532,6 @@ the details of which are reproduced below.
     <name>MIT License: winnow</name>
     <url>https://github.com/winnow-rs/winnow/blob/main/LICENSE-MIT</url>
   </license>
-  <license>
-    <name>MIT License: caseless</name>
-    <url>https://github.com/SimonSapin/rust-caseless/blob/master/LICENSE</url>
-  </license>
   <license>
     <name>MIT License: core_maths</name>
     <url>https://github.com/robertbastian/core_maths/blob/main/LICENSE</url>

megazords/full/android/dependency-licenses.xml

@@ -11,7 +11,6 @@ the details of which are reproduced below.
 * [MIT License: bincode](#mit-license-bincode)
 * [MIT License: bytes](#mit-license-bytes)
 * [MIT License: cargo_metadata, winnow](#mit-license-cargo_metadata-winnow)
-* [MIT License: caseless](#mit-license-caseless)
 * [MIT License: core_maths](#mit-license-core_maths)
 * [MIT License: extend](#mit-license-extend)
 * [MIT License: generic-array](#mit-license-generic-array)
@@ -567,11 +566,8 @@ The following text applies to code linked from these dependencies:
 [thiserror-impl](https://github.com/dtolnay/thiserror),
 [thiserror](https://github.com/dtolnay/thiserror),
 [thread_local](https://github.com/Amanieu/thread_local-rs),
-[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),
-[unicode-normalization](https://github.com/unicode-rs/unicode-normalization),
 [url](https://github.com/servo/rust-url),
 [utf8_iter](https://github.com/hsivonen/utf8_iter),
 [uuid](https://github.com/uuid-rs/uuid),
@@ -941,37 +937,6 @@ 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: caseless
-
-The following text applies to code linked from these dependencies:
-[caseless](https://github.com/SimonSapin/rust-caseless)
-
-```
-Copyright (c) 2017 Simon Sapin
-
-MIT License
-
-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: core_maths