Update rustc-rayon version

[Zoxc]

r? @nikomatsakis

[nikomatsakis]

@bors r+

[bors]

📌 Commit 41cc5a430a99e72a1e5776c1eaa9c6a32e92ea4e has been approved by nikomatsakis

[bors]

🔒 Merge conflict

This pull request and the master branch diverged in a way that cannot be automatically merged. Please rebase on top of the latest master branch, and let the reviewer approve again.

How do I rebase?

Assuming self is your fork and upstream is this repository, you can resolve the conflict following these steps:

1. git checkout update-rayon (switch to your branch)
2. git fetch upstream master (retrieve the latest master)
3. git rebase upstream/master -p (rebase on top of it)
4. Follow the on-screen instruction to resolve conflicts (check git status if you got lost).
5. git push self update-rayon --force-with-lease (update this PR)

You may also read Git Rebasing to Resolve Conflicts by Drew Blessing for a short tutorial.

Please avoid the "Resolve conflicts" button on GitHub. It uses git merge instead of git rebase which makes the PR commit history more difficult to read.

Sometimes step 4 will complete without asking for resolution. This is usually due to difference between how Cargo.lock conflict is handled during merge and rebase. This is normal, and you should still perform step 5 to update this PR.

Error message

warning: Cannot merge binary files: Cargo.lock (HEAD vs. heads/homu-tmp)
Auto-merging Cargo.lock
CONFLICT (content): Merge conflict in Cargo.lock
Automatic merge failed; fix conflicts and then commit the result.

[Zoxc]

@bors r=nikomatsakis

[bors]

📌 Commit 0e05a9b has been approved by nikomatsakis

[bors]

⌛ Testing commit 0e05a9b with merge ef18061739e7b775d58fff9ea5a804db3c084021...

[Centril]

@bors retry

[bors]

⌛ Testing commit 0e05a9b with merge a9c8c08...

[bors]

☀️ Test successful - checks-travis, status-appveyor
Approved by: nikomatsakis
Pushing a9c8c08 to master...