don't use unstable features, and test on nightly

Author: Jorge Aparicio

.travis.yml

@@ -3,8 +3,6 @@ language: rust
 services: docker
 sudo: required
 
-rust: stable
-
 env:
   global:
     - CRATE_NAME=svd2rust
@@ -14,16 +12,20 @@ matrix:
   include:
     # Linux
     - env: TARGET=i686-unknown-linux-gnu DISABLE_TESTS=1
-    - env: TARGET=i686-unknown-linux-musl
-    # - env: TARGET=x86_64-unknown-linux-gnu  # this is the default job
-    - env: TARGET=x86_64-unknown-linux-musl
+    - env: TARGET=i686-unknown-linux-musl DISABLE_TESTS=1
+    - env: TARGET=x86_64-unknown-linux-gnu  DISABLE_TESTS=1
+    - env: TARGET=x86_64-unknown-linux-musl DISABLE_TESTS=1
 
     # OSX
-    - env: TARGET=i686-apple-darwin
+    - env: TARGET=i686-apple-darwin DISABLE_TESTS=1
       os: osx
-    - env: TARGET=x86_64-apple-darwin
+    - env: TARGET=x86_64-apple-darwin DISABLE_TESTS=1
       os: osx
 
+    # Nightly, for testing
+    - env: TARGET=x86_64-unknown-linux-gnu
+      rust: nightly
+
 install:
   - sh ci/install.sh
   - source ~/.cargo/env || true

src/generate.rs

@@ -1,3 +1,4 @@
+use std::collections::HashMap;
 use std::io::{self, Write};
 
 use cast::u64;
@@ -40,11 +41,12 @@ pub fn device(d: &Device, items: &mut Vec<Tokens>) -> Result<()> {
 
 /// Generates code for `src/interrupt.rs`
 pub fn interrupt(peripherals: &[Peripheral], items: &mut Vec<Tokens>) {
-    let mut interrupts =
-        peripherals.iter().flat_map(|p| p.interrupt.iter()).collect::<Vec<_>>();
+    let interrupts = peripherals.iter()
+        .flat_map(|p| p.interrupt.iter())
+        .map(|i| (i.value, i))
+        .collect::<HashMap<_, _>>();
 
-    interrupts.sort_by_key(|i| i.value);
-    interrupts.dedup_by_key(|i| i.value);
+    let interrupts = interrupts.into_iter().map(|(_, v)| v).collect::<Vec<_>>();
 
     let mut fields = vec![];
     let mut exprs = vec![];
@@ -492,12 +494,12 @@ pub fn fields(
                 description.push_str(&*util::respace(d));
             }
             Ok(F {
-                   _pc_w,
-                   _sc,
-                   description,
-                   pc_r,
-                   pc_w,
-                   width,
+                   _pc_w: _pc_w,
+                   _sc: _sc,
+                   description: description,
+                   pc_r: pc_r,
+                   pc_w: pc_w,
+                   width: width,
                    access: f.access,
                    evs: &f.enumerated_values,
                    sc: Ident::new(&*sc),
@@ -560,11 +562,11 @@ pub fn fields(
                                     ev.name)
                         })?);
                         Ok(Variant {
-                            description,
-                            sc,
+                            description: description,
+                            sc: sc,
                             pc: Ident::new(&*ev.name
                                            .to_sanitized_pascal_case()),
-                            value,
+                            value: value,
                         })
                     })
                     .collect::<Result<Vec<_>>>()?;

src/util.rs

@@ -374,7 +374,7 @@ fn lookup_in_register<'r>
             if matches.len() == 1 {
                 return Ok((evs,
                            Some(Base {
-                                    field,
+                                    field: field,
                                     register: None,
                                 })));
             } else {