Merge #472

472: Update svd2rust-regress once again r=adamgreig a=therealprof

This bumps the arch dependencies to the current level, removes the
"const-fn" flag support and uses newer reqwest and rayon dependencies
to get rid of some 50 crate dependencies.

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

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

Author: bors[bot]

ci/svd2rust-regress/Cargo.toml

@@ -5,8 +5,8 @@ version = "0.1.0"
 authors = ["James Munns <[email protected]>", "The svd2rust developers"]
 
 [dependencies]
-reqwest = "0.9"
-rayon = "1.1"
+reqwest = { version = "0.10", features= ["blocking"] }
+rayon = "1.4"
 structopt = "0.2"
 error-chain = "0.12"
 inflections = "1.1"

ci/svd2rust-regress/src/svd_test.rs

@@ -1,21 +1,17 @@
 use crate::errors::*;
 use crate::tests::TestCase;
-use reqwest;
 use std::fs::{self, File, OpenOptions};
 use std::io::prelude::*;
 use std::path::PathBuf;
 use std::process::{Command, Output};
 
-static CRATES_ALL: &[&str] = &["bare-metal = \"0.2.0\"", "vcell = \"0.1.0\""];
-static CRATES_MSP430: &[&str] = &["msp430 = \"0.1.0\""];
-static CRATES_CORTEX_M: &[&str] = &["cortex-m = \"0.5.0\"", "cortex-m-rt = \"0.5.0\""];
-static CRATES_RISCV: &[&str] = &["riscv = \"0.4.0\"", "riscv-rt = \"0.4.0\""];
-static CRATES_XTENSALX6: &[&str] = &["xtensa-lx6-rt = \"0.2.0\"", "xtensa-lx6 = \"0.1.0\""];
-static PROFILE_ALL: &[&str] = &["[profile.dev]", "incremental = false"];
-static FEATURES_ALL: &[&str] = &["[features]"];
-static FEATURES_CORTEX_M: &[&str] =
-    &["const-fn = [\"bare-metal/const-fn\", \"cortex-m/const-fn\"]"];
-static FEATURES_EMPTY: &[&str] = &[];
+const CRATES_ALL: &[&str] = &["bare-metal = \"0.2.0\"", "vcell = \"0.1.0\""];
+const CRATES_MSP430: &[&str] = &["msp430 = \"0.2.2\""];
+const CRATES_CORTEX_M: &[&str] = &["cortex-m = \"0.6.0\"", "cortex-m-rt = \"0.6.0\""];
+const CRATES_RISCV: &[&str] = &["riscv = \"0.5.0\"", "riscv-rt = \"0.6.0\""];
+const CRATES_XTENSALX6: &[&str] = &["xtensa-lx6-rt = \"0.2.0\"", "xtensa-lx6 = \"0.1.0\""];
+const PROFILE_ALL: &[&str] = &["[profile.dev]", "incremental = false"];
+const FEATURES_ALL: &[&str] = &["[features]"];
 
 fn path_helper(input: &[&str]) -> PathBuf {
     input.iter().collect()
@@ -137,19 +133,15 @@ pub fn test(
             XtensaLX => CRATES_XTENSALX6.iter(),
         })
         .chain(PROFILE_ALL.iter())
-        .chain(FEATURES_ALL.iter())
-        .chain(match &t.arch {
-            CortexM => FEATURES_CORTEX_M.iter(),
-            _ => FEATURES_EMPTY.iter(),
-        });
+        .chain(FEATURES_ALL.iter());
 
     for c in crates {
         writeln!(file, "{}", c).chain_err(|| "Failed to append to file!")?;
     }
 
     // Download the SVD as specified in the URL
     // TODO: Check for existing svd files? `--no-cache` flag?
-    let svd = reqwest::get(&t.svd_url())
+    let svd = reqwest::blocking::get(&t.svd_url())
         .chain_err(|| "Failed to get svd URL")?
         .text()
         .chain_err(|| "SVD is bad text")?;