use new translate_offset_with_edit for TryConvWith

[rust.git] / .travis.yml

diff --git a/.travis.yml b/.travis.yml
index 49d53859d81f810fbea7bf1419104650b9aeee53..5e11cbd2f06d5a354d10d09b3cdf31a82ffe1ba2 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,14 +1,15 @@
 cache: cargo
 before_cache:
   - find ./target/debug -type f -maxdepth 1 -delete
-  - rm -fr ./target/debug/{deps,.fingerprint}/{*ra_*,*test*}
+  - rm -fr ./target/debug/{deps,.fingerprint}/{*ra_*,*test*,*tools*,*gen_lsp*,*thread_worker*}
+  - rm -f  ./target/.rustc_info.json
 
 env:
   - CARGO_INCREMENTAL=0
 
 build: &rust_build
   language: rust
-  rust: beta
+  rust: 1.31.1
   script:
     - cargo gen-tests --verify
     - cargo gen-syntax --verify
@@ -18,28 +19,21 @@ matrix:
   include:
     - os: linux
       <<: *rust_build
-    # - language: rust
-    #   rust: nightly
-    #   before_script:
-    #     - rustup component add clippy-preview
-    #     - rustup component add rustfmt-preview
-    #   script:
-    #     - cargo fmt --all -- --check || true
-    #     - cargo clippy
     - language: node_js
       node_js: node
       before_script: false
       script:
         - cd editors/code && npm ci && npm run travis
 
-  allow_failures:
     - os: windows
       if: branch = master
       before_script:
         - dos2unix ./crates/ra_syntax/tests/data/parser/**/*.txt
         - dos2unix ./crates/ra_syntax/tests/data/parser/**/*.rs
       <<: *rust_build
-    - rust nightly
+
+  allow_failures:
+    - os: windows
 
 branches:
   only: