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

Don't resolve std's optional dependencies #7337

Merged
merged 1 commit into from
Sep 6, 2019

Conversation

alexcrichton
Copy link
Member

Use the set_require_optional_deps(false) escape hatch to avoid
resolving optional dependencies for libstd. While it doesn't really
matter a huge amount either way there's no need for us to generate
resolution nodes for things like rand just to throw them away because
they're never used.

Closes rust-lang/wg-cargo-std-aware#37

Use the `set_require_optional_deps(false)` escape hatch to avoid
resolving optional dependencies for libstd. While it doesn't really
matter a huge amount either way there's no need for us to generate
resolution nodes for things like `rand` just to throw them away because
they're never used.

Closes rust-lang/wg-cargo-std-aware#37
@rust-highfive
Copy link

r? @ehuss

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

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Sep 6, 2019
@ehuss
Copy link
Contributor

ehuss commented Sep 6, 2019

@bors r+

Thanks! I think this may also partially addresses my concern in rust-lang/wg-cargo-std-aware#38. Doing this disables this code path which is where the lock file gets written if it changes. (Currently -Zbuild-std was rewriting the lock file, but with this PR it shouldn't be modified.)

I think it's a bit unfortunate that this flag has that kind of effect because it is not obvious.

@bors
Copy link
Collaborator

bors commented Sep 6, 2019

📌 Commit 4592af4 has been approved by ehuss

@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 Sep 6, 2019
bors added a commit that referenced this pull request Sep 6, 2019
Don't resolve std's optional dependencies

Use the `set_require_optional_deps(false)` escape hatch to avoid
resolving optional dependencies for libstd. While it doesn't really
matter a huge amount either way there's no need for us to generate
resolution nodes for things like `rand` just to throw them away because
they're never used.

Closes rust-lang/wg-cargo-std-aware#37
@bors
Copy link
Collaborator

bors commented Sep 6, 2019

⌛ Testing commit 4592af4 with merge ad9e421...

@bors
Copy link
Collaborator

bors commented Sep 6, 2019

☀️ Test successful - checks-azure
Approved by: ehuss
Pushing ad9e421 to master...

@bors bors merged commit 4592af4 into rust-lang:master Sep 6, 2019
@alexcrichton alexcrichton deleted the less-optional branch September 9, 2019 16:00
bors added a commit to rust-lang/rust that referenced this pull request Sep 13, 2019
Update cargo

11 commits in fe0e5a48b75da2b405c8ce1ba2674e174ae11d5d..9655d70af8a6dddac238e3afa2fec75088c9226f
2019-09-04 00:51:27 +0000 to 2019-09-10 18:16:11 +0000
- Home docs: fix broken links, misspellings, style fixes, clarifications. (rust-lang/cargo#7348)
- add readme key to cargos manifest. (rust-lang/cargo#7347)
- Explicitly ignore some results (rust-lang/cargo#7340)
- Don't resolve std's optional dependencies (rust-lang/cargo#7337)
- Add `alloc` and `proc_macro` to libstd crates (rust-lang/cargo#7336)
- doc: capitalization change for consistency. (rust-lang/cargo#7334)
- Fix test for changes in plugin API. (rust-lang/cargo#7335)
- Fix some man pages where the files weren't rebuilt. (rust-lang/cargo#7332)
- guide: add section about the cargo home (rust-lang/cargo#7314)
- `map_dependencies` is doing a deep clone, so lets make it cheaper (rust-lang/cargo#7326)
- don't need to copy this string (rust-lang/cargo#7324)
@ehuss ehuss added this to the 1.39.0 milestone Feb 6, 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.

Consider setting require_optional_deps to false for standard library.
4 participants