Merge pull request #286 from danieleades/refactor/code-quality

improve code quality
rust-cli · Jan 29, 2022 · 68e0025 · 68e0025
2 parents 53e43fb + aaa1601
commit 68e0025
Show file tree

Hide file tree

Showing 29 changed files with 123 additions and 127 deletions.
diff --git a/examples/global/main.rs b/examples/global/main.rs
@@ -19,5 +19,5 @@ fn try_main() -> Result<(), Box<dyn Error>> {
 }
 
 fn main() {
-    try_main().unwrap()
+    try_main().unwrap();
 }
diff --git a/src/builder.rs b/src/builder.rs
@@ -147,7 +147,7 @@ impl<St: BuilderState> ConfigBuilder<St> {
     /// # Errors
     ///
     /// Fails if `Expression::from_str(key)` fails.
-    pub fn set_default<S, T>(mut self, key: S, value: T) -> Result<ConfigBuilder<St>>
+    pub fn set_default<S, T>(mut self, key: S, value: T) -> Result<Self>
     where
         S: AsRef<str>,
         T: Into<Value>,
@@ -164,7 +164,7 @@ impl<St: BuilderState> ConfigBuilder<St> {
     /// # Errors
     ///
     /// Fails if `Expression::from_str(key)` fails.
-    pub fn set_override<S, T>(mut self, key: S, value: T) -> Result<ConfigBuilder<St>>
+    pub fn set_override<S, T>(mut self, key: S, value: T) -> Result<Self>
     where
         S: AsRef<str>,
         T: Into<Value>,

diff --git a/src/config.rs b/src/config.rs
@@ -26,7 +26,7 @@ pub struct Config {
 
 impl Default for Config {
     fn default() -> Self {
-        Config {
+        Self {
             defaults: Default::default(),
             overrides: Default::default(),
             sources: Default::default(),
@@ -37,9 +37,9 @@ impl Default for Config {
 
 impl Config {
     pub(crate) fn new(value: Value) -> Self {
-        Config {
+        Self {
             cache: value,
-            ..Default::default()
+            ..Self::default()
         }
     }
 
@@ -50,7 +50,7 @@ impl Config {
 
     /// Merge in a configuration property source.
     #[deprecated(since = "0.12.0", note = "please use 'ConfigBuilder' instead")]
-    pub fn merge<T>(&mut self, source: T) -> Result<&mut Config>
+    pub fn merge<T>(&mut self, source: T) -> Result<&mut Self>
     where
         T: 'static,
         T: Source + Send + Sync,
@@ -81,7 +81,7 @@ impl Config {
     /// Configuration is automatically refreshed after a mutation
     /// operation (`set`, `merge`, `set_default`, etc.).
     #[deprecated(since = "0.12.0", note = "please use 'ConfigBuilder' instead")]
-    pub fn refresh(&mut self) -> Result<&mut Config> {
+    pub fn refresh(&mut self) -> Result<&mut Self> {
         self.cache = {
             let mut cache: Value = Map::<String, Value>::new().into();
 
@@ -106,7 +106,7 @@ impl Config {
 
     /// Set a default `value` at `key`
     #[deprecated(since = "0.12.0", note = "please use 'ConfigBuilder' instead")]
-    pub fn set_default<T>(&mut self, key: &str, value: T) -> Result<&mut Config>
+    pub fn set_default<T>(&mut self, key: &str, value: T) -> Result<&mut Self>
     where
         T: Into<Value>,
     {
@@ -125,7 +125,7 @@ impl Config {
     ///
     /// Errors if config is frozen
     #[deprecated(since = "0.12.0", note = "please use 'ConfigBuilder' instead")]
-    pub fn set<T>(&mut self, key: &str, value: T) -> Result<&mut Config>
+    pub fn set<T>(&mut self, key: &str, value: T) -> Result<&mut Self>
     where
         T: Into<Value>,
     {

diff --git a/src/de.rs b/src/de.rs
@@ -168,7 +168,7 @@ struct SeqAccess {
 
 impl SeqAccess {
     fn new(elements: Vec<Value>) -> Self {
-        SeqAccess {
+        Self {
             elements: elements.into_iter().enumerate(),
         }
     }
@@ -204,7 +204,7 @@ struct MapAccess {
 
 impl MapAccess {
     fn new(table: Map<String, Value>) -> Self {
-        MapAccess {
+        Self {
             elements: table.into_iter().collect(),
         }
     }

diff --git a/src/env.rs b/src/env.rs
@@ -67,13 +67,13 @@ pub struct Environment {
 impl Environment {
     #[deprecated(since = "0.12.0", note = "please use 'Environment::default' instead")]
     pub fn new() -> Self {
-        Environment::default()
+        Self::default()
     }
 
     pub fn with_prefix(s: &str) -> Self {
-        Environment {
+        Self {
             prefix: Some(s.into()),
-            ..Environment::default()
+            ..Self::default()
         }
     }
 

diff --git a/src/error.rs b/src/error.rs
@@ -92,7 +92,7 @@ impl ConfigError {
         unexpected: Unexpected,
         expected: &'static str,
     ) -> Self {
-        ConfigError::Type {
+        Self::Type {
             origin,
             unexpected,
             expected,
@@ -104,8 +104,8 @@ impl ConfigError {
     // TODO: for now only json5 checked, need to finish others
     #[doc(hidden)]
     pub fn invalid_root(origin: Option<&String>, unexpected: Unexpected) -> Box<Self> {
-        Box::new(ConfigError::Type {
-            origin: origin.map(|s| s.to_owned()),
+        Box::new(Self::Type {
+            origin: origin.cloned(),
             unexpected,
             expected: "a map",
             key: None,
@@ -117,12 +117,12 @@ impl ConfigError {
     #[must_use]
     pub fn extend_with_key(self, key: &str) -> Self {
         match self {
-            ConfigError::Type {
+            Self::Type {
                 origin,
                 unexpected,
                 expected,
                 ..
-            } => ConfigError::Type {
+            } => Self::Type {
                 origin,
                 unexpected,
                 expected,
@@ -145,18 +145,18 @@ impl ConfigError {
             format!("{}{}{}", segment, dot, key)
         };
         match self {
-            ConfigError::Type {
+            Self::Type {
                 origin,
                 unexpected,
                 expected,
                 key,
-            } => ConfigError::Type {
+            } => Self::Type {
                 origin,
                 unexpected,
                 expected,
                 key: Some(concat(key)),
             },
-            ConfigError::NotFound(key) => ConfigError::NotFound(concat(Some(key))),
+            Self::NotFound(key) => Self::NotFound(concat(Some(key))),
             _ => self,
         }
     }
@@ -233,12 +233,12 @@ impl Error for ConfigError {}
 
 impl de::Error for ConfigError {
     fn custom<T: fmt::Display>(msg: T) -> Self {
-        ConfigError::Message(msg.to_string())
+        Self::Message(msg.to_string())
     }
 }
 
 impl ser::Error for ConfigError {
     fn custom<T: fmt::Display>(msg: T) -> Self {
-        ConfigError::Message(msg.to_string())
+        Self::Message(msg.to_string())
     }
 }
diff --git a/src/file/format/json5.rs b/src/file/format/json5.rs
@@ -12,8 +12,8 @@ pub enum Val {
     Integer(i64),
     Float(f64),
     String(String),
-    Array(Vec<Val>),
-    Object(Map<String, Val>),
+    Array(Vec<Self>),
+    Object(Map<String, Self>),
 }
 
 pub fn parse(

diff --git a/src/file/mod.rs b/src/file/mod.rs
@@ -43,7 +43,7 @@ where
     F: FileStoredFormat + 'static,
 {
     pub fn from_str(s: &str, format: F) -> Self {
-        File {
+        Self {
             format: Some(format),
             required: true,
             source: s.into(),
@@ -56,7 +56,7 @@ where
     F: FileStoredFormat + 'static,
 {
     pub fn new(name: &str, format: F) -> Self {
-        File {
+        Self {
             format: Some(format),
             required: true,
             source: source::file::FileSourceFile::new(name.into()),
@@ -68,7 +68,7 @@ impl File<source::file::FileSourceFile, FileFormat> {
     /// Given the basename of a file, will attempt to locate a file by setting its
     /// extension to a registered format.
     pub fn with_name(name: &str) -> Self {
-        File {
+        Self {
             format: None,
             required: true,
             source: source::file::FileSourceFile::new(name.into()),
@@ -78,7 +78,7 @@ impl File<source::file::FileSourceFile, FileFormat> {
 
 impl<'a> From<&'a Path> for File<source::file::FileSourceFile, FileFormat> {
     fn from(path: &'a Path) -> Self {
-        File {
+        Self {
             format: None,
             required: true,
             source: source::file::FileSourceFile::new(path.to_path_buf()),
@@ -88,7 +88,7 @@ impl<'a> From<&'a Path> for File<source::file::FileSourceFile, FileFormat> {
 
 impl From<PathBuf> for File<source::file::FileSourceFile, FileFormat> {
     fn from(path: PathBuf) -> Self {
-        File {
+        Self {
             format: None,
             required: true,
             source: source::file::FileSourceFile::new(path),

diff --git a/src/file/source/file.rs b/src/file/source/file.rs
@@ -16,8 +16,8 @@ pub struct FileSourceFile {
 }
 
 impl FileSourceFile {
-    pub fn new(name: PathBuf) -> FileSourceFile {
-        FileSourceFile { name }
+    pub fn new(name: PathBuf) -> Self {
+        Self { name }
     }
 
     fn find_file<F>(

diff --git a/src/file/source/string.rs b/src/file/source/string.rs
@@ -12,7 +12,7 @@ pub struct FileSourceString(String);
 
 impl<'a> From<&'a str> for FileSourceString {
     fn from(s: &'a str) -> Self {
-        FileSourceString(s.into())
+        Self(s.into())
     }
 }