zaphar/ucg
1
0
Fork 0
mirror of https://github.com/zaphar/ucg.git synced 2025-07-22 18:19:54 -04:00
Code Issues Packages Projects Releases Wiki Activity

FEATURE: Enforce that flags outputs must be a tuple.

Browse Source
This commit is contained in:
Jeremy Wall 2019-04-09 21:02:36 -05:00
parent 1b2aa4dfd1
commit 17e22e5cf8
2 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/convert/flags.rs
View File

@ -18,6 +18,7 @@ use std::rc::Rc;
use crate::build::Val; use crate::build::Val;
use crate::convert::traits::{ConvertResult, Converter}; use crate::convert::traits::{ConvertResult, Converter};
use crate::error::{BuildError, ErrorType};
/// FlagConverter implements the conversion logic for converting a Val into a set /// FlagConverter implements the conversion logic for converting a Val into a set
/// of command line flags. /// of command line flags.
@ -128,6 +129,12 @@ impl FlagConverter {
impl Converter for FlagConverter { impl Converter for FlagConverter {
fn convert(&self, v: Rc<Val>, mut w: &mut Write) -> ConvertResult { fn convert(&self, v: Rc<Val>, mut w: &mut Write) -> ConvertResult {
if !v.is_tuple() {
return Err(Box::new(BuildError::new(
"Flag outputs must be a tuple",
ErrorType::ConvertError,
)));
}
self.write("", &v, &mut w) self.write("", &v, &mut w)
} }

3
src/error.rs
View File

@ -37,6 +37,8 @@ pub enum ErrorType {
ParseError, ParseError,
AssertError, AssertError,
OSError, OSError,
// Conversion errors
ConvertError,
// User Defined Declarative Errors // User Defined Declarative Errors
UserDefined, UserDefined,
} }
@ -56,6 +58,7 @@ impl fmt::Display for ErrorType {
&ErrorType::ParseError => "ParseError", &ErrorType::ParseError => "ParseError",
&ErrorType::AssertError => "AssertError", &ErrorType::AssertError => "AssertError",
&ErrorType::OSError => "OSError", &ErrorType::OSError => "OSError",
&ErrorType::ConvertError => "ConvertError",
&ErrorType::UserDefined => "UserDefined", &ErrorType::UserDefined => "UserDefined",
}; };
w.write_str(name) w.write_str(name)