Merge branch master into reem:carllerche-entry_iter

Conflicts:
    src/lib.rs

Author: dtolnay

.travis.yml

@@ -3,12 +3,14 @@ sudo: false
 matrix:
     include:
         - rust: beta
+          env: FEATURES="serde_impl"
         - rust: nightly
-          env: FEATURES="--features nightly"
+          env: FEATURES="serde_impl nightly clippy"
+        - rust: stable
 script:
-    - cargo build $FEATURES
-    - cargo test $FEATURES
-    - cargo doc --no-deps $FEATURES
+    - cargo build --features "$FEATURES"
+    - cargo test --features "$FEATURES"
+    - cargo doc --no-deps --features "$FEATURES"
 after_success: |
     [ $TRAVIS_RUST_VERSION = nightly ] &&
     [ $TRAVIS_BRANCH = master ] &&

Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 
 name = "linked-hash-map"
-version = "0.0.8"
+version = "0.4.0"
 license = "MIT/Apache-2.0"
 description = "A HashMap wrapper that holds key-value pairs in insertion order"
 authors = [
@@ -17,3 +17,9 @@ readme = "README.md"
 
 [features]
 nightly = []
+serde_impl = ["serde", "serde_test"]
+
+[dependencies]
+clippy = { version = "0.*", optional = true }
+serde = { version = "0.9", optional = true }
+serde_test = { version = "0.9", optional = true }

deploy-docs.sh

@@ -10,11 +10,9 @@ git init
 git config user.email 'FlashCat@users.noreply.github.com'
 git config user.name 'FlashCat'
 git remote add upstream "https://${GH_TOKEN}@github.com/${TRAVIS_REPO_SLUG}.git"
-git fetch upstream gh-pages
-git reset upstream/gh-pages
 
 touch .
 
 git add -A .
-git commit -m "rebuild pages at ${rev}"
-git push -q upstream HEAD:gh-pages
+git commit -qm "rebuild pages at ${rev}"
+git push -q upstream HEAD:gh-pages --force