From 301c1becdfe7da185b3e5a2a67ce2ae6e60047ba Mon Sep 17 00:00:00 2001
From: Jorge Aparicio <jorge@japaric.io>
Date: Fri, 13 Apr 2018 16:26:16 +0200
Subject: [PATCH] drop Xargo

---
 .travis.yml   |  5 +----
 ci/install.sh | 18 +++---------------
 ci/script.sh  | 29 ++++++++++-------------------
 3 files changed, 14 insertions(+), 38 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index f284b373..dc743dfd 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -33,10 +33,7 @@ script:
 
 after_script: set +e
 
-cache:
-  cargo: true
-  directories:
-    - $HOME/.xargo
+cache: cargo
 
 before_cache:
   # Travis can't cache files that are not readable by "others"
diff --git a/ci/install.sh b/ci/install.sh
index 0da572af..3c419211 100644
--- a/ci/install.sh
+++ b/ci/install.sh
@@ -1,21 +1,9 @@
 set -euxo pipefail
 
 main() {
-    # install latest Xargo
-    local tag=$(git ls-remote --tags --refs --exit-code https://github.com/japaric/xargo \
-                    | cut -d/ -f3 \
-                    | grep -E '^v[0-9.]+$' \
-                    | sort --version-sort \
-                    | tail -n1)
-    curl -LSfs https://japaric.github.io/trust/install.sh | \
-        sh -s -- \
-           --force \
-           --git japaric/xargo \
-           --target x86_64-unknown-linux-musl \
-           --tag $tag
-
-    rustup component list | grep 'rust-src.*installed' || \
-        rustup component add rust-src
+    if [ $TARGET != x86_64-unknown-linux-gnu ]; then
+        rustup target add $TARGET
+    fi
 }
 
 main
diff --git a/ci/script.sh b/ci/script.sh
index 07260f43..386ceb1d 100644
--- a/ci/script.sh
+++ b/ci/script.sh
@@ -1,28 +1,19 @@
 set -euxo pipefail
 
 main() {
-    case $TARGET in
-        thumb*m-none-eabi)
-            xargo check --target $TARGET
-            ;;
-        x86_64-unknown-linux-gnu)
-            cargo check --target $TARGET
+    cargo check --target $TARGET
 
-            cargo test --target $TARGET
-            cargo test --target $TARGET --release
+    if [ $TARGET = x86_64-unknown-linux-gnu ]; then
+        cargo test --target $TARGET
+        cargo test --target $TARGET --release
 
-            export RUSTFLAGS="-Z sanitizer=thread"
-            export RUST_TEST_THREADS=1
-            export TSAN_OPTIONS="suppressions=$(pwd)/blacklist.txt"
+        export RUSTFLAGS="-Z sanitizer=thread"
+        export RUST_TEST_THREADS=1
+        export TSAN_OPTIONS="suppressions=$(pwd)/blacklist.txt"
 
-            cargo test --test tsan --target $TARGET
-            cargo test --test tsan --target $TARGET --release
-            ;;
-        *)
-            # unhandled case
-            exit 1
-            ;;
-    esac
+        cargo test --test tsan --target $TARGET
+        cargo test --test tsan --target $TARGET --release
+    fi
 }
 
 main