Add --manifest-path support to cargo fmt #3683
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
calebcartwright
commented
Jul 13, 2019
| if opts.manifest_path.is_some() { | ||
| let specified_manifest_path = opts.manifest_path.unwrap(); | ||
| if !specified_manifest_path.ends_with("Cargo.toml") { | ||
| print_usage_to_stderr("the manifest-path must be a path to a Cargo.toml file"); |
There was a problem hiding this comment.
This is the same error message cargo test displays when the value is not a path to a Cargo.toml file, so I thought it would be good to do the same here.
calebcartwright
commented
Jul 13, 2019
src/cargo-fmt/main.rs
Outdated
| let workspace_root_path = PathBuf::from(&metadata.workspace_root).canonicalize()?; | ||
| let in_workspace_root = workspace_root_path == current_dir; | ||
| let (in_workspace_root, current_dir_manifest) = if manifest_path.is_some() { | ||
| let target_manifest = manifest_path.unwrap().canonicalize()?; |
There was a problem hiding this comment.
If specified, manifest_path will already have a Cargo.toml suffix so manifest_path can just be used directly instead. Without this change, there would be problems discovering the targets when --manifest-path points to a cargo workspace
topecongiro
reviewed
Jul 14, 2019
src/cargo-fmt/main.rs
Outdated
| @@ -90,7 +94,27 @@ fn execute() -> i32 { | |||
|
|
|||
| let strategy = CargoFmtStrategy::from_opts(&opts); | |||
|
|
|||
| handle_command_status(format_crate(verbosity, &strategy, opts.rustfmt_options)) | |||
| if opts.manifest_path.is_some() { | |||
| let specified_manifest_path = opts.manifest_path.unwrap(); | |||
There was a problem hiding this comment.
Could you replace these two lines with if let Some() = ?
if let Some(specified_manifest_path) = opts.manifest_path {
src/cargo-fmt/main.rs
Outdated
| let workspace_root_path = PathBuf::from(&metadata.workspace_root).canonicalize()?; | ||
| let in_workspace_root = workspace_root_path == current_dir; | ||
| let (in_workspace_root, current_dir_manifest) = if manifest_path.is_some() { | ||
| let target_manifest = manifest_path.unwrap().canonicalize()?; |
There was a problem hiding this comment.
Could you update these two lines as the above comment?
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.
Closes #2817