Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix key formatting when switching to a dotted WorkspaceSource #10705

Merged
merged 1 commit into from
May 27, 2022

Conversation

Muscraft
Copy link
Member

This fell out of #10697 see this comment

There was a small issue where changing the source of a cargo_add::Dependency to a WorkspaceSource would cause the dotted version to have extra space.

dep .workspace = true
dep.workspace = true

This makes sure the key is formatted as well as adds a unit test to make sure this doesn't come back up in the future.

r? @epage

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label May 26, 2022
@epage
Copy link
Contributor

epage commented May 26, 2022

@bors r+

@bors
Copy link
Contributor

bors commented May 26, 2022

📌 Commit 706e5b2 has been approved by epage

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

bors commented May 26, 2022

⌛ Testing commit 706e5b2 with merge 8f5500b...

@bors
Copy link
Contributor

bors commented May 27, 2022

☀️ Test successful - checks-actions
Approved by: epage
Pushing 8f5500b to master...

@bors bors merged commit 8f5500b into rust-lang:master May 27, 2022
@Muscraft Muscraft deleted the workspace-source-fmt-key branch May 27, 2022 00:56
bors added a commit to rust-lang-ci/rust that referenced this pull request Jun 1, 2022
Update cargo

5 commits in 39ad1039d9e3e1746177bf5d134af4c164f95528..38472bc19f2f76e245eba54a6e97ee6821b3c1db
2022-05-25 00:50:02 +0000 to 2022-05-31 02:03:24 +0000
- Emit warning upon encountering multiple packages with the same name (rust-lang/cargo#10701)
- Guide new users to add use `super::*;` to `mod test` (rust-lang/cargo#10706)
- Document how to debug change detection events (rust-lang/cargo#10708)
- fix(publish): add more check when use `publish -p <SPEC>` (rust-lang/cargo#10677)
- fix key formatting when switching to a dotted `WorkspaceSource` (rust-lang/cargo#10705)
@ehuss ehuss added this to the 1.63.0 milestone Jun 22, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
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