Consolidating the logic for printing output #2353
Merged
Conversation
This file contains hidden or 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
topecongiro
approved these changes
Jan 11, 2018
src/rustfmt_diff.rs
Outdated
| pub fn writeln(&mut self, msg: &str, color: Option<term::color::Color>) { | ||
| match &mut self.terminal { | ||
| Some(ref mut t) => { | ||
| if color.is_some() { |
There was a problem hiding this comment.
You can write if let Some(color) = color { rather than calling unwrap() below.
There was a problem hiding this comment.
😊 Thanks for catching that.
There was a problem hiding this comment.
Since it was such a small change, I rewrote history instead of adding a new commit so you can see it easily. You can see the change here.
Thanks again!
davidalber
force-pushed
the
merge-print-diff
branch
from
10ba65f to
9f5f9d2
Compare
|
Thank you for the update! |
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.
This is my followup to this comment from #2292:
I actually eliminated the PrintType enum and created a struct -- OutputWriter -- that contains the logic for determining whether to write output using
println!or a Terminal instance from the term crate. This allowedprint_diff_fancyandprint_diff_basicto be consolidated intoprint_diff.