From 681dfb425e3b2bb26224047aaacf6356d31fe6c4 Mon Sep 17 00:00:00 2001
From: Fenrir <fenrirwolf@gmail.com>
Date: Fri, 1 Dec 2017 22:18:30 -0700
Subject: [PATCH] Update CI for Rust nightly-2017-12-01 + other fixes

---
 .travis.yml         | 5 ++---
 examples/3ds.json   | 1 +
 examples/Xargo.toml | 3 +--
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 037cd56..c68a806 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,7 +1,7 @@
 language: rust
 
 rust:
-   - nightly-2017-07-31
+   - nightly-2017-12-01
    - nightly
 
 matrix:
@@ -21,7 +21,7 @@ install:
    - ./devkitARMupdate.pl "$DEVKITPRO"
 
    # Install Xargo
-   - cargo install xargo --git https://github.com/FenrirWolf/xargo --rev metadata
+   - cargo install xargo --vers 0.3.8
 
    # Install Rust source
    - rustup component add rust-src
@@ -29,5 +29,4 @@ install:
    - popd
 
 script:
-   - (cd ctr-std && cargo build)
    - (cd examples && xargo build)
diff --git a/examples/3ds.json b/examples/3ds.json
index 6aea864..cfb91e9 100644
--- a/examples/3ds.json
+++ b/examples/3ds.json
@@ -5,6 +5,7 @@
   "ar": "arm-none-eabi-ar",
   "target-endian": "little",
   "target-pointer-width": "32",
+  "target-c-int-width": "32",
   "target-family": "unix",
   "arch": "arm",
   "os": "linux",
diff --git a/examples/Xargo.toml b/examples/Xargo.toml
index a91284d..5ef83cf 100644
--- a/examples/Xargo.toml
+++ b/examples/Xargo.toml
@@ -1,5 +1,4 @@
-[dependencies.collections]
-[dependencies.rand]
+[dependencies.alloc]
 [dependencies.panic_abort]
 [dependencies.panic_unwind]