Merge pull request #262 from danieleades/chore/clippy-all-targets

ensure clippy runs on all targets

Author: matthiasbeyer

.github/workflows/msrv.yml

@@ -136,7 +136,7 @@ jobs:
         uses: actions-rs/cargo@v1
         with:
           command: clippy
-          args: -- -D warnings
+          args: --all-targets --all-features -- -D warnings
 
   check-examples:
     name: Check examples

examples/glob/main.rs

@@ -7,14 +7,12 @@ fn main() {
     // Option 1
     // --------
     // Gather all conf files from conf/ manually
-    let mut settings = Config::default();
-    settings
+    let settings = Config::builder()
         // File::with_name(..) is shorthand for File::from(Path::new(..))
-        .merge(File::with_name("examples/glob/conf/00-default.toml"))
-        .unwrap()
-        .merge(File::from(Path::new("examples/glob/conf/05-some.yml")))
-        .unwrap()
-        .merge(File::from(Path::new("examples/glob/conf/99-extra.json")))
+        .add_source(File::with_name("examples/glob/conf/00-default.toml"))
+        .add_source(File::from(Path::new("examples/glob/conf/05-some.yml")))
+        .add_source(File::from(Path::new("examples/glob/conf/99-extra.json")))
+        .build()
         .unwrap();
 
     // Print out our settings (as a HashMap)
@@ -28,13 +26,13 @@ fn main() {
     // Option 2
     // --------
     // Gather all conf files from conf/ manually, but put in 1 merge call.
-    let mut settings = Config::default();
-    settings
-        .merge(vec![
+    let settings = Config::builder()
+        .add_source(vec![
             File::with_name("examples/glob/conf/00-default.toml"),
             File::from(Path::new("examples/glob/conf/05-some.yml")),
             File::from(Path::new("examples/glob/conf/99-extra.json")),
         ])
+        .build()
         .unwrap();
 
     // Print out our settings (as a HashMap)
@@ -48,14 +46,14 @@ fn main() {
     // Option 3
     // --------
     // Gather all conf files from conf/ using glob and put in 1 merge call.
-    let mut settings = Config::default();
-    settings
-        .merge(
+    let settings = Config::builder()
+        .add_source(
             glob("examples/glob/conf/*")
                 .unwrap()
                 .map(|path| File::from(path.unwrap()))
                 .collect::<Vec<_>>(),
         )
+        .build()
         .unwrap();
 
     // Print out our settings (as a HashMap)

examples/global/main.rs

@@ -1,3 +1,4 @@
+#![allow(deprecated)]
 use config::Config;
 use lazy_static::lazy_static;
 use std::error::Error;

examples/hierarchical-env/settings.rs

@@ -3,11 +3,13 @@ use serde_derive::Deserialize;
 use std::env;
 
 #[derive(Debug, Deserialize)]
+#[allow(unused)]
 struct Database {
     url: String,
 }
 
 #[derive(Debug, Deserialize)]
+#[allow(unused)]
 struct Sparkpost {
     key: String,
     token: String,
@@ -16,19 +18,22 @@ struct Sparkpost {
 }
 
 #[derive(Debug, Deserialize)]
+#[allow(unused)]
 struct Twitter {
     consumer_token: String,
     consumer_secret: String,
 }
 
 #[derive(Debug, Deserialize)]
+#[allow(unused)]
 struct Braintree {
     merchant_id: String,
     public_key: String,
     private_key: String,
 }
 
 #[derive(Debug, Deserialize)]
+#[allow(unused)]
 pub struct Settings {
     debug: bool,
     database: Database,
@@ -39,29 +44,27 @@ pub struct Settings {
 
 impl Settings {
     pub fn new() -> Result<Self, ConfigError> {
-        let mut s = Config::default();
+        let run_mode = env::var("RUN_MODE").unwrap_or_else(|_| "development".into());
 
-        // Start off by merging in the "default" configuration file
-        s.merge(File::with_name("examples/hierarchical-env/config/default"))?;
-
-        // Add in the current environment file
-        // Default to 'development' env
-        // Note that this file is _optional_
-        let env = env::var("RUN_MODE").unwrap_or_else(|_| "development".into());
-        s.merge(
-            File::with_name(&format!("examples/hierarchical-env/config/{}", env)).required(false),
-        )?;
-
-        // Add in a local configuration file
-        // This file shouldn't be checked in to git
-        s.merge(File::with_name("examples/hierarchical-env/config/local").required(false))?;
-
-        // Add in settings from the environment (with a prefix of APP)
-        // Eg.. `APP_DEBUG=1 ./target/app` would set the `debug` key
-        s.merge(Environment::with_prefix("app"))?;
-
-        // You may also programmatically change settings
-        s.set("database.url", "postgres://")?;
+        let s = Config::builder()
+            // Start off by merging in the "default" configuration file
+            .add_source(File::with_name("examples/hierarchical-env/config/default"))
+            // Add in the current environment file
+            // Default to 'development' env
+            // Note that this file is _optional_
+            .add_source(
+                File::with_name(&format!("examples/hierarchical-env/config/{}", run_mode))
+                    .required(false),
+            )
+            // Add in a local configuration file
+            // This file shouldn't be checked in to git
+            .add_source(File::with_name("examples/hierarchical-env/config/local").required(false))
+            // Add in settings from the environment (with a prefix of APP)
+            // Eg.. `APP_DEBUG=1 ./target/app` would set the `debug` key
+            .add_source(Environment::with_prefix("app"))
+            // You may also programmatically change settings
+            .set_override("database.url", "postgres://")?
+            .build()?;
 
         // Now that we're done, let's access our configuration
         println!("debug: {:?}", s.get_bool("debug"));

examples/simple/main.rs

@@ -1,14 +1,14 @@
+use config::Config;
 use std::collections::HashMap;
 
 fn main() {
-    let mut settings = config::Config::default();
-    settings
+    let settings = Config::builder()
         // Add in `./Settings.toml`
-        .merge(config::File::with_name("examples/simple/Settings"))
-        .unwrap()
+        .add_source(config::File::with_name("examples/simple/Settings"))
         // Add in settings from the environment (with a prefix of APP)
         // Eg.. `APP_DEBUG=1 ./target/app` would set the `debug` key
-        .merge(config::Environment::with_prefix("APP"))
+        .add_source(config::Environment::with_prefix("APP"))
+        .build()
         .unwrap();
 
     // Print out our settings (as a HashMap)

examples/watch/main.rs

@@ -1,3 +1,4 @@
+#![allow(deprecated)]
 use config::{Config, File};
 use notify::{DebouncedEvent, RecommendedWatcher, RecursiveMode, Watcher};
 use std::collections::HashMap;

src/builder.rs

@@ -272,7 +272,7 @@ impl ConfigBuilder<AsyncState> {
     ///
     /// Calling this method does not invoke any I/O. [`Source`] is only saved in internal register for later use.
     #[must_use]
-    pub fn add_source<T>(mut self, source: T) -> ConfigBuilder<AsyncState>
+    pub fn add_source<T>(mut self, source: T) -> Self
     where
         T: Source + Send + Sync + 'static,
     {
@@ -284,7 +284,7 @@ impl ConfigBuilder<AsyncState> {
     ///
     /// Calling this method does not invoke any I/O. [`AsyncSource`] is only saved in internal register for later use.
     #[must_use]
-    pub fn add_async_source<T>(mut self, source: T) -> ConfigBuilder<AsyncState>
+    pub fn add_async_source<T>(mut self, source: T) -> Self
     where
         T: AsyncSource + Send + Sync + 'static,
     {

src/file/source/file.rs

@@ -73,7 +73,7 @@ impl FileSourceFile {
             }
 
             None => {
-                for (format, extensions) in ALL_EXTENSIONS.iter() {
+                for format in ALL_EXTENSIONS.keys() {
                     for ext in format.extensions() {
                         filename.set_extension(ext);
 

src/lib.rs

@@ -17,7 +17,6 @@
 //!
 //! See the [examples](https://github.com/mehcode/config-rs/tree/master/examples) for
 //! general usage information.
-#![allow(unused_variables)]
 #![allow(unknown_lints)]
 // #![warn(missing_docs)]
 

src/ser.rs

@@ -231,7 +231,7 @@ impl<'a> ser::Serializer for &'a mut ConfigSerializer {
 
     fn serialize_tuple_variant(
         self,
-        name: &'static str,
+        _name: &'static str,
         _variant_index: u32,
         variant: &'static str,
         _len: usize,
@@ -253,7 +253,7 @@ impl<'a> ser::Serializer for &'a mut ConfigSerializer {
         _name: &'static str,
         _variant_index: u32,
         variant: &'static str,
-        len: usize,
+        _len: usize,
     ) -> Result<Self::SerializeStructVariant> {
         self.push_key(variant);
         Ok(self)
@@ -580,7 +580,7 @@ impl ser::SerializeSeq for StringKeySerializer {
     type Ok = String;
     type Error = ConfigError;
 
-    fn serialize_element<T>(&mut self, value: &T) -> Result<()>
+    fn serialize_element<T>(&mut self, _value: &T) -> Result<()>
     where
         T: ?Sized + ser::Serialize,
     {
@@ -596,7 +596,7 @@ impl ser::SerializeTuple for StringKeySerializer {
     type Ok = String;
     type Error = ConfigError;
 
-    fn serialize_element<T>(&mut self, value: &T) -> Result<()>
+    fn serialize_element<T>(&mut self, _value: &T) -> Result<()>
     where
         T: ?Sized + ser::Serialize,
     {
@@ -612,7 +612,7 @@ impl ser::SerializeTupleStruct for StringKeySerializer {
     type Ok = String;
     type Error = ConfigError;
 
-    fn serialize_field<T>(&mut self, value: &T) -> Result<()>
+    fn serialize_field<T>(&mut self, _value: &T) -> Result<()>
     where
         T: ?Sized + ser::Serialize,
     {
@@ -628,7 +628,7 @@ impl ser::SerializeTupleVariant for StringKeySerializer {
     type Ok = String;
     type Error = ConfigError;
 
-    fn serialize_field<T>(&mut self, value: &T) -> Result<()>
+    fn serialize_field<T>(&mut self, _value: &T) -> Result<()>
     where
         T: ?Sized + ser::Serialize,
     {
@@ -644,14 +644,14 @@ impl ser::SerializeMap for StringKeySerializer {
     type Ok = String;
     type Error = ConfigError;
 
-    fn serialize_key<T>(&mut self, key: &T) -> Result<()>
+    fn serialize_key<T>(&mut self, _key: &T) -> Result<()>
     where
         T: ?Sized + ser::Serialize,
     {
         unreachable!()
     }
 
-    fn serialize_value<T>(&mut self, value: &T) -> Result<()>
+    fn serialize_value<T>(&mut self, _value: &T) -> Result<()>
     where
         T: ?Sized + ser::Serialize,
     {
@@ -667,7 +667,7 @@ impl ser::SerializeStruct for StringKeySerializer {
     type Ok = String;
     type Error = ConfigError;
 
-    fn serialize_field<T>(&mut self, key: &'static str, value: &T) -> Result<()>
+    fn serialize_field<T>(&mut self, _key: &'static str, _value: &T) -> Result<()>
     where
         T: ?Sized + ser::Serialize,
     {
@@ -683,7 +683,7 @@ impl ser::SerializeStructVariant for StringKeySerializer {
     type Ok = String;
     type Error = ConfigError;
 
-    fn serialize_field<T>(&mut self, key: &'static str, value: &T) -> Result<()>
+    fn serialize_field<T>(&mut self, _key: &'static str, _value: &T) -> Result<()>
     where
         T: ?Sized + ser::Serialize,
     {

tests/async_builder.rs

@@ -46,7 +46,7 @@ async fn test_single_async_file_source() {
         .await
         .unwrap();
 
-    assert_eq!(true, config.get::<bool>("debug").unwrap());
+    assert!(config.get::<bool>("debug").unwrap());
 }
 
 #[tokio::test]
@@ -65,7 +65,7 @@ async fn test_two_async_file_sources() {
         .unwrap();
 
     assert_eq!("Torre di Pisa", config.get::<String>("place.name").unwrap());
-    assert_eq!(true, config.get::<bool>("debug_json").unwrap());
+    assert!(config.get::<bool>("debug_json").unwrap());
     assert_eq!(1, config.get::<i32>("place.number").unwrap());
 }
 

tests/env.rs

@@ -199,6 +199,7 @@ fn test_parse_off_int() {
 
     #[derive(Deserialize, Debug)]
     struct TestInt {
+        #[allow(dead_code)]
         int_val_1: i32,
     }
 
@@ -230,6 +231,7 @@ fn test_parse_off_float() {
 
     #[derive(Deserialize, Debug)]
     struct TestFloat {
+        #[allow(dead_code)]
         float_val_1: f64,
     }
 
@@ -261,6 +263,7 @@ fn test_parse_off_bool() {
 
     #[derive(Deserialize, Debug)]
     struct TestBool {
+        #[allow(dead_code)]
         bool_val_1: bool,
     }
 
@@ -292,6 +295,7 @@ fn test_parse_int_fail() {
 
     #[derive(Deserialize, Debug)]
     struct TestInt {
+        #[allow(dead_code)]
         int_val_2: i32,
     }
 
@@ -323,6 +327,7 @@ fn test_parse_float_fail() {
 
     #[derive(Deserialize, Debug)]
     struct TestFloat {
+        #[allow(dead_code)]
         float_val_2: f64,
     }
 
@@ -354,6 +359,7 @@ fn test_parse_bool_fail() {
 
     #[derive(Deserialize, Debug)]
     struct TestBool {
+        #[allow(dead_code)]
         bool_val_2: bool,
     }
 

tests/errors.rs

@@ -106,11 +106,13 @@ fn test_error_enum_de() {
 fn error_with_path() {
     #[derive(Debug, Deserialize)]
     struct Inner {
+        #[allow(dead_code)]
         test: i32,
     }
 
     #[derive(Debug, Deserialize)]
     struct Outer {
+        #[allow(dead_code)]
         inner: Inner,
     }
     const CFG: &str = r#"

tests/file_json.rs

@@ -47,7 +47,7 @@ fn test_file() {
     assert_eq!(s.place.name, "Torre di Pisa");
     assert!(s.place.longitude.approx_eq_ulps(&43.7224985, 2));
     assert!(s.place.latitude.approx_eq_ulps(&10.3970522, 2));
-    assert_eq!(s.place.favorite, false);
+    assert!(!s.place.favorite);
     assert_eq!(s.place.reviews, 3866);
     assert_eq!(s.place.rating, Some(4.5));
     assert_eq!(s.place.telephone, None);