Merge #320

320: ed2018 for generated code r=therealprof a=burrbull

Newer deps in tests.

r? @therealprof 

Co-authored-by: Andrey Zgarbul <zgarbul.andrey@gmail.com>

Author: bors[bot]

ci/script.sh

@@ -48,8 +48,8 @@ main() {
 
     # test crate
     cargo init --name foo $td
-    echo 'cortex-m = "0.5.0"' >> $td/Cargo.toml
-    echo 'cortex-m-rt = "0.5.0"' >> $td/Cargo.toml
+    echo 'cortex-m = "0.6.0"' >> $td/Cargo.toml
+    echo 'cortex-m-rt = "0.6.9"' >> $td/Cargo.toml
     echo 'vcell = "0.1.0"' >> $td/Cargo.toml
     echo '[profile.dev]' >> $td/Cargo.toml
     echo 'incremental = false' >> $td/Cargo.toml
@@ -418,10 +418,10 @@ main() {
             echo 'version = "0.1.0"' >> $td/Cargo.toml
 
             echo '[dependencies.riscv]' >> $td/Cargo.toml
-            echo 'version = "0.4.0"' >> $td/Cargo.toml
+            echo 'version = "0.5.0"' >> $td/Cargo.toml
 
             echo '[dependencies.riscv-rt]' >> $td/Cargo.toml
-            echo 'version = "0.4.0"' >> $td/Cargo.toml
+            echo 'version = "0.6.0"' >> $td/Cargo.toml
 
             (
                 cd $td &&

ci/svd2rust-regress/src/main.rs

@@ -189,7 +189,7 @@ fn main() {
 
     // Set RUSTUP_TOOLCHAIN if needed
     if let Some(toolchain) = &opt.rustup_toolchain {
-        ::std::env::set_var("RUSTUP_TOOLCHAIN", toolchain);
+        std::env::set_var("RUSTUP_TOOLCHAIN", toolchain);
     }
 
     // collect enabled tests

ci/svd2rust-regress/src/svd_test.rs

@@ -80,7 +80,7 @@ impl CommandHelper for Output {
 }
 
 pub fn test(t: &TestCase, bin_path: &PathBuf, rustfmt_bin_path: Option<&PathBuf>, nightly: bool, verbosity: u8) -> Result<Option<Vec<PathBuf>>> {
-    let user = match ::std::env::var("USER") {
+    let user = match std::env::var("USER") {
         Ok(val) => val,
         Err(_) => "rusttester".into(),
     };
@@ -89,7 +89,7 @@ pub fn test(t: &TestCase, bin_path: &PathBuf, rustfmt_bin_path: Option<&PathBuf>
     let chip_dir = path_helper(&["output", &t.name()]);
     if let Err(err) = fs::remove_dir_all(&chip_dir) {
         match err.kind() {
-            ::std::io::ErrorKind::NotFound => (),
+            std::io::ErrorKind::NotFound => (),
             _ => Err(err).chain_err(|| "While removing chip directory")?
         }
     }

src/generate/interrupt.rs

@@ -159,7 +159,7 @@ pub fn render(
             #(#variants)*
         }
 
-        unsafe impl ::bare_metal::Nr for Interrupt {
+        unsafe impl bare_metal::Nr for Interrupt {
             #[inline]
             fn nr(&self) -> u8 {
                 match *self {

src/generate/register.rs

@@ -177,7 +177,7 @@ pub fn render(
     out.push(quote! {
         #[doc = #description]
         pub struct #name_pc {
-            register: ::vcell::VolatileCell<#rty>
+            register: vcell::VolatileCell<#rty>
         }
 
         #[doc = #description]
@@ -343,7 +343,7 @@ pub fn fields(
 
                         mod_items.push(quote! {
                             #[doc = #desc]
-                            pub type #pc_r = ::#pmod_::#rmod_::#base_pc_r;
+                            pub type #pc_r = crate::#pmod_::#rmod_::#base_pc_r;
                         });
                     } else if let Some(register) = &base.register {
                         let mod_ = register.to_sanitized_snake_case();
@@ -603,11 +603,11 @@ pub fn fields(
                         mod_items.push(quote! {
                             #[doc = #pc_w_doc]
                             pub type #pc_w =
-                                ::#pmod_::#rmod_::#base_pc_w;
+                                crate::#pmod_::#rmod_::#base_pc_w;
                         });
 
                         quote! {
-                            ::#pmod_::#rmod_::#base_pc_w
+                            crate::#pmod_::#rmod_::#base_pc_w
                         }
                     } else if let Some(register) = &base.register {
                         let mod_ = register.to_sanitized_snake_case();