Refine CI, use travis windows

.travis.yml

@@ -1,26 +1,37 @@
-language: rust
 sudo: false
+
+language: rust
+matrix:
+  include:
+    - os: linux
+      rust: stable
+    - os: linux
+      rust: nightly
+    - os: windows
+      rust: stable
+    - os: osx
+      rust: stable
 env:
   global:
     - RUST_BACKTRACE=1
-    - RUSTFLAGS="--deny=warnings"
+    - RUSTFLAGS="-D warnings"
 cache: cargo
-rust:
 
-matrix:
-  include:
-    - rust: stable
-      install:
-        - rustup component add rustfmt-preview
-        - rustup component add clippy-preview
-      before_script:
-        - cargo fmt --all -- --check
-        - cargo clippy --all -- -D clippy::all
-    - rust: nightly
+install:
+  - if [[ $TRAVIS_RUST_VERSION == "stable" && $TRAVIS_OS_NAME == "linux" ]]; then rustup component add rustfmt; fi
+  - if [[ $TRAVIS_RUST_VERSION == "stable" && $TRAVIS_OS_NAME == "linux" ]]; then rustup component add clippy; fi
 
 script:
+<<<<<<< HEAD
+  - if [[ $TRAVIS_RUST_VERSION == "stable" && $TRAVIS_OS_NAME == "linux" ]]; then cargo fmt -- --check; fi
+  - if [[ $TRAVIS_RUST_VERSION == "stable" && $TRAVIS_OS_NAME == "linux" ]]; then cargo clippy -- -D clippy::all; fi
+  - cargo test --all -- --nocapture
+  # Validate benches still work.
+  - cargo bench --all -- --test
+=======
   # Validate features and benches too.
   - cargo test --all -- --nocapture
   - cargo bench --all -- --test
   - cargo test --all --all-features -- --nocapture
   - cargo bench --all --all-features -- --test
+>>>>>>> master