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

bump lazy_static to 1 #484

Merged
merged 2 commits into from Dec 1, 2017

Conversation

Projects
None yet
2 participants
@ignatenkobrain
Copy link
Contributor

ignatenkobrain commented Nov 30, 2017

Signed-off-by: Igor Gnatenko i.gnatenko.brain@gmail.com

bump lazy_static to 1
Signed-off-by: Igor Gnatenko <i.gnatenko.brain@gmail.com>
@cuviper

This comment has been minimized.

Copy link
Member

cuviper commented Nov 30, 2017

Hmm, we're still indirectly getting lazy_static 0.2 from dependencies, and compiletest_rs is too sensitive to having multiple copies of a library.

error[E0464]: multiple matching crates for `lazy_static`
 --> tests/run-pass/sort-panic-safe.rs:2:1
  |
2 | extern crate lazy_static;
  | ^^^^^^^^^^^^^^^^^^^^^^^^^
  |
  = note: candidates:
          crate `lazy_static`: /home/travis/build/rayon-rs/rayon/target/debug/deps/liblazy_static-58ed3e94141b3559.rlib
          crate `lazy_static`: /home/travis/build/rayon-rs/rayon/target/debug/deps/liblazy_static-ccedce43d96797cc.rlib

Normally cargo passes specific library paths to rustc, so this isn't a problem, but compiletest_rs calls rustc directly and doesn't know which libraries should be used. So if rustc is left with multiple options in the -L path, it fails.

I think we can just avoid lazy_static in that test though. I'll try it...

@cuviper

This comment has been minimized.

Copy link
Member

cuviper commented Nov 30, 2017

Better yet, I just made it a regular test and added the proper dev-dependency.

bors r+

bors bot added a commit that referenced this pull request Nov 30, 2017

Merge #484
484: bump lazy_static to 1 r=cuviper a=ignatenkobrain

Signed-off-by: Igor Gnatenko <i.gnatenko.brain@gmail.com>
@bors

This comment has been minimized.

Copy link
Contributor

bors bot commented Dec 1, 2017

Timed out

@cuviper

This comment has been minimized.

Copy link
Member

cuviper commented Dec 1, 2017

bors r+

bors bot added a commit that referenced this pull request Dec 1, 2017

Merge #484 #485
484: bump lazy_static to 1 r=cuviper a=ignatenkobrain

Signed-off-by: Igor Gnatenko <i.gnatenko.brain@gmail.com>

485: fix readme r=cuviper a=obv-mikhail
@bors

This comment has been minimized.

Copy link
Contributor

bors bot commented Dec 1, 2017

@bors bors bot merged commit 74ab458 into rayon-rs:master Dec 1, 2017

2 checks passed

bors Build succeeded
continuous-integration/travis-ci/pr The Travis CI build passed
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.