🏷️ Improve ergonomic use of Into<String>

pagetop/src/core/module/all.rs

@@ -4,7 +4,7 @@ use crate::core::theme::all::THEMES;
 use crate::{service, trace, LazyStatic};
 
 #[cfg(feature = "database")]
-use crate::{db::*};
+use crate::db::*;
 
 use std::sync::RwLock;
 

pagetop/src/html/assets/headscript.rs

@@ -25,18 +25,15 @@ impl AssetsTrait for HeadScript {
 }
 
 impl HeadScript {
-    pub fn named<S>(path: S) -> Self
+    pub fn named(path: impl Into<String>) -> Self {
-    where
-        S: Into<String>,
-    {
         HeadScript {
             path: path.into(),
             ..Default::default()
         }
     }
 
-    pub fn with_code(mut self, code: &str) -> Self {
+    pub fn with_code(mut self, code: impl Into<String>) -> Self {
-        self.code = code.trim().to_owned();
+        self.code = code.into().trim().to_owned();
         self
     }
 

pagetop/src/html/assets/headstyles.rs

@@ -25,18 +25,15 @@ impl AssetsTrait for HeadStyles {
 }
 
 impl HeadStyles {
-    pub fn named<S>(path: S) -> Self
+    pub fn named(path: impl Into<String>) -> Self {
-    where
-        S: Into<String>,
-    {
         HeadStyles {
             path: path.into(),
             ..Default::default()
         }
     }
 
-    pub fn with_styles(mut self, styles: &str) -> Self {
+    pub fn with_styles(mut self, styles: impl Into<String>) -> Self {
-        self.styles = styles.trim().to_owned();
+        self.styles = styles.into().trim().to_owned();
         self
     }
 

pagetop/src/html/assets/javascript.rs

@@ -41,10 +41,7 @@ impl AssetsTrait for JavaScript {
 }
 
 impl JavaScript {
-    pub fn at<S>(path: S) -> Self
+    pub fn at(path: impl Into<String>) -> Self {
-    where
-        S: Into<String>,
-    {
         JavaScript {
             path: path.into(),
             ..Default::default()

pagetop/src/html/assets/stylesheet.rs

@@ -39,10 +39,7 @@ impl AssetsTrait for StyleSheet {
 }
 
 impl StyleSheet {
-    pub fn at<S>(path: S) -> Self
+    pub fn at(path: impl Into<String>) -> Self {
-    where
-        S: Into<String>,
-    {
         StyleSheet {
             path: path.into(),
             ..Default::default()