Merge branch 'master' into stage-0.9.0

appveyor.yml

@@ -2,28 +2,58 @@ environment:
   TRAVIS_CARGO_NIGHTLY_FEATURE: nightly
   RUST_TEST_THREADS: 1
   matrix:
-  - TARGET: nightly-x86_64-pc-windows-msvc
-  - TARGET: nightly-i686-pc-windows-msvc
-  - TARGET: nightly-x86_64-pc-windows-gnu
-  - TARGET: nightly-i686-pc-windows-gnu
-  - TARGET: 1.31.0-x86_64-pc-windows-msvc
-  - TARGET: 1.31.0-i686-pc-windows-msvc
-  - TARGET: 1.31.0-x86_64-pc-windows-gnu
-  - TARGET: 1.31.0-i686-pc-windows-gnu
+  - TARGET: x86_64-pc-windows-msvc
+    MSYSTEM: MINGW64
+    CPU: x86_64
+    TOOLCHAIN: nightly
+    FEATURES: nightly
+  - TARGET: i686-pc-windows-msvc
+    MSYSTEM: MINGW32
+    CPU: i686
+    TOOLCHAIN: nightly
+    FEATURES: nightly
+  - TARGET: x86_64-pc-windows-gnu
+    MSYSTEM: MINGW64
+    CPU: x86_64
+    TOOLCHAIN: nightly
+    FEATURES: nightly
+  - TARGET: i686-pc-windows-gnu
+    MSYSTEM: MINGW32
+    CPU: i686
+    TOOLCHAIN: nightly
+    FEATURES: nightly
+  - TARGET: x86_64-pc-windows-msvc
+    MSYSTEM: MINGW64
+    CPU: x86_64
+    TOOLCHAIN: 1.32.0
+  - TARGET: i686-pc-windows-msvc
+    MSYSTEM: MINGW32
+    CPU: i686
+    TOOLCHAIN: 1.32.0
+  - TARGET: x86_64-pc-windows-gnu
+    MSYSTEM: MINGW64
+    CPU: x86_64
+    TOOLCHAIN: 1.32.0
+  - TARGET: i686-pc-windows-gnu
+    MSYSTEM: MINGW32
+    CPU: i686
+    TOOLCHAIN: 1.32.0
 
 install:
-  - SET PATH=C:\Python27;C:\Python27\Scripts;%PATH%;%APPDATA%\Python\Scripts
-  - pip install "travis-cargo<0.2" --user
-  - ps: Start-FileDownload "https://static.rust-lang.org/dist/rust-${env:TARGET}.exe" -FileName "rust-install.exe"
-  - ps: .\rust-install.exe /VERYSILENT /NORESTART /DIR="C:\rust" | Out-Null
-  - ps: $env:PATH="$env:PATH;C:\rust\bin"
+  - set PATH=C:\msys64\%MSYSTEM%\bin;c:\msys64\usr\bin;%PATH%
+  - pacman --noconfirm -Syu mingw-w64-%CPU%-make
+  - appveyor-retry appveyor DownloadFile https://win.rustup.rs/ -FileName rustup-init.exe
+  - rustup-init.exe -y --default-host %TARGET% --default-toolchain %TOOLCHAIN%
+  - set PATH=%PATH%;C:\Users\appveyor\.cargo\bin
   - rustc -vV
   - cargo -vV
 
 build_script:
-  - travis-cargo build
+  - cargo build --features "%FEATURES%"
 
 test_script:
-  - travis-cargo test
-  - travis-cargo --only nightly test -- --features=deadlock_detection
-  - travis-cargo doc
+  - cargo test --all --features "%FEATURES%"
+  - cargo doc --all
+  - cd benchmark
+  - cargo run --release --bin mutex -- 2 1 0 1 2
+  - cargo run --release --bin rwlock -- 1 1 1 0 1 2