Make gleam.toml consistent #5300
Merged
+102
−65
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
Comment on lines
-25
to
+36
| let maybe_removed_item = toml["dependencies"] | ||
| .as_table_like_mut() | ||
| .and_then(|deps| deps.remove(package_to_remove)); | ||
|
|
||
| #[allow(clippy::indexing_slicing)] | ||
| let maybe_removed_dev_item = toml["dev-dependencies"] | ||
| .as_table_like_mut() | ||
| .and_then(|deps| deps.remove(package_to_remove)); | ||
|
|
||
| if maybe_removed_item.or(maybe_removed_dev_item).is_none() { | ||
| let remove = |toml: &mut toml_edit::DocumentMut, name| { | ||
| #[allow(clippy::indexing_slicing)] | ||
| toml[name] | ||
| .as_table_like_mut() | ||
| .and_then(|deps| deps.remove(package_to_remove)) | ||
| }; | ||
|
|
||
| // dev-dependencies is the old deprecated name for dev_dependencies | ||
| let removed = remove(&mut toml, "dependencies") | ||
| .or_else(|| remove(&mut toml, "dev_dependencies")) | ||
| .or_else(|| remove(&mut toml, "dev-dependencies")); | ||
|
|
||
| if removed.is_none() { |
Member
There was a problem hiding this comment.
Doesn't this change the behaviour of this piece of code? Previously both the remove from dependencies and from dev_dependencies would run and then the check is performed. Does it make any difference?
Member
Author
There was a problem hiding this comment.
It does change in that way, but that config would have been invalid and rejected by the build tool
Member
giacomocavalieri
left a comment
giacomocavalieri
left a comment
There was a problem hiding this comment.
Looks good to me! Just one comment inline
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.
These keys were inconsistent in that they used a different case convention to the other keys.
Assuming no bugs this is backwards compatible and will support the old config too.