Merge rust-embedded-community#2

2: s/Xargo/Cargo/ r=japaric a=japaric



Co-authored-by: Jorge Aparicio <jorge@japaric.io>

Author: bors[bot]

.travis.yml

@@ -20,10 +20,7 @@ after_script: set +e
 after_success:
   - bash ci/after_success.sh
 
-cache:
-  cargo: true
-  directories:
-    - $HOME/.xargo
+cache: cargo
 
 before_cache:
   # Travis can't cache files that are not readable by "others"

ci/install.sh

@@ -2,22 +2,7 @@ set -euxo pipefail
 
 main() {
     if [ $TARGET = thumbv7m-none-eabi ]; then
-        # This fetches latest stable release of Xargo
-        local tag=$(git ls-remote --tags --refs --exit-code https://github.com/japaric/xargo \
-                        | cut -d/ -f3 \
-                        | grep -E '^v[0.3.0-9.]+$' \
-                        | sort --version-sort \
-                        | tail -n1)
-
-        curl -LSfs https://japaric.github.io/trust/install.sh | \
-            sh -s -- \
-               --force \
-               --git japaric/xargo \
-               --tag $tag \
-               --target x86_64-unknown-linux-musl
-
-        rustup component list | grep 'rust-src.*installed' || \
-            rustup component add rust-src
+        rustup target add $TARGET
     fi
 }
 

ci/script.sh

@@ -1,13 +1,12 @@
 set -euxo pipefail
 
 main() {
+    cargo check --target $TARGET
+
     if [ $TARGET = x86_64-unknown-linux-gnu ]; then
-        cargo check --target $TARGET
         cargo test --target $TARGET
         return
     fi
-
-    xargo check --target $TARGET
 }
 
 if [ $TRAVIS_BRANCH != master ]; then