-
Notifications
You must be signed in to change notification settings - Fork 501
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
Update crossbeam to avoid multi version dependency #704
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
kjeremy
added a commit
to kjeremy/rust-analyzer
that referenced
this pull request
Nov 7, 2019
Removes nodrop and extra arrayvec We have an extra crossbeam-queue and crossbeam-utils left but those should drop once rayon accepts rayon-rs/rayon#704
bors bot
added a commit
to rust-lang/rust-analyzer
that referenced
this pull request
Nov 7, 2019
2194: Update crates r=matklad a=kjeremy Removes nodrop and extra arrayvec We have an extra crossbeam-queue and crossbeam-utils left but those should drop once rayon accepts rayon-rs/rayon#704 Co-authored-by: kjeremy <kjeremy@gmail.com>
It still passed the compat build, so this is fine, thanks! bors r+ |
bors bot
added a commit
that referenced
this pull request
Nov 7, 2019
704: Update crossbeam to avoid multi version dependency r=cuviper a=dnaka91 Just did a `cargo update` on my project today morning and noticed that with the release of **crossbeam-epoch 0.8.0**, rayon starts to depend on 2 versions of **crossbeam-utils**. Before: ``` rayon-core v1.6.0 ├── crossbeam-deque v0.7.2 │ ├── crossbeam-epoch v0.8.0 │ │ └── crossbeam-utils v0.7.0 <-- latest │ └── crossbeam-utils v0.7.0 <-- latest ├── crossbeam-queue v0.1.2 │ └── crossbeam-utils v0.6.6 <-- outdated └── crossbeam-utils v0.6.6 <-- outdated ``` Here Rust will compile 2 versions of the same dependency. After: ``` rayon-core v1.6.0 ├── crossbeam-deque v0.7.2 │ ├── crossbeam-epoch v0.8.0 │ │ └── crossbeam-utils v0.7.0 <-- latest │ └── crossbeam-utils v0.7.0 <-- latest ├── crossbeam-queue v0.2.0 │ └── crossbeam-utils v0.7.0 <-- latest └── crossbeam-utils v0.7.0 <-- latest ``` Here all references are up to date and Rust will only compile one version of `crossbeam-utils`. Co-authored-by: Dominik Nakamura <dnaka91@gmail.com>
bors bot
added a commit
that referenced
this pull request
Nov 7, 2019
705: Update compat-Cargo.lock r=cuviper a=matklad I've noticed that #704 uses old compat lockfile, which is strange, given that it changes Cargo.lock. What happens here is that cargo writes new compat lockfile during CI. That means that CI might break randomly, if rayon's dependency is published with the same major version, but different MSRV With this PR, CI will break deterministically if you change Cargo.toml and don't update compat-Cargo.lock. Not sure if this actually makes sense :) Co-authored-by: Aleksey Kladov <aleksey.kladov@gmail.com>
Hi, @cuviper. Do you have plans to release a new version with this change. |
I have no plans, but we can publish a new version. I'll prepare that shortly. |
rayon-core 1.6.1 and rayon 1.2.1 are now published. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Just did a
cargo update
on my project today morning and noticed that with the release of crossbeam-epoch 0.8.0, rayon starts to depend on 2 versions of crossbeam-utils.Before:
Here Rust will compile 2 versions of the same dependency.
After:
Here all references are up to date and Rust will only compile one version of
crossbeam-utils
.