Make ConfigBuilder's method consuming

1 files changed, 7 insertions, 12 deletions

diff --git a/tests/merge.rs b/tests/merge.rs
index 5bb84da..9de36b2 100644
--- a/tests/merge.rs
+++ b/tests/merge.rs
@@ -5,11 +5,11 @@ extern crate config;
 use config::*;
 
 fn make() -> Config {
-    let mut builder = Config::builder();
-    builder
+    Config::builder()
         .add_source(File::new("tests/Settings", FileFormat::Toml))
-        .add_source(File::new("tests/Settings-production", FileFormat::Toml));
-    builder.build().unwrap()
+        .add_source(File::new("tests/Settings-production", FileFormat::Toml))
+        .build()
+        .unwrap()
 }
 
 #[test]
@@ -27,11 +27,8 @@ fn test_merge() {
 
 #[test]
 fn test_merge_whole_config() {
-    let mut builder1 = Config::builder();
-    let mut builder2 = Config::builder();
-
-    builder1.set_override("x", 10).unwrap();
-    builder2.set_override("y", 25).unwrap();
+    let builder1 = Config::builder().set_override("x", 10).unwrap();
+    let builder2 = Config::builder().set_override("y", 25).unwrap();
 
     let config1 = builder1.build_cloned().unwrap();
     let config2 = builder2.build_cloned().unwrap();
@@ -42,9 +39,7 @@ fn test_merge_whole_config() {
     assert_eq!(config2.get("y").ok(), Some(25));
     assert_eq!(config1.get::<()>("y").ok(), None);
 
-    builder1.add_source(config2);
-
-    let config3 = builder1.build().unwrap();
+    let config3 = builder1.add_source(config2).build().unwrap();
 
     assert_eq!(config3.get("x").ok(), Some(10));
     assert_eq!(config3.get("y").ok(), Some(25));