|
1 | 1 | use crate::errors::*; |
2 | 2 | use crate::tests::TestCase; |
3 | | -use reqwest; |
4 | 3 | use std::fs::{self, File, OpenOptions}; |
5 | 4 | use std::io::prelude::*; |
6 | 5 | use std::path::PathBuf; |
7 | 6 | use std::process::{Command, Output}; |
8 | 7 |
|
9 | | -static CRATES_ALL: &[&str] = &["bare-metal = \"0.2.0\"", "vcell = \"0.1.0\""]; |
10 | | -static CRATES_MSP430: &[&str] = &["msp430 = \"0.1.0\""]; |
11 | | -static CRATES_CORTEX_M: &[&str] = &["cortex-m = \"0.5.0\"", "cortex-m-rt = \"0.5.0\""]; |
12 | | -static CRATES_RISCV: &[&str] = &["riscv = \"0.4.0\"", "riscv-rt = \"0.4.0\""]; |
13 | | -static CRATES_XTENSALX6: &[&str] = &["xtensa-lx6-rt = \"0.2.0\"", "xtensa-lx6 = \"0.1.0\""]; |
14 | | -static PROFILE_ALL: &[&str] = &["[profile.dev]", "incremental = false"]; |
15 | | -static FEATURES_ALL: &[&str] = &["[features]"]; |
16 | | -static FEATURES_CORTEX_M: &[&str] = |
17 | | - &["const-fn = [\"bare-metal/const-fn\", \"cortex-m/const-fn\"]"]; |
18 | | -static FEATURES_EMPTY: &[&str] = &[]; |
| 8 | +const CRATES_ALL: &[&str] = &["bare-metal = \"0.2.0\"", "vcell = \"0.1.0\""]; |
| 9 | +const CRATES_MSP430: &[&str] = &["msp430 = \"0.2.2\""]; |
| 10 | +const CRATES_CORTEX_M: &[&str] = &["cortex-m = \"0.6.0\"", "cortex-m-rt = \"0.6.0\""]; |
| 11 | +const CRATES_RISCV: &[&str] = &["riscv = \"0.5.0\"", "riscv-rt = \"0.6.0\""]; |
| 12 | +const CRATES_XTENSALX6: &[&str] = &["xtensa-lx6-rt = \"0.2.0\"", "xtensa-lx6 = \"0.1.0\""]; |
| 13 | +const PROFILE_ALL: &[&str] = &["[profile.dev]", "incremental = false"]; |
| 14 | +const FEATURES_ALL: &[&str] = &["[features]"]; |
19 | 15 |
|
20 | 16 | fn path_helper(input: &[&str]) -> PathBuf { |
21 | 17 | input.iter().collect() |
@@ -137,19 +133,15 @@ pub fn test( |
137 | 133 | XtensaLX6 => CRATES_XTENSALX6.iter(), |
138 | 134 | }) |
139 | 135 | .chain(PROFILE_ALL.iter()) |
140 | | - .chain(FEATURES_ALL.iter()) |
141 | | - .chain(match &t.arch { |
142 | | - CortexM => FEATURES_CORTEX_M.iter(), |
143 | | - _ => FEATURES_EMPTY.iter(), |
144 | | - }); |
| 136 | + .chain(FEATURES_ALL.iter()); |
145 | 137 |
|
146 | 138 | for c in crates { |
147 | 139 | writeln!(file, "{}", c).chain_err(|| "Failed to append to file!")?; |
148 | 140 | } |
149 | 141 |
|
150 | 142 | // Download the SVD as specified in the URL |
151 | 143 | // TODO: Check for existing svd files? `--no-cache` flag? |
152 | | - let svd = reqwest::get(&t.svd_url()) |
| 144 | + let svd = reqwest::blocking::get(&t.svd_url()) |
153 | 145 | .chain_err(|| "Failed to get svd URL")? |
154 | 146 | .text() |
155 | 147 | .chain_err(|| "SVD is bad text")?; |
|
0 commit comments