Merge branch 'master' into fmt

This commit is contained in:
Maximilian Roos 2019-09-11 10:36:54 -04:00
commit 3c9a0e0e1a
No known key found for this signature in database
GPG Key ID: 3232F28BEDA66FCD
2 changed files with 2 additions and 2 deletions

View File

@ -21,5 +21,5 @@ steps:
rustc -Vv rustc -Vv
echo "##vso[task.prependpath]$HOME/.cargo/bin" echo "##vso[task.prependpath]$HOME/.cargo/bin"
displayName: Install Rust displayName: Install Rust
- bash: RUSTFLAGS="-D warnings" cargo test - bash: RUSTFLAGS="-D warnings" cargo test --all-features
displayName: Run tests displayName: Run tests

View File

@ -137,7 +137,7 @@ pub fn config(
let key = v.to_string(); let key = v.to_string();
if result.contains_key(&key) { if result.contains_key(&key) {
result.remove(&key); result.swap_remove(&key);
config::write(&result, &configuration)?; config::write(&result, &configuration)?;
} else { } else {
return Err(ShellError::string(&format!( return Err(ShellError::string(&format!(