From 7b431be2f77951de25401d10678d438a9c6cda19 Mon Sep 17 00:00:00 2001
From: DJMcNab <36049421+DJMcNab@users.noreply.github.com>
Date: Sat, 29 Dec 2018 10:25:53 +0000
Subject: Deny warnings on CI (#329)

---
 .travis.yml | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 5e11cbd2f..1b8cf2c44 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -13,7 +13,9 @@ build: &rust_build
   script:
     - cargo gen-tests --verify
     - cargo gen-syntax --verify
-    - cargo test
+    - RUSTFLAGS='-D warnings' cargo test
+  env:
+    RUSTFLAGS: '-D warnings'
 
 matrix:
   include:
@@ -33,6 +35,9 @@ matrix:
       <<: *rust_build
 
   allow_failures:
+    # Because Travis-Windows-Rust can be flaky
+    # We still support Windows and want the tests to be succeeding,
+    # but there are too few spurious failures
     - os: windows
 
 branches:
-- 
cgit v1.2.3


From f4364993f937201ad258c38b04d54b9b5b007b81 Mon Sep 17 00:00:00 2001
From: DJMcNab <36049421+DJMcNab@users.noreply.github.com>
Date: Sat, 29 Dec 2018 10:26:52 +0000
Subject: Change typo of few to many

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 1b8cf2c44..bd15d39c1 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -37,7 +37,7 @@ matrix:
   allow_failures:
     # Because Travis-Windows-Rust can be flaky
     # We still support Windows and want the tests to be succeeding,
-    # but there are too few spurious failures
+    # but there are too many spurious failures
     - os: windows
 
 branches:
-- 
cgit v1.2.3


From 5dbab814813134f45ba186819bc81b822e62d9fb Mon Sep 17 00:00:00 2001
From: DJMcNab <36049421+DJMcNab@users.noreply.github.com>
Date: Sat, 29 Dec 2018 10:31:20 +0000
Subject: Reformat .travis.yml (using the vscode prettier extension)

TODO: Check this on CI. Maybe we should change the prettier script
in `editors/code`, or move it to somewhere else
(`tests/format` maybe)
Editing the script in editors/code would be easiest as
that means we don't have to double install some shared `node_modules`
---
 .travis.yml | 70 ++++++++++++++++++++++++++++++-------------------------------
 1 file changed, 35 insertions(+), 35 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index bd15d39c1..a9e4d43b6 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,47 +1,47 @@
 cache: cargo
 before_cache:
-  - find ./target/debug -type f -maxdepth 1 -delete
-  - rm -fr ./target/debug/{deps,.fingerprint}/{*ra_*,*test*,*tools*,*gen_lsp*,*thread_worker*}
-  - rm -f  ./target/.rustc_info.json
+    - find ./target/debug -type f -maxdepth 1 -delete
+    - rm -fr ./target/debug/{deps,.fingerprint}/{*ra_*,*test*,*tools*,*gen_lsp*,*thread_worker*}
+    - rm -f  ./target/.rustc_info.json
 
 env:
-  - CARGO_INCREMENTAL=0
+    - CARGO_INCREMENTAL=0
 
 build: &rust_build
-  language: rust
-  rust: 1.31.1
-  script:
-    - cargo gen-tests --verify
-    - cargo gen-syntax --verify
-    - RUSTFLAGS='-D warnings' cargo test
-  env:
-    RUSTFLAGS: '-D warnings'
+    language: rust
+    rust: 1.31.1
+    script:
+        - cargo gen-tests --verify
+        - cargo gen-syntax --verify
+        - RUSTFLAGS='-D warnings' cargo test
+    env:
+        RUSTFLAGS: -D warnings
 
 matrix:
-  include:
-    - os: linux
-      <<: *rust_build
-    - language: node_js
-      node_js: node
-      before_script: false
-      script:
-        - cd editors/code && npm ci && npm run travis
+    include:
+        - os: linux
+          <<: *rust_build
+        - language: node_js
+          node_js: node
+          before_script: false
+          script:
+              - cd editors/code && npm ci && npm run travis
 
-    - 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
+        - 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
 
-  allow_failures:
-    # Because Travis-Windows-Rust can be flaky
-    # We still support Windows and want the tests to be succeeding,
-    # but there are too many spurious failures
-    - os: windows
+    allow_failures:
+        # Because Travis-Windows-Rust can be flaky
+        # We still support Windows and want the tests to be succeeding,
+        # but there are too many spurious failures
+        - os: windows
 
 branches:
-  only:
-    - staging
-    - master
-    - trying
+    only:
+        - staging
+        - master
+        - trying
-- 
cgit v1.2.3


From ab36ef7733d0db3a6584b3cce2dba4e09d7f1c71 Mon Sep 17 00:00:00 2001
From: DJMcNab <36049421+DJMcNab@users.noreply.github.com>
Date: Sat, 29 Dec 2018 10:49:40 +0000
Subject: Remove duplicated env var

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index a9e4d43b6..f79690750 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -13,7 +13,7 @@ build: &rust_build
     script:
         - cargo gen-tests --verify
         - cargo gen-syntax --verify
-        - RUSTFLAGS='-D warnings' cargo test
+        - cargo test
     env:
         RUSTFLAGS: -D warnings
 
-- 
cgit v1.2.3


From 3fb02c85d1bc75ef1734b38e24126afbfea1e871 Mon Sep 17 00:00:00 2001
From: DJMcNab <36049421+DJMcNab@users.noreply.github.com>
Date: Sat, 29 Dec 2018 11:11:51 +0000
Subject: Readd quotes to `-D warnings`

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index f79690750..47f3424df 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -15,7 +15,7 @@ build: &rust_build
         - cargo gen-syntax --verify
         - cargo test
     env:
-        RUSTFLAGS: -D warnings
+        RUSTFLAGS: "-D warnings"
 
 matrix:
     include:
-- 
cgit v1.2.3


From e7863d979f491839e520c7bd3660669260668b4e Mon Sep 17 00:00:00 2001
From: DJMcNab <36049421+DJMcNab@users.noreply.github.com>
Date: Sat, 29 Dec 2018 11:37:25 +0000
Subject: Use a different format for env vars

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 47f3424df..183409acd 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -15,7 +15,7 @@ build: &rust_build
         - cargo gen-syntax --verify
         - cargo test
     env:
-        RUSTFLAGS: "-D warnings"
+        - RUSTFLAGS="-D warnings"
 
 matrix:
     include:
-- 
cgit v1.2.3