Go back to the old matrix but include the named builds

.travis.yml

@@ -7,7 +7,7 @@ addons:
       - libssl-dev
 cache:
   directories:
-  - $HOME/.cargo
+    - $HOME/.cargo
 env:
   - ELEFREN_FEATURES="--features toml"
   - ELEFREN_FEATURES="--features json"
@@ -20,23 +20,21 @@ rust:
   - stable
   - beta
   - nightly
-before_script:
-  - |
-    if [[ "$TRAVIS_RUST_VERSION" == "nightly"* ]]; then rustup component add rustfmt-preview; fi
-before_cache:
-  - |
-    if [[ "$TRAVIS_RUST_VERSION" == "nightly"* ]] 2> /dev/null && [ -z "$ELEFREN_FEATURES" ] 2>/dev/null && [[ "$TRAVIS_OS_NAME" == "linux" ]] 2>/dev/null; then
-      RUSTFLAGS="--cfg procmacro2_semver_exempt" cargo install -f cargo-tarpaulin
-    fi
 script:
-  - |
-    if [[ "$TRAVIS_RUST_VERSION" == "nightly"* ]]; then cargo fmt --all -- --check; fi
   - cargo test $ELEFREN_FEATURES
-after_success: |
-  if [[ "$TRAVIS_RUST_VERSION" == "nightly"* ]] 2> /dev/null && [ -z "$ELEFREN_FEATURES" ] 2>/dev/null && [[ "$TRAVIS_OS_NAME" == "linux" ]]; then
-    cargo tarpaulin --ciserver travis-ci --coveralls $TRAVIS_JOB_ID --features toml
-  fi
 matrix:
+  include:
+    - name: "Coverage"
+      rust: nightly
+      before_cache: RUSTFLAGS="--cfg procmacro2_semver_exempt" cargo install -f cargo-tarpaulin
+      script: cargo build --features all
+      after_success: cargo tarpaulin --ciserver travis-ci --coveralls $TRAVIS_JOB_ID --features all
+
+    - name: "rustfmt"
+      rust: nightly
+      before_script: rustup component add rustfmt-preview
+      script: cargo fmt --all -- check
+
   allow_failures:
     - rust: nightly
 notifications: