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 panic in bootstrap for non-workspace path dependencies. #78709

Merged
merged 1 commit into from
Nov 3, 2020

Conversation

ehuss
Copy link
Contributor

@ehuss ehuss commented Nov 3, 2020

If you add a path dependency to a Cargo.toml that is located outside of the workspace, then the in_tree_crates function can panic because it finds a path dependency that is not defined (since it uses cargo metadata --no-deps). This fixes it by skipping over those entries, which are usually not things you select on the command-line.

Fixes #78617

@rust-highfive
Copy link
Collaborator

r? @Mark-Simulacrum

(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 Nov 3, 2020
@bjorn3
Copy link
Member

bjorn3 commented Nov 3, 2020

cc @vext01 This will remove the need for the NOT_IN_TREE hack in ykrustc.

@Mark-Simulacrum
Copy link
Member

@bors r+

I think this makes sense, at the very least improves common case.

@bors
Copy link
Contributor

bors commented Nov 3, 2020

📌 Commit 2172adb has been approved by Mark-Simulacrum

@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 Nov 3, 2020
bors added a commit to rust-lang-ci/rust that referenced this pull request Nov 3, 2020
Rollup of 7 pull requests

Successful merges:

 - rust-lang#77950 (Add support for SHA256 source file hashing)
 - rust-lang#78624 (Sync rustc_codegen_cranelift)
 - rust-lang#78626 (Improve errors about #[deprecated] attribute)
 - rust-lang#78659 (Corrected suggestion for generic parameters in `function_item_references` lint)
 - rust-lang#78687 (Suggest library/std when running all stage 0 tests)
 - rust-lang#78699 (Show more error information in lldb_batchmode)
 - rust-lang#78709 (Fix panic in bootstrap for non-workspace path dependencies.)

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit a65507b into rust-lang:master Nov 3, 2020
@rustbot rustbot added this to the 1.49.0 milestone Nov 3, 2020
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.

Bootstrap panics if a crate is overloaded to one outside the local tree
6 participants