Merge pull request #277 from Tools-cx-app/offical/opt-code

Using where to improve readability

Author: shadow3aaa

src/file_handler.rs

@@ -38,29 +38,11 @@ impl FileHandler {
         }
     }
 
-    pub fn read_to_string(&mut self, path: impl AsRef<Path>) -> Result<String> {
-        let mut string = String::new();
-        match self.files.entry(path.as_ref().to_path_buf()) {
-            Entry::Occupied(mut entry) => {
-                let mut string = String::new();
-                entry.get_mut().rewind()?;
-                entry.get().read_to_string(&mut string)?;
-            }
-            Entry::Vacant(entry) => {
-                let mut file = File::open(path.as_ref())?;
-                file.read_to_string(&mut string)?;
-                entry.insert(file);
-            }
-        }
-
-        Ok(string)
-    }
-
-    pub fn write_with_workround(
-        &mut self,
-        path: impl AsRef<Path>,
-        content: impl AsRef<[u8]>,
-    ) -> Result<()> {
+    pub fn write_with_workround<P, S>(&mut self, path: P, content: S) -> Result<()>
+    where
+        P: AsRef<Path>,
+        S: AsRef<[u8]>,
+    {
         if let Err(e) = self.write(path.as_ref(), content.as_ref()) {
             match e.kind() {
                 ErrorKind::PermissionDenied => {
@@ -76,7 +58,11 @@ impl FileHandler {
         }
     }
 
-    pub fn write(&mut self, path: impl AsRef<Path>, content: impl AsRef<[u8]>) -> io::Result<()> {
+    pub fn write<P, S>(&mut self, path: P, content: S) -> io::Result<()>
+    where
+        P: AsRef<Path>,
+        S: AsRef<[u8]>,
+    {
         match self.files.entry(path.as_ref().to_path_buf()) {
             Entry::Occupied(mut entry) => {
                 entry.get_mut().write_all(content.as_ref())?;

src/framework/config/merge.rs

@@ -33,7 +33,10 @@ struct ConfigData {
 }
 
 impl Config {
-    pub fn merge<S: AsRef<str>>(l: S, s: S) -> Result<String> {
+    pub fn merge<S>(l: S, s: S) -> Result<String>
+    where
+        S: AsRef<str>,
+    {
         let local_conf = l.as_ref();
         let std_conf = s.as_ref();
 

src/framework/config/mod.rs

@@ -27,7 +27,7 @@ use log::{error, info};
 use toml::Value;
 
 use crate::framework::{error::Result, node::Mode};
-pub use data::{Config as ConfigConfig, ConfigData, MarginFps, ModeConfig, TemperatureThreshold};
+pub use data::{ConfigData, MarginFps, ModeConfig, TemperatureThreshold};
 use read::wait_and_read;
 
 #[derive(Debug, Clone, PartialEq, Eq)]
@@ -42,7 +42,10 @@ pub struct Config {
 }
 
 impl Config {
-    pub fn new<P: AsRef<Path>>(p: P, sp: P) -> Result<Self> {
+    pub fn new<P>(p: P, sp: P) -> Result<Self>
+    where
+        P: AsRef<Path>,
+    {
         let path = p.as_ref();
         let std_path = sp.as_ref();
         let toml_raw = fs::read_to_string(path)?;
@@ -68,14 +71,20 @@ impl Config {
         Ok(Self { inner })
     }
 
-    pub fn need_fas<S: AsRef<str>>(&mut self, pkg: S) -> bool {
+    pub fn need_fas<S>(&mut self, pkg: S) -> bool
+    where
+        S: AsRef<str>,
+    {
         let pkg = pkg.as_ref();
 
         self.inner.config().game_list.contains_key(pkg)
             || self.inner.config().scene_game_list.contains(pkg)
     }
 
-    pub fn target_fps<S: AsRef<str>>(&mut self, pkg: S) -> Option<TargetFps> {
+    pub fn target_fps<S>(&mut self, pkg: S) -> Option<TargetFps>
+    where
+        S: AsRef<str>,
+    {
         let pkg = pkg.as_ref();
         let pkg = pkg.split(':').next()?;
 
@@ -125,9 +134,4 @@ impl Config {
             Mode::Fast => &self.inner.config().fast,
         }
     }
-
-    #[must_use]
-    pub fn config(&mut self) -> ConfigConfig {
-        self.inner.config().config
-    }
 }

src/framework/extension/api/misc.rs

@@ -25,12 +25,12 @@ pub fn get_api_version(lua: &Lua) -> u8 {
     lua.globals().get("API_VERSION").unwrap_or(0)
 }
 
-pub fn do_callback<P: AsRef<Path>, S: AsRef<str>, A: IntoLuaMulti>(
-    extension: P,
-    lua: &Lua,
-    function: S,
-    args: A,
-) {
+pub fn do_callback<P, S, A>(extension: P, lua: &Lua, function: S, args: A)
+where
+    P: AsRef<Path>,
+    S: AsRef<str>,
+    A: IntoLuaMulti,
+{
     let function = function.as_ref();
     let extension = extension.as_ref();
 

src/framework/node/mod.rs

@@ -34,7 +34,10 @@ impl Node {
         Ok(result)
     }
 
-    pub fn create_node<S: AsRef<str>>(&mut self, i: S, d: S) -> Result<()> {
+    pub fn create_node<S>(&mut self, i: S, d: S) -> Result<()>
+    where
+        S: AsRef<str>,
+    {
         let id = i.as_ref();
         let default = d.as_ref();
 
@@ -43,7 +46,10 @@ impl Node {
         self.refresh()
     }
 
-    pub fn remove_node<S: AsRef<str>>(&mut self, i: S) -> Result<()> {
+    pub fn remove_node<S>(&mut self, i: S) -> Result<()>
+    where
+        S: AsRef<str>,
+    {
         let id = i.as_ref();
 
         let path = Path::new(NODE_PATH).join(id);
@@ -52,7 +58,10 @@ impl Node {
         self.refresh()
     }
 
-    pub fn get_node<S: AsRef<str>>(&mut self, id: S) -> Result<String> {
+    pub fn get_node<S>(&mut self, id: S) -> Result<String>
+    where
+        S: AsRef<str>,
+    {
         let id = id.as_ref();
 
         if unlikely(self.timer.elapsed() > REFRESH_TIME) {

src/framework/scheduler/looper/clean.rs

@@ -28,7 +28,11 @@ use libc::{MS_BIND, MS_REC, mount, umount, umount2};
 
 use crate::framework::error::Result;
 
-fn lock_value<P: AsRef<Path>, S: AsRef<str>>(path: P, value: S) {
+fn lock_value<P, S>(path: P, value: S)
+where
+    P: AsRef<Path>,
+    S: AsRef<str>,
+{
     let value = value.as_ref();
     let path = path.as_ref();
 

src/main.rs

@@ -78,7 +78,10 @@ fn main() -> Result<()> {
     Ok(())
 }
 
-fn run<S: AsRef<str>>(std_path: S) -> Result<()> {
+fn run<S>(std_path: S) -> Result<()>
+where
+    S: AsRef<str>,
+{
     #[cfg(not(debug_assertions))]
     let logger_spec = LogSpecification::info();
 

src/misc.rs

@@ -17,7 +17,10 @@
 
 use std::process::Command;
 
-pub fn setprop<S: AsRef<str>>(k: S, v: S) {
+pub fn setprop<S>(k: S, v: S)
+where
+    S: AsRef<str>,
+{
     let key = k.as_ref();
     let value = v.as_ref();
     let _ = Command::new("setprop").args([key, value]).spawn();