Merge pull request #278 from Kerollmops/master

Add the preserve_order feature (rebased version)

.travis.yml

@@ -16,6 +16,7 @@ matrix:
           branch: master
 script:
   - cargo test
+  - cargo test --features preserve_order
   - cargo test --manifest-path test-suite/Cargo.toml
   - rustdoc --test README.md -L target
 notifications:

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "toml"
-version = "0.4.10"
+version = "0.5.0"
 authors = ["Alex Crichton <alex@alexcrichton.com>"]
 license = "MIT/Apache-2.0"
 readme = "README.md"
@@ -23,7 +23,16 @@ travis-ci = { repository = "alexcrichton/toml-rs" }
 
 [dependencies]
 serde = "1.0"
+linked-hash-map = { version = "0.5", optional = true }
 
 [dev-dependencies]
 serde_derive = "1.0"
 serde_json = "1.0"
+
+[features]
+default = []
+
+# Use LinkedHashMap rather than BTreeMap as the map type of toml::Value.
+# This allows data to be read into a Value and written back to a TOML string
+# while preserving the order of map keys in the input.
+preserve_order = ["linked-hash-map"]

src/lib.rs

@@ -153,7 +153,10 @@
 
 #[macro_use]
 extern crate serde;
+#[cfg(feature = "preserve_order")]
+extern crate linked_hash_map;
 
+pub mod map;
 pub mod value;
 #[doc(no_inline)]
 pub use value::Value;