Auto merge of #158 - japaric:singletons, r=japaric

Peripherals as scoped singletons

See this RFC for details: #157

With this change device crates will need to depend on a version of the cortex-m crate that includes rust-embedded/cortex-m#65

### TODO

- [x] accept the RFC
- [ ] Check that non cortex-m targets still work
- [x] decide on better names for `Peripherals::{all,_all}`

.travis.yml

@@ -47,7 +47,7 @@ matrix:
       os: osx
 
 install:
-  - sh ci/install.sh
+  - bash ci/install.sh
 
 script:
   - bash ci/script.sh

Cargo.toml

@@ -19,7 +19,7 @@ keywords = [
 license = "MIT OR Apache-2.0"
 name = "svd2rust"
 repository = "https://github.com/japaric/svd2rust"
-version = "0.11.4"
+version = "0.12.0"
 
 [[bin]]
 doc = false

build.rs

@@ -33,38 +33,21 @@ fn commit_info() -> String {
 }
 
 fn commit_hash() -> Result<String, IgnoredError> {
-    Ok(
+    Ok(try!(String::from_utf8(
         try!(
-            String::from_utf8(
-                try!(
-                    Command::new("git")
-                        .args(&["rev-parse", "--short", "HEAD"])
-                        .output()
-                )
-                        .stdout,
-            )
-        ),
-    )
+            Command::new("git")
+                .args(&["rev-parse", "--short", "HEAD"])
+                .output()
+        ).stdout,
+    )))
 }
 
 fn commit_date() -> Result<String, IgnoredError> {
-    Ok(
+    Ok(try!(String::from_utf8(
         try!(
-            String::from_utf8(
-                try!(
-                    Command::new("git")
-                        .args(
-                            &[
-                                "log",
-                                "-1",
-                                "--date=short",
-                                "--pretty=format:%cd",
-                            ],
-                        )
-                        .output()
-                )
-                        .stdout,
-            )
-        ),
-    )
+            Command::new("git")
+                .args(&["log", "-1", "--date=short", "--pretty=format:%cd"])
+                .output()
+        ).stdout,
+    )))
 }

ci/install.sh

@@ -1,4 +1,4 @@
-set -ex
+set -euxo pipefail
 
 main() {
     local sort=
@@ -19,7 +19,7 @@ main() {
            --git japaric/cross \
            --tag $tag
 
-    if [ ! -z $VENDOR ]; then
+    if [ ! -z ${VENDOR-} ]; then
         curl -LSfs https://japaric.github.io/trust/install.sh | \
             sh -s -- \
                --crate rustfmt \

ci/script.sh

@@ -1,5 +1,4 @@
-set -ex
-set -o pipefail
+set -euxo pipefail
 
 test_svd() {
     (
@@ -15,9 +14,9 @@ test_svd() {
 }
 
 main() {
-    cross build --target $TARGET
+    cross check --target $TARGET
 
-    if [ -z $VENDOR ]; then
+    if [ -z ${VENDOR-} ]; then
         return
     fi
 
@@ -35,7 +34,7 @@ main() {
     # test crate
     cargo init --name foo $td
     echo 'bare-metal = "0.1.0"' >> $td/Cargo.toml
-    echo 'cortex-m = "0.3.0"' >> $td/Cargo.toml
+    echo 'cortex-m = { git = "https://github.com/japaric/cortex-m" }' >> $td/Cargo.toml
     echo 'cortex-m-rt = "0.3.0"' >> $td/Cargo.toml
     echo 'vcell = "0.1.0"' >> $td/Cargo.toml
 
@@ -609,6 +608,6 @@ main() {
     rm -rf $td
 }
 
-if [ -z $TRAVIS_TAG ]; then
+if [ -z ${TRAVIS_TAG-} ]; then
     main
 fi