Skip to content

Conversation

epage
Copy link
Contributor

@epage epage commented Mar 18, 2024

What does this PR try to resolve?

This is a follow up to #13593, expanding support from Manifest to VirtualManifest as well.

This also does other clean up along the way in preparation for making a more explicit resolve_toml phase.

How should we test and review this PR?

Additional information

@rustbot
Copy link
Collaborator

rustbot commented Mar 18, 2024

r? @ehuss

rustbot has assigned @ehuss.
They will have a look at your PR within the next two weeks and either review your PR or reassign to another reviewer.

Use r? to explicitly pick a reviewer

@rustbot rustbot added A-manifest Area: Cargo.toml issues A-unstable Area: nightly unstable support S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Mar 18, 2024
@epage epage force-pushed the toml3 branch 2 times, most recently from 6572ece to 40848e7 Compare March 18, 2024 16:59
@epage
Copy link
Contributor Author

epage commented Mar 18, 2024

CI is blocked until master gets a version update post beta-branch.

@weihanglo
Copy link
Member

CI is blocked until master gets a version update post beta-branch.

Will do that today

Copy link
Member

@weihanglo weihanglo left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for the huge work!

bail!("virtual manifests must be configured with [workspace]");
}
};
let resolved_toml = original_toml.clone();
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This additional clone seems unfortunate, though I expect it won't really hurt the performance in normal cases, as it's for virtual manifests.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We do a small normalization later on. Over time, I will be doing more.

@weihanglo
Copy link
Member

@bors r+

@bors
Copy link
Contributor

bors commented Mar 19, 2024

📌 Commit 627217a has been approved by weihanglo

It is now in the queue for this repository.

@bors bors removed the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Mar 19, 2024
@bors bors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Mar 19, 2024
@bors
Copy link
Contributor

bors commented Mar 19, 2024

⌛ Testing commit 627217a with merge d438c80...

@bors
Copy link
Contributor

bors commented Mar 19, 2024

☀️ Test successful - checks-actions
Approved by: weihanglo
Pushing d438c80 to master...

@bors bors merged commit d438c80 into rust-lang:master Mar 19, 2024
@epage epage deleted the toml3 branch March 19, 2024 16:44
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
@rustbot rustbot added this to the 1.79.0 milestone Mar 20, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
A-manifest Area: Cargo.toml issues A-unstable Area: nightly unstable support S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants