Merge #77

77: cleanup install.sh & bump dependencies r=therealprof a=burrbull



Co-authored-by: Andrey Zgarbul <[email protected]>

Author: bors[bot]

Cargo.toml

@@ -12,6 +12,6 @@ version = "0.7.0"
 unproven = []
 
 [dependencies]
-either = "1.1.0"
-xmltree = "0.3.2"
-failure = "0.1.1"
+either = "1.5"
+xmltree = "0.8"
+failure = "0.1"

ci/install.sh

@@ -1,15 +1,11 @@
 set -ex
 
 main() {
-    curl https://sh.rustup.rs -sSf | \
-        sh -s -- -y --default-toolchain $TRAVIS_RUST_VERSION
-
-    curl -LSfs https://japaric.github.io/trust/install.sh | \
-        sh -s -- \
-           --force \
-           --git japaric/cross \
-           --tag v0.1.4 \
-           --target x86_64-unknown-linux-gnu
+    if [ -x "$(command -v cross)" ]; then
+        cross -V
+    else
+        cargo install cross
+    fi
 }
 
 main

src/lib.rs

@@ -64,7 +64,7 @@ pub fn parse(xml: &str) -> Result<Device, SVDError> {
 pub fn encode(d: &Device) -> Result<String, SVDError> {
     let root = d.encode()?;
     let mut wr = Vec::new();
-    root.write(&mut wr);
+    root.write(&mut wr).unwrap();
     Ok(String::from_utf8(wr).unwrap())
 }
 
@@ -81,6 +81,9 @@ fn trim_utf8_bom(s: &str) -> &str {
 #[cfg(feature = "unproven")]
 pub(crate) fn new_element(name: &str, text: Option<String>) -> Element {
     Element {
+        prefix: None,
+        namespace: None,
+        namespaces: None,
         name: String::from(name),
         attributes: HashMap::new(),
         children: Vec::new(),

src/svd/addressblock.rs

@@ -38,6 +38,9 @@ impl Encode for AddressBlock {
 
     fn encode(&self) -> Result<Element, SVDError> {
         Ok(Element {
+            prefix: None,
+            namespace: None,
+            namespaces: None,
             name: String::from("addressBlock"),
             attributes: HashMap::new(),
             children: vec![

src/svd/cpu.rs

@@ -54,6 +54,9 @@ impl Encode for Cpu {
 
     fn encode(&self) -> Result<Element, SVDError> {
         Ok(Element {
+            prefix: None,
+            namespace: None,
+            namespaces: None,
             name: String::from("cpu"),
             attributes: HashMap::new(),
             children: vec![

src/svd/device.rs

@@ -66,6 +66,9 @@ impl Encode for Device {
 
     fn encode(&self) -> Result<Element, SVDError> {
         let mut elem = Element {
+            prefix: None,
+            namespace: None,
+            namespaces: None,
             name: String::from("device"),
             attributes: HashMap::new(),
             children: vec![new_element("name", Some(self.name.clone()))],
@@ -134,6 +137,9 @@ impl Encode for Device {
             .map(Peripheral::encode)
             .collect();
         elem.children.push(Element {
+            prefix: None,
+            namespace: None,
+            namespaces: None,
             name: String::from("peripherals"),
             attributes: HashMap::new(),
             children: peripherals?,

src/svd/endian.rs

@@ -48,6 +48,9 @@ impl Encode for Endian {
         };
 
         Ok(Element {
+            prefix: None,
+            namespace: None,
+            namespaces: None,
             name: String::from("endian"),
             attributes: HashMap::new(),
             children: Vec::new(),

src/svd/enumeratedvalue.rs

@@ -65,6 +65,9 @@ impl Encode for EnumeratedValue {
 
     fn encode(&self) -> Result<Element, SVDError> {
         let mut base = Element {
+            prefix: None,
+            namespace: None,
+            namespaces: None,
             name: String::from("enumeratedValue"),
             attributes: HashMap::new(),
             children: vec![new_element("name", Some(self.name.clone()))],

src/svd/enumeratedvalues.rs

@@ -62,6 +62,9 @@ impl Encode for EnumeratedValues {
 
     fn encode(&self) -> Result<Element, SVDError> {
         let mut base = Element {
+            prefix: None,
+            namespace: None,
+            namespaces: None,
             name: String::from("enumeratedValues"),
             attributes: HashMap::new(),
             children: Vec::new(),

src/svd/field.rs

@@ -91,6 +91,9 @@ impl Encode for Field {
         }
 
         let mut elem = Element {
+            prefix: None,
+            namespace: None,
+            namespaces: None,
             name: String::from("field"),
             attributes: HashMap::new(),
             children,