fluencelabs/wasm-utils
1
0
Fork 0
mirror of https://github.com/fluencelabs/wasm-utils synced 2025-04-29 16:52:25 +00:00
Code Issues Projects Releases Wiki Activity

add some extended error handling

Browse Source
This commit is contained in:
NikVolf 2018-03-27 15:23:19 +03:00
parent e7235c6587
commit 0a141ce901
1 changed files with 21 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
build/main.rs
View File

@ -19,9 +19,9 @@ use utils::{CREATE_SYMBOL, CALL_SYMBOL, ununderscore_funcs, externalize_mem, shr
#[derive(Debug)] #[derive(Debug)]
pub enum Error { pub enum Error {
Io(io::Error), Io(io::Error),
FailedToCopy(String),
NoSuitableFile(String), NoSuitableFile(String),
TooManyFiles(String), TooManyFiles(String),
NoEnvVar,
} }
impl From<io::Error> for Error { impl From<io::Error> for Error {
@ -30,6 +30,18 @@ impl From<io::Error> for Error {
} }
} }
impl std::fmt::Display for Error {
fn fmt(&self, f: &mut std::fmt::Formatter) -> Result<(), std::fmt::Error> {
use Error::*;
match *self {
Io(ref io) => write!(f, "Generic i/o error: {}", io),
FailedToCopy(ref msg) => write!(f, "{}. Did you tried to run \"cargo build\"?", msg),
NoSuitableFile(ref file) => write!(f, "No suitable file to process here: {}. May be run \"cargo build\"?", file),
TooManyFiles(ref file) => write!(f, "To many files to process in there: {}. May be try \"cargo clean\" and then \"cargo build\"?", file),
}
}
}
pub fn wasm_path(input: &source::SourceInput) -> String { pub fn wasm_path(input: &source::SourceInput) -> String {
let mut path = PathBuf::from(input.target_dir()); let mut path = PathBuf::from(input.target_dir());
path.push(format!("{}.wasm", input.final_name())); path.push(format!("{}.wasm", input.final_name()));
@ -50,7 +62,10 @@ pub fn process_output(input: &source::SourceInput) -> Result<(), Error> {
let mut target_path = PathBuf::from(input.target_dir()); let mut target_path = PathBuf::from(input.target_dir());
target_path.push(format!("{}.wasm", input.final_name())); target_path.push(format!("{}.wasm", input.final_name()));
fs::copy(cargo_path, target_path)?; fs::copy(cargo_path.as_path(), target_path.as_path())
.map_err(|io| Error::FailedToCopy(
format!("Failed to copy '{}' to '{}': {}", cargo_path.display(), target_path.display(), io)
))?;
Ok(()) Ok(())
} }
@ -125,7 +140,10 @@ fn main() {
source_input = source_input.with_final(final_name); source_input = source_input.with_final(final_name);
} }
process_output(&source_input).expect("Failed to process cargo target directory"); process_output(&source_input).unwrap_or_else(|e| {
println!("{}", e);
std::process::exit(1)
});
let path = wasm_path(&source_input); let path = wasm_path(&source_input);