Fix executor panic (fix #653)

This commit is contained in:
Roey Darwish Dror
2021-02-27 06:41:55 +02:00
parent 23d9a5bf63
commit 5da219ed69
3 changed files with 9 additions and 4 deletions

View File

@@ -1,5 +1,5 @@
//! Utilities for command execution
use crate::error::TopgradeError;
use crate::error::{DryRun, TopgradeError};
use crate::utils::{Check, CheckWithCodes};
use anyhow::Result;
use log::{debug, trace};
@@ -270,7 +270,7 @@ impl CommandExt for Executor {
fn check_output(&mut self) -> Result<String> {
let output = match self.output()? {
ExecutorOutput::Wet(output) => output,
ExecutorOutput::Dry => unreachable!(),
ExecutorOutput::Dry => return Err(DryRun().into()),
};
let status = output.status;
if !status.success() {
@@ -283,7 +283,7 @@ impl CommandExt for Executor {
fn string_output(&mut self) -> Result<String> {
let output = match self.output()? {
ExecutorOutput::Wet(output) => output,
ExecutorOutput::Dry => unreachable!(),
ExecutorOutput::Dry => return Err(DryRun().into()),
};
Ok(String::from_utf8(output.stdout)?)
}