This commit is contained in:
Casey Rodarmor 2016-10-28 19:56:33 -07:00
parent 383754d2fb
commit a55adafa60
2 changed files with 7 additions and 3 deletions

6
notes
View File

@ -20,6 +20,9 @@ notes
- before release: - before release:
- rewrite grammar.txt - rewrite grammar.txt
- start with an example justfile
- then installation instructions
- then a long guide
- make it clear it's beta, mention that, as a command runner - make it clear it's beta, mention that, as a command runner
there is probably a higher than normal chance of disaster there is probably a higher than normal chance of disaster
- change name back to 'just', suggest j as alias - change name back to 'just', suggest j as alias
@ -55,8 +58,9 @@ notes
enhancements: enhancements:
- colored error messages
- save result of commands in variables - save result of commands in variables
- multi line strings - multi line strings (maybe not in recipe interpolations)
- raw strings - raw strings
- iteration: {{x for x in y}} - iteration: {{x for x in y}}
- allow calling recipes in a justfile in a different directory: - allow calling recipes in a justfile in a different directory:

View File

@ -480,14 +480,14 @@ impl<'a, T: Display> Display for Or<'a, T> {
impl<'a> Display for Error<'a> { impl<'a> Display for Error<'a> {
fn fmt(&self, f: &mut fmt::Formatter) -> Result<(), fmt::Error> { fn fmt(&self, f: &mut fmt::Formatter) -> Result<(), fmt::Error> {
try!(write!(f, "justfile:{}: ", self.line)); try!(write!(f, "justfile:{}: ", self.line));
match self.kind { match self.kind {
ErrorKind::BadName{name} => { ErrorKind::BadName{name} => {
try!(writeln!(f, "name did not match /[a-z](-?[a-z0-9])*/: {}", name)); try!(writeln!(f, "name did not match /[a-z](-?[a-z0-9])*/: {}", name));
} }
ErrorKind::CircularRecipeDependency{recipe, ref circle} => { ErrorKind::CircularRecipeDependency{recipe, ref circle} => {
if circle.len() == 2 { if circle.len() == 2 {
try!(write!(f, "recipe 1{} depends on itself", recipe)); try!(write!(f, "recipe {} depends on itself", recipe));
} else { } else {
try!(write!(f, "recipe {} has circular dependency: {}", recipe, circle.join(" -> "))); try!(write!(f, "recipe {} has circular dependency: {}", recipe, circle.join(" -> ")));
} }