edition 2018

Author: burrbull

CHANGELOG.md

@@ -7,6 +7,11 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 
 ## [Unreleased]
 
+- [breaking-change] `Defaults` field renamed on `RegisterProperties`
+  and added into `Peripheral` and `ClusterInfo`
+- Updated dependencies, use `Edition 2018`
+- Added missing `zeroToToggle`
+
 ## [v0.7.0] - 2019-01-11
 
 - [breaking-change] Major Refactor

Cargo.toml

@@ -6,6 +6,7 @@ keywords = ["CMSIS", "SVD", "parser"]
 license = "MIT OR Apache-2.0"
 name = "svd-parser"
 repository = "https://github.com/japaric/svd"
+edition = "2018"
 version = "0.7.0"
 
 [features]

src/elementext.rs

@@ -4,9 +4,9 @@
 use xmltree::Element;
 
 use failure::ResultExt;
-use types::{BoolParse, Parse};
+use crate::types::{BoolParse, Parse};
 
-use error::*;
+use crate::error::*;
 
 /// Defines extensions for implementation over xmltree::Element
 pub trait ElementExt {
@@ -16,7 +16,7 @@ pub trait ElementExt {
     fn get_child_text<K>(&self, k: K) -> Result<String, SVDError>
     where
         String: PartialEq<K>,
-        K: ::std::fmt::Display + Clone;
+        K: core::fmt::Display + Clone;
 
     fn get_text(&self) -> Result<String, SVDError>;
 
@@ -46,7 +46,7 @@ impl ElementExt for Element {
     fn get_child_text<K>(&self, k: K) -> Result<String, SVDError>
     where
         String: PartialEq<K>,
-        K: ::std::fmt::Display + Clone,
+        K: core::fmt::Display + Clone,
     {
         self.get_child_text_opt(k.clone())?.ok_or(
             SVDErrorKind::MissingTag(self.clone(), format!("{}", k)).into(),

src/error.rs

@@ -2,7 +2,7 @@
 //! This module defines error types and messages for SVD parsing and encoding
 
 use failure::{Backtrace, Context, Fail};
-use std::fmt::{self, Display};
+use core::fmt::{self, Display};
 use xmltree::{Element, ParseError};
 
 #[derive(Debug)]
@@ -50,7 +50,7 @@ pub enum SVDErrorKind {
         _1,
         _2
     )]
-    InvalidBooleanValue(Element, String, ::std::str::ParseBoolError),
+    InvalidBooleanValue(Element, String, core::str::ParseBoolError),
     #[fail(display = "encoding method not implemented for svd object {}", _0)]
     EncodeNotImplemented(String),
     #[fail(display = "Error parsing SVD XML")]

src/lib.rs

@@ -99,7 +99,7 @@ pub(crate) fn new_element(name: &str, text: Option<String>) -> Element {
 pub fn run_test<
     T: Parse<Error = SVDError, Object = T>
         + Encode<Error = SVDError>
-        + ::std::fmt::Debug
+        + core::fmt::Debug
         + PartialEq,
 >(
     tests: &[(T, &str)],
@@ -132,7 +132,7 @@ pub fn run_test<
 #[cfg(test)]
 mod tests {
     use super::*;
-    use std::str;
+    use core::str;
 
     #[test]
     fn test_trim_utf8_bom_from_str() {

src/parse.rs

@@ -3,7 +3,7 @@
 
 use xmltree::Element;
 
-use error::*;
+use crate::error::*;
 
 /// Parse trait allows SVD objects to be parsed from XML elements.
 pub trait Parse {
@@ -12,7 +12,7 @@ pub trait Parse {
     /// Parsing error
     type Error;
     /// Parse an XML/SVD element into it's corresponding `Object`.
-    fn parse(&Element) -> Result<Self::Object, Self::Error>;
+    fn parse(elem: &Element) -> Result<Self::Object, Self::Error>;
 }
 
 /// Parses an optional child element with the provided name and Parse function

src/svd/access.rs

@@ -1,12 +1,12 @@
 use xmltree::Element;
 
-use elementext::ElementExt;
+use crate::elementext::ElementExt;
 #[cfg(feature = "unproven")]
-use encode::Encode;
-use error::*;
+use crate::encode::Encode;
+use crate::error::*;
 #[cfg(feature = "unproven")]
-use new_element;
-use types::Parse;
+use crate::new_element;
+use crate::types::Parse;
 
 #[derive(Clone, Copy, Debug, PartialEq)]
 pub enum Access {
@@ -56,7 +56,7 @@ impl Encode for Access {
 #[cfg(feature = "unproven")]
 mod tests {
     use super::*;
-    use run_test;
+    use crate::run_test;
 
     #[test]
     fn decode_encode() {

src/svd/addressblock.rs

@@ -1,16 +1,16 @@
 #[cfg(feature = "unproven")]
 use std::collections::HashMap;
 
-use elementext::ElementExt;
+use crate::elementext::ElementExt;
 use xmltree::Element;
 
-use types::Parse;
+use crate::types::Parse;
 
 #[cfg(feature = "unproven")]
-use encode::Encode;
-use error::SVDError;
+use crate::encode::Encode;
+use crate::error::SVDError;
 #[cfg(feature = "unproven")]
-use new_element;
+use crate::new_element;
 
 #[derive(Clone, Debug, PartialEq)]
 pub struct AddressBlock {
@@ -57,7 +57,7 @@ impl Encode for AddressBlock {
 #[cfg(feature = "unproven")]
 mod tests {
     use super::*;
-    use run_test;
+    use crate::run_test;
 
     #[test]
     fn decode_encode() {

src/svd/bitrange.rs

@@ -1,10 +1,10 @@
 use failure::ResultExt;
 use xmltree::Element;
 
-use error::*;
+use crate::error::*;
 #[cfg(feature = "unproven")]
-use new_element;
-use types::Parse;
+use crate::new_element;
+use crate::types::Parse;
 
 #[derive(Clone, Copy, Debug, PartialEq)]
 pub struct BitRange {

src/svd/cluster.rs

@@ -1,15 +1,17 @@
-use std::ops::Deref;
+use core::ops::Deref;
 use xmltree::Element;
 
-use types::Parse;
+use crate::types::Parse;
 
 #[cfg(feature = "unproven")]
-use elementext::ElementExt;
+use crate::elementext::ElementExt;
 #[cfg(feature = "unproven")]
-use encode::Encode;
-use error::*;
-use svd::clusterinfo::ClusterInfo;
-use svd::registerclusterarrayinfo::RegisterClusterArrayInfo;
+use crate::encode::Encode;
+use crate::error::*;
+use crate::svd::{
+    clusterinfo::ClusterInfo,
+    registerclusterarrayinfo::RegisterClusterArrayInfo,
+};
 
 #[derive(Clone, Debug, PartialEq)]
 pub enum Cluster {