fix(install): Keep v1 file formatting the same#10349
Merged
bors merged 1 commit intorust-lang:masterfrom Feb 1, 2022
Merged
Conversation
|
r? @ehuss (rust-highfive has picked a reviewer for you, use r? to override) |
Contributor
Author
|
The remaining test failure highlights a bug in the current |
epage
added a commit
to epage/toml_edit
that referenced
this pull request
Jan 31, 2022
I considered making it so we always showed empty implicit tables but I figured that in the editing case, we could show tables that were originally hidden just by deleting entries. This seems surprising for a user and they shouldn't have to account for it. So I limited the fix to `to_string_pretty`. This was found by rust-lang/cargo#10349.
epage
added a commit
to toml-rs/toml
that referenced
this pull request
Jan 31, 2022
I considered making it so we always showed empty implicit tables but I figured that in the editing case, we could show tables that were originally hidden just by deleting entries. This seems surprising for a user and they shouldn't have to account for it. So I limited the fix to `to_string_pretty`. This was found by rust-lang/cargo#10349.
Inspired by rust-lang#10345, I looked for other cases where `toml_edit::easy::to_string` is used (which outputs inline tables) to see if we should switch to `to_string_pretty`. The crates v1 file was the only case I found. As a side effect, we can no longer elide the empty `dev-dependencies` table in published manifests. This was the behavior before `toml_edit`, so not much of a loss.
epage
added a commit
to epage/cargo
that referenced
this pull request
Jan 31, 2022
`toml_edit` fixed a bug in 0.13.4 that this test was relying on that is meant to help with rust-lang#10349. This basically restores us back to the pre-toml_edit behavior for published manifests.
This was referenced Jan 31, 2022
bors
added a commit
that referenced
this pull request
Jan 31, 2022
test: Fix compatibilty with new toml_edit `toml_edit` fixed a bug in 0.13.4 that this test was relying on that is meant to help with #10349. This basically restores us back to the pre-toml_edit behavior for published manifests. I included the `Cargo.toml` change to ensure any existing lock files on people's machines get updated so the test won't mysteriously start failing for them when doing a `pull`.
Contributor
|
Thanks! @bors r+ |
Contributor
|
📌 Commit 24defcb has been approved by |
Contributor
Contributor
|
☀️ Test successful - checks-actions |
ehuss
added a commit
to ehuss/rust
that referenced
this pull request
Feb 1, 2022
Update cargo 10 commits in 1c034752de0df744fcd7788fcbca158830b8bf85..25fcb135d02ea897ce894b67ae021f48107d522b 2022-01-25 22:36:53 +0000 to 2022-02-01 01:32:48 +0000 - fix(install): Keep v1 file formatting the same (rust-lang/cargo#10349) - fix(vendor): Use tables for sample config (rust-lang/cargo#10348) - Add bash completion for `cargo clippy` (rust-lang/cargo#10347) - Do not ignore `--features` when `--all-features` is present (rust-lang/cargo#10337) - test: Fix compatibilty with new toml_edit (rust-lang/cargo#10350) - extra-link-arg-etc: support all link types (credit `@davidhewitt)` (rust-lang/cargo#10274) - Make clippy happy (rust-lang/cargo#10340) - Update publishing link for semver rules. (rust-lang/cargo#10338) - Normalize --path when install bin outside current workspace (rust-lang/cargo#10335) - Bump clap to v3.0.13 (rust-lang/cargo#10336)
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
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.
Inspired by #10345, I looked for other cases where
toml_edit::easy::to_stringis used (which outputs inline tables) tosee if we should switch to
to_string_pretty. The crates v1 file wasthe only case I found.
As a side effect, we can no longer elide the empty
dev-dependenciestable in published manifests. This was the behavior before
toml_edit,so not much of a loss.