Update used unicode-script version and get rid of 'parse_script' function

Author: popzxc

clippy_lints/Cargo.toml

@@ -23,7 +23,7 @@ serde = { version = "1.0", features = ["derive"] }
 serde_json = { version = "1.0", optional = true }
 toml = "0.5.3"
 unicode-normalization = "0.1"
-unicode-script = { version = "0.5.1", default-features = false }
+unicode-script = { version = "0.5.3", default-features = false }
 semver = "0.11"
 rustc-semver = "1.1.0"
 # NOTE: cargo requires serde feat in its url dep

clippy_lints/src/disallowed_script_idents.rs

@@ -48,10 +48,11 @@ pub struct DisallowedScriptIdents {
 }
 
 impl DisallowedScriptIdents {
-    pub fn new(whitelist: Vec<String>) -> Self {
+    pub fn new(whitelist: &[String]) -> Self {
         let whitelist = whitelist
-            .into_iter()
-            .filter_map(|script| parse_script(&script))
+            .iter()
+            .map(String::as_str)
+            .filter_map(Script::from_full_name)
             .collect();
         Self { whitelist }
     }
@@ -108,166 +109,3 @@ impl EarlyLintPass for DisallowedScriptIdents {
         }
     }
 }
-
-/// Parses the `unicode_script::Script` object, filtering
-/// bad values and undesired scripts (such as `Common` and `Unknown`).
-#[allow(clippy::too_many_lines)]
-fn parse_script(script_name: &str) -> Option<Script> {
-    let converted = match script_name {
-        "Adlam" => Script::Adlam,
-        "Caucasian_Albanian" => Script::Caucasian_Albanian,
-        "Ahom" => Script::Ahom,
-        "Arabic" => Script::Arabic,
-        "Imperial_Aramaic" => Script::Imperial_Aramaic,
-        "Armenian" => Script::Armenian,
-        "Avestan" => Script::Avestan,
-        "Balinese" => Script::Balinese,
-        "Bamum" => Script::Bamum,
-        "Bassa_Vah" => Script::Bassa_Vah,
-        "Batak" => Script::Batak,
-        "Bengali" => Script::Bengali,
-        "Bhaiksuki" => Script::Bhaiksuki,
-        "Bopomofo" => Script::Bopomofo,
-        "Brahmi" => Script::Brahmi,
-        "Braille" => Script::Braille,
-        "Buginese" => Script::Buginese,
-        "Buhid" => Script::Buhid,
-        "Chakma" => Script::Chakma,
-        "Canadian_Aboriginal" => Script::Canadian_Aboriginal,
-        "Carian" => Script::Carian,
-        "Cham" => Script::Cham,
-        "Cherokee" => Script::Cherokee,
-        "Chorasmian" => Script::Chorasmian,
-        "Coptic" => Script::Coptic,
-        "Cypriot" => Script::Cypriot,
-        "Cyrillic" => Script::Cyrillic,
-        "Devanagari" => Script::Devanagari,
-        "Dives_Akuru" => Script::Dives_Akuru,
-        "Dogra" => Script::Dogra,
-        "Deseret" => Script::Deseret,
-        "Duployan" => Script::Duployan,
-        "Egyptian_Hieroglyphs" => Script::Egyptian_Hieroglyphs,
-        "Elbasan" => Script::Elbasan,
-        "Elymaic" => Script::Elymaic,
-        "Ethiopic" => Script::Ethiopic,
-        "Georgian" => Script::Georgian,
-        "Glagolitic" => Script::Glagolitic,
-        "Gunjala_Gondi" => Script::Gunjala_Gondi,
-        "Masaram_Gondi" => Script::Masaram_Gondi,
-        "Gothic" => Script::Gothic,
-        "Grantha" => Script::Grantha,
-        "Greek" => Script::Greek,
-        "Gujarati" => Script::Gujarati,
-        "Gurmukhi" => Script::Gurmukhi,
-        "Hangul" => Script::Hangul,
-        "Han" => Script::Han,
-        "Hanunoo" => Script::Hanunoo,
-        "Hatran" => Script::Hatran,
-        "Hebrew" => Script::Hebrew,
-        "Hiragana" => Script::Hiragana,
-        "Anatolian_Hieroglyphs" => Script::Anatolian_Hieroglyphs,
-        "Pahawh_Hmong" => Script::Pahawh_Hmong,
-        "Nyiakeng_Puachue_Hmong" => Script::Nyiakeng_Puachue_Hmong,
-        "Old_Hungarian" => Script::Old_Hungarian,
-        "Old_Italic" => Script::Old_Italic,
-        "Javanese" => Script::Javanese,
-        "Kayah_Li" => Script::Kayah_Li,
-        "Katakana" => Script::Katakana,
-        "Kharoshthi" => Script::Kharoshthi,
-        "Khmer" => Script::Khmer,
-        "Khojki" => Script::Khojki,
-        "Khitan_Small_Script" => Script::Khitan_Small_Script,
-        "Kannada" => Script::Kannada,
-        "Kaithi" => Script::Kaithi,
-        "Tai_Tham" => Script::Tai_Tham,
-        "Lao" => Script::Lao,
-        "Latin" => Script::Latin,
-        "Lepcha" => Script::Lepcha,
-        "Limbu" => Script::Limbu,
-        "Lisu" => Script::Lisu,
-        "Lycian" => Script::Lycian,
-        "Lydian" => Script::Lydian,
-        "Mahajani" => Script::Mahajani,
-        "Makasar" => Script::Makasar,
-        "Mandaic" => Script::Mandaic,
-        "Manichaean" => Script::Manichaean,
-        "Marchen" => Script::Marchen,
-        "Medefaidrin" => Script::Medefaidrin,
-        "Mende_Kikakui" => Script::Mende_Kikakui,
-        "Meroitic_Cursive" => Script::Meroitic_Cursive,
-        "Meroitic_Hieroglyphs" => Script::Meroitic_Hieroglyphs,
-        "Malayalam" => Script::Malayalam,
-        "Modi" => Script::Modi,
-        "Mongolian" => Script::Mongolian,
-        "Mro" => Script::Mro,
-        "Meetei_Mayek" => Script::Meetei_Mayek,
-        "Multani" => Script::Multani,
-        "Myanmar" => Script::Myanmar,
-        "Nandinagari" => Script::Nandinagari,
-        "Old_North_Arabian" => Script::Old_North_Arabian,
-        "Nabataean" => Script::Nabataean,
-        "Newa" => Script::Newa,
-        "Nko" => Script::Nko,
-        "Nushu" => Script::Nushu,
-        "Ogham" => Script::Ogham,
-        "Ol_Chiki" => Script::Ol_Chiki,
-        "Old_Turkic" => Script::Old_Turkic,
-        "Oriya" => Script::Oriya,
-        "Osage" => Script::Osage,
-        "Osmanya" => Script::Osmanya,
-        "Palmyrene" => Script::Palmyrene,
-        "Pau_Cin_Hau" => Script::Pau_Cin_Hau,
-        "Old_Permic" => Script::Old_Permic,
-        "Phags_Pa" => Script::Phags_Pa,
-        "Inscriptional_Pahlavi" => Script::Inscriptional_Pahlavi,
-        "Psalter_Pahlavi" => Script::Psalter_Pahlavi,
-        "Phoenician" => Script::Phoenician,
-        "Miao" => Script::Miao,
-        "Inscriptional_Parthian" => Script::Inscriptional_Parthian,
-        "Rejang" => Script::Rejang,
-        "Hanifi_Rohingya" => Script::Hanifi_Rohingya,
-        "Runic" => Script::Runic,
-        "Samaritan" => Script::Samaritan,
-        "Old_South_Arabian" => Script::Old_South_Arabian,
-        "Saurashtra" => Script::Saurashtra,
-        "SignWriting" => Script::SignWriting,
-        "Shavian" => Script::Shavian,
-        "Sharada" => Script::Sharada,
-        "Siddham" => Script::Siddham,
-        "Khudawadi" => Script::Khudawadi,
-        "Sinhala" => Script::Sinhala,
-        "Sogdian" => Script::Sogdian,
-        "Old_Sogdian" => Script::Old_Sogdian,
-        "Sora_Sompeng" => Script::Sora_Sompeng,
-        "Soyombo" => Script::Soyombo,
-        "Sundanese" => Script::Sundanese,
-        "Syloti_Nagri" => Script::Syloti_Nagri,
-        "Syriac" => Script::Syriac,
-        "Tagbanwa" => Script::Tagbanwa,
-        "Takri" => Script::Takri,
-        "Tai_Le" => Script::Tai_Le,
-        "New_Tai_Lue" => Script::New_Tai_Lue,
-        "Tamil" => Script::Tamil,
-        "Tangut" => Script::Tangut,
-        "Tai_Viet" => Script::Tai_Viet,
-        "Telugu" => Script::Telugu,
-        "Tifinagh" => Script::Tifinagh,
-        "Tagalog" => Script::Tagalog,
-        "Thaana" => Script::Thaana,
-        "Thai" => Script::Thai,
-        "Tibetan" => Script::Tibetan,
-        "Tirhuta" => Script::Tirhuta,
-        "Ugaritic" => Script::Ugaritic,
-        "Vai" => Script::Vai,
-        "Warang_Citi" => Script::Warang_Citi,
-        "Wancho" => Script::Wancho,
-        "Old_Persian" => Script::Old_Persian,
-        "Cuneiform" => Script::Cuneiform,
-        "Yezidi" => Script::Yezidi,
-        "Yi" => Script::Yi,
-        "Zanabazar_Square" => Script::Zanabazar_Square,
-        _ => return None,
-    };
-
-    Some(converted)
-}

clippy_lints/src/lib.rs

@@ -2086,7 +2086,7 @@ pub fn register_plugins(store: &mut rustc_lint::LintStore, sess: &Session, conf:
     let import_renames = conf.enforced_import_renames.clone();
     store.register_late_pass(move || box missing_enforced_import_rename::ImportRename::new(import_renames.clone()));
     let scripts = conf.allowed_scripts.clone();
-    store.register_early_pass(move || box disallowed_script_idents::DisallowedScriptIdents::new(scripts.clone()));
+    store.register_early_pass(move || box disallowed_script_idents::DisallowedScriptIdents::new(&scripts));
 }
 
 #[rustfmt::skip]