Skip to content

compiletest: Disambiguate extern crate deps shared with the compiler #4017

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

Merged
merged 1 commit into from
Apr 23, 2019

Conversation

Xanewok
Copy link
Member

@Xanewok Xanewok commented Apr 22, 2019

Fixes #4015.

changelog: Handle deps shared with the compiler in the internal compiletest suite

Attempts to fix the multiple matching crates error using the --extern dep=path disambiguation. This only includes serde at the moment because it's the only problematic dep right now (is inside Rust sysroot and pulled via extern crate in the test suite).

I'm not exactly sure this is the right approach (FWIW it fixes the issue locally), please do tell if this should be done differently.

@oli-obk
Copy link
Contributor

oli-obk commented Apr 22, 2019

Oh wow, this is cool. Although I think we should try to upstream stuff like this to compiletest-rs, we can play with it here until we have the kinks worked out.

You have a dogfood failure (basically make the entire thing one big filter_map instead of many methods).

@Xanewok Xanewok force-pushed the wip-disambiguate-extern branch from 91c145d to 56389f3 Compare April 23, 2019 08:32
@oli-obk
Copy link
Contributor

oli-obk commented Apr 23, 2019

@bors r+ p=42

@bors
Copy link
Contributor

bors commented Apr 23, 2019

📌 Commit 56389f3 has been approved by oli-obk

bors added a commit that referenced this pull request Apr 23, 2019
compiletest: Disambiguate extern crate deps shared with the compiler

Fixes #4015.

changelog: Handle deps shared with the compiler in the internal compiletest suite

Attempts to fix the multiple matching crates error using the `--extern dep=path` disambiguation. This only includes `serde` at the moment because it's the only problematic dep right now (is inside Rust sysroot and pulled via `extern crate` in the test suite).

I'm not exactly sure this is the right approach (FWIW it fixes the issue locally), please do tell if this should be done differently.
@bors
Copy link
Contributor

bors commented Apr 23, 2019

⌛ Testing commit 56389f3 with merge 6ae46a8...

@bors
Copy link
Contributor

bors commented Apr 23, 2019

☀️ Test successful - checks-travis, status-appveyor
Approved by: oli-obk
Pushing 6ae46a8 to master...

@bors bors merged commit 56389f3 into rust-lang:master Apr 23, 2019
@Xanewok Xanewok deleted the wip-disambiguate-extern branch April 23, 2019 10:11
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Tests failing with multiple matching crates for serde
3 participants