Ignores '@' returned from interpolation evaluation #636
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
rjsberry
force-pushed
the
bugfix-quiet-interpolation-evaluation
branch
2 times, most recently
from
58e7b13
to
55070ce
Compare
casey
requested changes
Jun 9, 2020
src/recipe.rs
Outdated
| loop { | ||
| if lines.peek().is_none() { | ||
| break; | ||
| } | ||
| let line = lines.next().unwrap(); | ||
| line_number += 1; | ||
| if evaluated.is_empty() { |
There was a problem hiding this comment.
This will return true if we're on the second line, but the first line didn't evaluate to any text, for example:
foo:
{{""}}\
@echo foo 2>/dev/null
In practice, I don't think anyone is likely to hit this, but it would be nice to add a test for it and only mark lines as quiet if the leading @ is on the first line.
I think this can be avoided by moving the check for a quiet command outside the loop, like so:
let quiet_command = lines.next().map(|line| line.is_quiet()).unwrap_or(false);
Just now interprets this literally rather than propagating it to make the line run quietly.
rjsberry
force-pushed
the
bugfix-quiet-interpolation-evaluation
branch
from
55070ce
to
7247885
Compare
|
Merged, thank you very much! |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Just now interprets this literally rather than propagating it to make the line run quietly.