Remove global API

5 files changed, 38 insertions, 26 deletions

diff --git a/examples/basic/src/main.rs b/examples/basic/src/main.rs
index 6690f0e..2f947d8 100644
--- a/examples/basic/src/main.rs
+++ b/examples/basic/src/main.rs
@@ -1,31 +1,33 @@
 extern crate config;
 
 fn main() {
+    let mut c = config::Config::new();
+
     // Set defaults for `window.width` and `window.height`
-    config::set_default("window.title", "Basic").unwrap();
-    config::set_default("window.width", 640).unwrap();
-    config::set_default("window.height", 480).unwrap();
-    config::set_default("debug", true).unwrap();
+    c.set_default("window.title", "Basic").unwrap();
+    c.set_default("window.width", 640).unwrap();
+    c.set_default("window.height", 480).unwrap();
+    c.set_default("debug", true).unwrap();
 
     // Note that you can retrieve the stored values as any type as long
     // as there exists a reasonable conversion
-    println!("window.title  : {:?}", config::get_str("window.title"));
-    println!("window.width  : {:?}", config::get_str("window.width"));
-    println!("window.width  : {:?}", config::get_int("window.width"));
-    println!("debug         : {:?}", config::get_bool("debug"));
-    println!("debug         : {:?}", config::get_str("debug"));
-    println!("debug         : {:?}", config::get_int("debug"));
+    println!("window.title  : {:?}", c.get_str("window.title"));
+    println!("window.width  : {:?}", c.get_str("window.width"));
+    println!("window.width  : {:?}", c.get_int("window.width"));
+    println!("debug         : {:?}", c.get_bool("debug"));
+    println!("debug         : {:?}", c.get_str("debug"));
+    println!("debug         : {:?}", c.get_int("debug"));
 
     // Attempting to get a value as a type that cannot be reasonably
     // converted to will return None
-    println!("window.title  : {:?}", config::get_bool("window.title"));
+    println!("window.title  : {:?}", c.get_bool("window.title"));
 
     // Instead of using a get_* function you can get the variant
     // directly
-    println!("debug         : {:?}", config::get("debug"));
+    println!("debug         : {:?}", c.get("debug"));
     println!("debug         : {:?}",
-             config::get("debug").unwrap().as_int());
+             c.get("debug").unwrap().into_int());
 
     // Attempting to get a value that does not exist will return None
-    println!("not-found     : {:?}", config::get("not-found"));
+    println!("not-found     : {:?}", c.get("not-found"));
 }
diff --git a/examples/file-json/src/main.rs b/examples/file-json/src/main.rs
index 9c636ac..e4ff809 100644
--- a/examples/file-json/src/main.rs
+++ b/examples/file-json/src/main.rs
@@ -1,10 +1,12 @@
 extern crate config;
 
 fn main() {
+    let mut c = config::Config::new();
+
     // Read configuration from "Settings.json"
-    config::merge(config::File::new("Settings", config::FileFormat::Json)).unwrap();
+    c.merge(config::File::new("Settings", config::FileFormat::Json)).unwrap();
 
-    println!("debug  = {:?}", config::get("debug"));
-    println!("pi     = {:?}", config::get("pi"));
-    println!("weight = {:?}", config::get("weight"));
+    println!("debug  = {:?}", c.get("debug"));
+    println!("pi     = {:?}", c.get("pi"));
+    println!("weight = {:?}", c.get("weight"));
 }
diff --git a/examples/file-toml/Settings.toml b/examples/file-toml/Settings.toml
new file mode 100644
index 0000000..28c5fc6
--- /dev/null
+++ b/examples/file-toml/Settings.toml
@@ -0,0 +1,3 @@
+debug = false
+pi = 3.14159
+weight = 150
diff --git a/examples/file-toml/src/main.rs b/examples/file-toml/src/main.rs
index 03ce61a..85db701 100644
--- a/examples/file-toml/src/main.rs
+++ b/examples/file-toml/src/main.rs
@@ -1,9 +1,12 @@
 extern crate config;
 
 fn main() {
-    // Read configuration from $(cwd)/Cargo.toml
-    config::merge(config::File::new("Cargo", config::FileFormat::Toml)).unwrap();
+    let mut c = config::Config::new();
 
-    println!("package.name = {:?}", config::get_str("package.name"));
-    println!("package.version = {:?}", config::get_str("package.version"));
+    // Read configuration from "Settings.toml"
+    c.merge(config::File::new("Settings", config::FileFormat::Toml)).unwrap();
+
+    println!("debug  = {:?}", c.get("debug"));
+    println!("pi     = {:?}", c.get("pi"));
+    println!("weight = {:?}", c.get("weight"));
 }
diff --git a/examples/file-yaml/src/main.rs b/examples/file-yaml/src/main.rs
index cd3286f..6d72976 100644
--- a/examples/file-yaml/src/main.rs
+++ b/examples/file-yaml/src/main.rs
@@ -1,10 +1,12 @@
 extern crate config;
 
 fn main() {
+    let mut c = config::Config::new();
+
     // Read configuration from "Settings.yaml"
-    config::merge(config::File::new("Settings", config::FileFormat::Yaml)).unwrap();
+    c.merge(config::File::new("Settings", config::FileFormat::Yaml)).unwrap();
 
-    println!("debug  = {:?}", config::get("debug"));
-    println!("pi     = {:?}", config::get("pi"));
-    println!("weight = {:?}", config::get("weight"));
+    println!("debug  = {:?}", c.get("debug"));
+    println!("pi     = {:?}", c.get("pi"));
+    println!("weight = {:?}", c.get("weight"));
 }