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

chore: Use [workspace.dependencies] #12057

Merged
merged 1 commit into from
May 3, 2023
Merged

Conversation

Muscraft
Copy link
Member

@Muscraft Muscraft commented Apr 28, 2023

What does this PR try to resolve?

Keeping shared dependencies in sync. It does this by utilizing workspace inheritance and adding [workspace.dependencies].

Additional information

The ability to use workspace inheritance was added in #11851, as that PR added a workspace for cargo.

The changes were made by a tool I wrote to assist in finding duplicate dependencies.

@rustbot
Copy link
Collaborator

rustbot commented Apr 28, 2023

r? @epage

(rustbot has picked a reviewer for you, use r? to override)

@rustbot rustbot added A-cfg-expr Area: Platform cfg expressions A-cli-help Area: built-in command-line help A-dependency-resolution Area: dependency resolution and the resolver A-environment-variables Area: environment variables A-infrastructure Area: infrastructure around the cargo repo, ci, releases, etc. A-interacts-with-crates.io Area: interaction with registries A-registry-authentication Area: registry authentication and authorization (authn authz) A-semver Area: semver specifications, version matching, etc. A-testing-cargo-itself Area: cargo's tests S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Apr 28, 2023
Cargo.toml Outdated Show resolved Hide resolved
@Muscraft Muscraft force-pushed the use-ws-deps branch 2 times, most recently from ac07b42 to e69343b Compare May 2, 2023 18:30
@bors
Copy link
Contributor

bors commented May 3, 2023

☔ The latest upstream changes (presumably #11840) made this pull request unmergeable. Please resolve the merge conflicts.

@weihanglo
Copy link
Member

Let's go!

@bors r+

@bors
Copy link
Contributor

bors commented May 3, 2023

📌 Commit 34b8c39 has been approved by weihanglo

It is now in the queue for this repository.

@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 3, 2023
@bors
Copy link
Contributor

bors commented May 3, 2023

⌛ Testing commit 34b8c39 with merge 5aa92f1...

@bors
Copy link
Contributor

bors commented May 3, 2023

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

@bors bors merged commit 5aa92f1 into rust-lang:master May 3, 2023
@Muscraft Muscraft deleted the use-ws-deps branch May 3, 2023 19:18
bors added a commit to rust-lang-ci/rust that referenced this pull request May 5, 2023
Update cargo

10 commits in ac84010322a31f4a581dafe26258aa4ac8dea9cd..569b648b5831ae8a515e90c80843a5287c3304ef
2023-05-02 13:41:16 +0000 to 2023-05-05 15:49:44 +0000
- xtask-unpublished: output a markdown table (rust-lang/cargo#12085)
- fix: hack around `libsysroot` instead of `libtest` (rust-lang/cargo#12088)
- Optimize usage under rustup. (rust-lang/cargo#11917)
- Update lock to normalize `home` dep (rust-lang/cargo#12084)
- fix:  doc-test failures (rust-lang/cargo#12055)
- feat(cargo-metadata): add `workspace_default_members` (rust-lang/cargo#11978)
- doc: clarify implications of `cargo-yank` (rust-lang/cargo#11862)
- chore: Use `[workspace.dependencies]` (rust-lang/cargo#12057)
- support for shallow clones and fetches with `gitoxide` (rust-lang/cargo#11840)
- Build by PackageIdSpec, not name, to avoid ambiguity (rust-lang/cargo#12015)

r? `@ghost`
@ehuss ehuss added this to the 1.71.0 milestone May 5, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
A-cfg-expr Area: Platform cfg expressions A-cli-help Area: built-in command-line help A-dependency-resolution Area: dependency resolution and the resolver A-environment-variables Area: environment variables A-infrastructure Area: infrastructure around the cargo repo, ci, releases, etc. A-interacts-with-crates.io Area: interaction with registries A-registry-authentication Area: registry authentication and authorization (authn authz) A-semver Area: semver specifications, version matching, etc. A-testing-cargo-itself Area: cargo's tests 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.

6 participants