Merge pull request #681 from chewing/push-vsnpowyvukzq

refactor: fix clippy warning

Author: kanru

capi/src/io.rs

@@ -163,7 +163,7 @@ pub unsafe extern "C" fn chewing_new2(
 
     let estimate = LaxUserFreqEstimate::max_from(user_dictionary.as_ref());
 
-    let system_dicts = Vec::from_iter(dictionaries.into_iter().chain(drop_in_dicts.into_iter()));
+    let system_dicts = Vec::from_iter(dictionaries.into_iter().chain(drop_in_dicts));
     let dict = Layered::new(system_dicts, user_dictionary);
     let conversion_engine = Box::new(ChewingEngine::new());
     let kb_compat = KeyboardLayoutCompat::Default;

src/editor/mod.rs

@@ -194,7 +194,7 @@ impl Editor {
         let sys_loader = SystemDictionaryLoader::new();
         let base_dict = sys_loader.load()?;
         let drop_in_dict = sys_loader.load_drop_in()?;
-        let system_dict = Vec::from_iter(base_dict.into_iter().chain(drop_in_dict.into_iter()));
+        let system_dict = Vec::from_iter(base_dict.into_iter().chain(drop_in_dict));
         let user_dict = UserDictionaryLoader::new().load()?;
         let estimate = LaxUserFreqEstimate::max_from(user_dict.as_ref());
         let dict = Layered::new(system_dict, user_dict);

src/path.rs

@@ -148,7 +148,7 @@ fn project_data_dir() -> Option<PathBuf> {
         if let Ok(path) = env::var("XDG_DATA_HOME") {
             return Some(PathBuf::from(path).join("chewing"));
         }
-        return env::home_dir().map(|path| path.join(".local").join("share").join("chewing"));
+        env::home_dir().map(|path| path.join(".local").join("share").join("chewing"))
     }
 }
 

tools/src/init_database.rs

@@ -125,8 +125,7 @@ fn parse_line(
 ) -> Result<(Vec<Syllable>, &str, u32)> {
     let phrase = line
         .split(delimiter)
-        .filter(|s| !s.is_empty())
-        .next()
+        .find(|s| !s.is_empty())
         .ok_or(parse_error(line_num, line))?
         .trim_matches('"');