Merge #281

281: Edition-2018-ify svd2rust r=ryankurte a=therealprof

Signed-off-by: Daniel Egger <[email protected]>

Co-authored-by: Daniel Egger <[email protected]>

Author: bors[bot]

Cargo.toml

@@ -1,4 +1,5 @@
 [package]
+edition = "2018"
 authors = ["Jorge Aparicio <[email protected]>"]
 build = "build.rs"
 categories = [

build.rs

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

src/generate/device.rs

@@ -1,12 +1,12 @@
 use quote::Tokens;
-use svd::Device;
+use crate::svd::Device;
 use syn::Ident;
 
-use errors::*;
-use util::{self, ToSanitizedUpperCase};
-use Target;
+use crate::errors::*;
+use crate::util::{self, ToSanitizedUpperCase};
+use crate::Target;
 
-use generate::{interrupt, peripheral};
+use crate::generate::{interrupt, peripheral};
 
 /// Whole device generation
 pub fn render(

src/generate/interrupt.rs

@@ -3,12 +3,12 @@ use std::fmt::Write;
 
 use cast::u64;
 use quote::Tokens;
-use svd::Peripheral;
+use crate::svd::Peripheral;
 use syn::Ident;
 
-use errors::*;
-use util::{self, ToSanitizedUpperCase};
-use Target;
+use crate::errors::*;
+use crate::util::{self, ToSanitizedUpperCase};
+use crate::Target;
 
 /// Generates code for `src/interrupt.rs`
 pub fn render(

src/generate/peripheral.rs

@@ -3,13 +3,13 @@ use std::cmp::Ordering;
 
 use either::Either;
 use quote::{ToTokens, Tokens};
-use svd::{Cluster, ClusterInfo, Defaults, Peripheral, Register};
+use crate::svd::{Cluster, ClusterInfo, Defaults, Peripheral, Register};
 use syn::{self, Ident};
 
-use errors::*;
-use util::{self, ToSanitizedSnakeCase, ToSanitizedUpperCase, BITS_PER_BYTE};
+use crate::errors::*;
+use crate::util::{self, ToSanitizedSnakeCase, ToSanitizedUpperCase, BITS_PER_BYTE};
 
-use generate::register;
+use crate::generate::register;
 
 pub fn render(
     p: &Peripheral,

src/generate/register.rs

@@ -1,12 +1,12 @@
 use cast::u64;
 use either::Either;
 use quote::Tokens;
-use svd::{Access, BitRange, Cluster, Defaults, EnumeratedValues, Field, Peripheral, Register,
+use crate::svd::{Access, BitRange, Cluster, Defaults, EnumeratedValues, Field, Peripheral, Register,
           Usage, WriteConstraint};
 use syn::Ident;
 
-use errors::*;
-use util::{self, ToSanitizedSnakeCase, ToSanitizedUpperCase, U32Ext};
+use crate::errors::*;
+use crate::util::{self, ToSanitizedSnakeCase, ToSanitizedUpperCase, U32Ext};
 
 pub fn render(
     register: &Register,

src/lib.rs

@@ -438,7 +438,7 @@ mod errors;
 mod generate;
 mod util;
 
-pub use util::Target;
+pub use crate::util::Target;
 
 pub struct Generation {
     pub lib_rs: String,

src/main.rs

@@ -21,8 +21,8 @@ use std::process;
 
 use clap::{App, Arg};
 
-use errors::*;
-use util::{build_rs, Target};
+use crate::errors::*;
+use crate::util::{build_rs, Target};
 
 fn run() -> Result<()> {
     use std::io::Read;

src/util.rs

@@ -2,11 +2,11 @@ use std::borrow::Cow;
 
 use either::Either;
 use inflections::Inflect;
+use crate::svd::{Access, Cluster, Register};
 use quote::Tokens;
-use svd::{Access, Cluster, Register};
 use syn::Ident;
 
-use errors::*;
+use crate::errors::*;
 
 pub const BITS_PER_BYTE: u32 = 8;
 
@@ -69,8 +69,8 @@ impl ToSanitizedSnakeCase for str {
                     abstract,
                     alignof,
                     as,
-                    async,
-                    await,
+                    r#async,
+                    r#await,
                     become,
                     box,
                     break,
@@ -110,7 +110,7 @@ impl ToSanitizedSnakeCase for str {
                     super,
                     trait,
                     true,
-                    try,
+                    r#try,
                     type,
                     typeof,
                     unsafe,