greg/just
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Surround tokens with `` in errors

Browse Source
This commit is contained in:
Casey Rodarmor 2016-10-28 20:40:16 -07:00
parent 0f29b4fc2a
commit 58fb70e16e
2 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/integration.rs
View File

@ -207,7 +207,7 @@ fn error() {
"bar:\nhello:\nfoo: bar baaaaaaaz hello", "bar:\nhello:\nfoo: bar baaaaaaaz hello",
255, 255,
"", "",
"error: recipe foo has unknown dependency baaaaaaaz "error: recipe `foo` has unknown dependency `baaaaaaaz`
| |
3 | foo: bar baaaaaaaz hello 3 | foo: bar baaaaaaaz hello
| ^^^^^^^^^ | ^^^^^^^^^

30
src/lib.rs
View File

@ -483,46 +483,46 @@ impl<'a> Display for Error<'a> {
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 {} 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(" -> ")));
} }
return Ok(()); return Ok(());
} }
ErrorKind::CircularVariableDependency{variable, ref circle} => { ErrorKind::CircularVariableDependency{variable, ref circle} => {
try!(write!(f, "assignment to {} has circular dependency: {}", variable, circle.join(" -> "))); try!(write!(f, "assignment to `{}` has circular dependency: `{}`", variable, circle.join(" -> ")));
return Ok(()); return Ok(());
} }
ErrorKind::InvalidEscapeSequence{character} => { ErrorKind::InvalidEscapeSequence{character} => {
try!(writeln!(f, "\\{}", character.escape_default().collect::<String>())); try!(writeln!(f, "`\\{}` is not a valid escape sequence", character.escape_default().collect::<String>()));
} }
ErrorKind::DuplicateArgument{recipe, argument} => { ErrorKind::DuplicateArgument{recipe, argument} => {
try!(writeln!(f, "recipe {} has duplicate argument: {}", recipe, argument)); try!(writeln!(f, "recipe `{}` has duplicate argument `{}`", recipe, argument));
} }
ErrorKind::DuplicateVariable{variable} => { ErrorKind::DuplicateVariable{variable} => {
try!(writeln!(f, "variable \"{}\" is has multiple definitions", variable)); try!(writeln!(f, "variable `{}` is has multiple definitions", variable));
} }
ErrorKind::UnexpectedToken{ref expected, found} => { ErrorKind::UnexpectedToken{ref expected, found} => {
try!(writeln!(f, "expected {} but found {}", Or(expected), found)); try!(writeln!(f, "expected {} but found {}", Or(expected), found));
} }
ErrorKind::DuplicateDependency{recipe, dependency} => { ErrorKind::DuplicateDependency{recipe, dependency} => {
try!(writeln!(f, "recipe {} has duplicate dependency: {}", recipe, dependency)); try!(writeln!(f, "recipe `{}` has duplicate dependency `{}`", recipe, dependency));
} }
ErrorKind::DuplicateRecipe{recipe, first} => { ErrorKind::DuplicateRecipe{recipe, first} => {
try!(write!(f, "duplicate recipe: {} appears on lines {} and {}", try!(write!(f, "recipe `{}` first defined on line {} is redefined on line {}",
recipe, first, self.line)); recipe, first, self.line));
return Ok(()); return Ok(());
} }
ErrorKind::ArgumentShadowsVariable{argument} => { ErrorKind::ArgumentShadowsVariable{argument} => {
try!(writeln!(f, "argument {} shadows variable of the same name", argument)); try!(writeln!(f, "argument `{}` shadows variable of the same name", argument));
} }
ErrorKind::MixedLeadingWhitespace{whitespace} => { ErrorKind::MixedLeadingWhitespace{whitespace} => {
try!(writeln!(f, try!(writeln!(f,
"found a mix of tabs and spaces in leading whitespace: {}\n leading whitespace may consist of tabs or spaces, but not both", "found a mix of tabs and spaces in leading whitespace: `{}`\n leading whitespace may consist of tabs or spaces, but not both",
show_whitespace(whitespace) show_whitespace(whitespace)
)); ));
} }
@ -531,18 +531,18 @@ impl<'a> Display for Error<'a> {
} }
ErrorKind::InconsistentLeadingWhitespace{expected, found} => { ErrorKind::InconsistentLeadingWhitespace{expected, found} => {
try!(writeln!(f, try!(writeln!(f,
"inconsistant leading whitespace: recipe started with \"{}\" but found line with \"{}\":", "inconsistant leading whitespace: recipe started with `{}` but found line with `{}`:",
show_whitespace(expected), show_whitespace(found) show_whitespace(expected), show_whitespace(found)
)); ));
} }
ErrorKind::OuterShebang => { ErrorKind::OuterShebang => {
try!(writeln!(f, "a shebang \"#!\" is reserved syntax outside of recipes")) try!(writeln!(f, "a shebang `#!` is reserved syntax outside of recipes"))
} }
ErrorKind::UnknownDependency{recipe, unknown} => { ErrorKind::UnknownDependency{recipe, unknown} => {
try!(writeln!(f, "recipe {} has unknown dependency {}", recipe, unknown)); try!(writeln!(f, "recipe `{}` has unknown dependency `{}`", recipe, unknown));
} }
ErrorKind::UnknownVariable{variable} => { ErrorKind::UnknownVariable{variable} => {
try!(writeln!(f, "variable \"{}\" is unknown", variable)); try!(writeln!(f, "variable `{}` is unknown", variable));
} }
ErrorKind::UnknownStartOfToken => { ErrorKind::UnknownStartOfToken => {
try!(writeln!(f, "unknown start of token:")); try!(writeln!(f, "unknown start of token:"));