refactor(toml): Expose surce/spans for VirtualManifests #13603
Merged
+192
−160
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
This will help with doing lint analysis after parsing
This is a hold over from when this was unstable
Its the caller's job to decide whether the warning is relevant
rustbot
added
A-manifest
epage
force-pushed
the
toml3
branch
2 times, most recently
from
6572ece to
40848e7
Compare
|
CI is blocked until |
Will do that today |
weihanglo
reviewed
Mar 19, 2024
src/cargo/util/toml/mod.rs
Outdated
| @@ -1362,7 +1365,12 @@ fn to_virtual_manifest( | |||
| bail!("virtual manifests must be configured with [workspace]"); | |||
| } | |||
| }; | |||
| let resolved_toml = original_toml.clone(); | |||
There was a problem hiding this comment.
This additional clone seems unfortunate, though I expect it won't really hurt the performance in normal cases, as it's for virtual manifests.
There was a problem hiding this comment.
We do a small normalization later on. Over time, I will be doing more.
weihanglo
approved these changes
Mar 19, 2024
|
@bors r+ |
bors
removed
the
S-waiting-on-review
bors
added
the
S-waiting-on-bors
|
☀️ Test successful - checks-actions |
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Mar 20, 2024
Update cargo 5 commits in 2fe739fcf16c5bf8c2064ab9d357f4a0e6c8539b..d438c80c45c24be676ef5867edc79d0a14910efe 2024-03-15 21:39:18 +0000 to 2024-03-19 16:11:22 +0000 - refactor(toml): Expose surce/spans for VirtualManifests (rust-lang/cargo#13603) - cargo/init: avoid target.name assignments if possible (rust-lang/cargo#13606) - chore: Fix minor grammar nit in command-line help (rust-lang/cargo#13602) - Bump to 0.80.0; update changelog (rust-lang/cargo#13604) - cargo: prevent dashes in lib.name (rust-lang/cargo#12783) r? ghost
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.
What does this PR try to resolve?
This is a follow up to #13593, expanding support from
ManifesttoVirtualManifestas well.This also does other clean up along the way in preparation for making a more explicit
resolve_tomlphase.How should we test and review this PR?
Additional information