Don't ignore --config-file when using --stdin #231
Merged
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
lbodor
commented
Apr 9, 2023
| @@ -21,18 +22,6 @@ pub fn format_stdin_cmd( | |||
| } | |||
| }; | |||
|
|
|||
| // Search for the treefmt.toml from there. | |||
| let config_file = match config::lookup(work_dir) { | |||
There was a problem hiding this comment.
Doesn't config::lookup() already happen in cli_from_args() for both format_cmd() and format_stdin_cmd()?
lbodor
commented
Apr 9, 2023
| config::FILENAME, | ||
| work_dir.display() | ||
| )); | ||
| } |
There was a problem hiding this comment.
This check is already in run_cli() and now applies to both format_cmd() and format_stdin_cmd().
lbodor
commented
Apr 9, 2023
| config::FILENAME, | ||
| cli.work_dir.display(), | ||
| )); | ||
| match &cli.config_file { |
There was a problem hiding this comment.
Let me know if here you prefer is_none() followed by expect(), and I'll do that instead.
lbodor
commented
Apr 9, 2023
| // Default the tree root to the folder that contains the config file | ||
| let tree_root = tree_root.clone().unwrap_or_else(|| { | ||
| // unwrap: since the config_file is a file, there MUST be a parent folder. | ||
| config_file.clone().parent().unwrap().to_path_buf() | ||
| config_file.parent().unwrap().to_path_buf() |
There was a problem hiding this comment.
Now same as
Line 30 in d87045a
and resolves
https://github.com/numtide/treefmt/actions/runs/4649699136/jobs/8228370543
error: using `clone` on a double-reference; this will copy the reference of type `&std::path::Path` instead of cloning the inner type
--> src/command/format_stdin.rs:28:9
|
28 | config_file.clone().parent().unwrap().to_path_buf()
|
bors merge |
|
Thanks 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.
Fix #230.