From 7b81af044eac45afa01478b47f4bf978353b627b Mon Sep 17 00:00:00 2001
From: Paolo Teti <paolo.teti@gmail.com>
Date: Sun, 25 Feb 2018 01:11:49 +0100
Subject: [PATCH] Keep mangled-names as a default feature

---
 ci/run.sh            | 14 ++++++++------
 testcrate/Cargo.toml |  1 +
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/ci/run.sh b/ci/run.sh
index 3196400..8ce706c 100755
--- a/ci/run.sh
+++ b/ci/run.sh
@@ -30,7 +30,8 @@ case $1 in
 
             RUSTFLAGS="-C debug-assertions=no -C lto" \
             CARGO_INCREMENTAL=0 \
-              $run --test $t --features 'no_std mem c' --no-run
+              $run --test $t --no-default-features \
+                   --features 'no_std mem c' --no-run
             qemu-arm-static target/${1}/debug/$t-*
 	done
 
@@ -38,16 +39,17 @@ case $1 in
             t=${t%.rs}
             RUSTFLAGS="-C lto" \
             CARGO_INCREMENTAL=0 \
-              $run --test $t --features 'no_std mem c' --no-run --release
+              $run --test $t --no-default-features \
+                   --features 'no_std mem c' --no-run --release
             qemu-arm-static target/${1}/release/$t-*
         done
         ;;
     *)
         run="cargo test --manifest-path testcrate/Cargo.toml --target $1"
-        $run --features mangled-names
-        $run --features mangled-names --release
-        $run --features 'mangled-names c'
-        $run --features 'mangled-names c' --release
+        $run
+        $run --release
+        $run --features c
+        $run --features c --release
         ;;
 esac
 
diff --git a/testcrate/Cargo.toml b/testcrate/Cargo.toml
index 7544d94..eae66ce 100644
--- a/testcrate/Cargo.toml
+++ b/testcrate/Cargo.toml
@@ -25,4 +25,5 @@ utest-macros = { git = "https://github.com/japaric/utest" }
 c = ["compiler_builtins/c"]
 mem = ["compiler_builtins/mem"]
 mangled-names = ["compiler_builtins/mangled-names"]
+default = ["mangled-names"]
 no_std = []