Skip to content

Update rayon and rustc-rayon #92740

New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

#

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Jump to bottom
Merged
merged 1 commit into from
Jan 16, 2022
Merged

Update rayon and rustc-rayon #92740

merged 1 commit into from
Jan 16, 2022

Conversation

cuviper
Copy link
Member

@cuviper cuviper commented Jan 10, 2022

This updates rayon for various tools and rustc-rayon for the compiler's parallel mode.

  • rayon v1.3.1 -> v1.5.1
  • rayon-core v1.7.1 -> v1.9.1
  • rustc-rayon v0.3.1 -> v0.3.2
  • rustc-rayon-core v0.3.1 -> v0.3.2

... and indirectly, this updates all of crossbeam-* to their latest versions.

Fixes #92677 by removing crossbeam-queue, but there's still a lingering question about how tidy discovers "runtime" dependencies. None of this is truly in the standard library's dependency tree at all.

@rust-highfive
Copy link
Contributor

Some changes occurred in src/tools/clippy.

cc @rust-lang/clippy

@rustbot rustbot added T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue. labels Jan 10, 2022
@rust-highfive
Copy link
Contributor

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 Jan 10, 2022
@Mark-Simulacrum
Copy link
Member

@bors r+ rollup=never

@bors
Copy link
Collaborator

bors commented Jan 10, 2022

📌 Commit f3b8812 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 Jan 10, 2022
@bors
Copy link
Collaborator

bors commented Jan 15, 2022

⌛ Testing commit f3b8812 with merge e13ae63f3c6e557d14bf14337f1b8675a5351b03...

@bors
Copy link
Collaborator

bors commented Jan 15, 2022

💥 Test timed out

@bors bors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Jan 15, 2022
@rust-log-analyzer
Copy link
Collaborator

A job failed! Check out the build log: (web) (plain)

Click to see the possible cause of the failure (guessed by this bot)

@cuviper
Copy link
Member Author

cuviper commented Jan 16, 2022

Odd, i686-msvc-1 and x86_64-msvc-1 stalled in the same place:

Testing rustc_macros stage1 (x86_64-pc-windows-msvc -> x86_64-pc-windows-msvc)
[RUSTC-TIMING] build_script_build test:false 0.896
[RUSTC-TIMING] unicode_xid test:false 0.181
[RUSTC-TIMING] build_script_build test:false 0.708
[RUSTC-TIMING] proc_macro2 test:false 2.249
[RUSTC-TIMING] quote test:false 1.004
[RUSTC-TIMING] syn test:false 21.663
[RUSTC-TIMING] synstructure test:false 2.537
[RUSTC-TIMING] rustc_macros test:false 5.514
   Compiling rustc_macros v0.1.0 (D:\a\rust\rust\compiler\rustc_macros)
Error: The operation was canceled.

CI passed everywhere else, including the equivalent mingw runners.

@mati865
Copy link
Contributor

mati865 commented Jan 16, 2022

There were several different issues with MSVC CI recently, worth retrying.

@klensy
Copy link
Contributor

klensy commented Jan 16, 2022 •
edited
Loading

One more of #92883 (comment)

Sat, 15 Jan 2022 19:29:56 GMT [RUSTC-TIMING] rustc_macros test:false 6.329
Sat, 15 Jan 2022 19:29:56 GMT    Compiling rustc_macros v0.1.0 (D:\a\rust\rust\compiler\rustc_macros)
Sat, 15 Jan 2022 23:10:57 GMT Error: The operation was canceled.

@cuviper
Copy link
Member Author

cuviper commented Jan 16, 2022

@bors retry

@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 Jan 16, 2022
@bors
Copy link
Collaborator

bors commented Jan 16, 2022

⌛ Testing commit f3b8812 with merge 42852d7...

@bors
Copy link
Collaborator

bors commented Jan 16, 2022

☀️ Test successful - checks-actions
Approved by: Mark-Simulacrum
Pushing 42852d7 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Jan 16, 2022
@bors bors merged commit 42852d7 into rust-lang:master Jan 16, 2022
@rustbot rustbot added this to the 1.60.0 milestone Jan 16, 2022
@bors bors mentioned this pull request Jan 16, 2022
Merged
@rust-timer
Copy link
Collaborator

Finished benchmarking commit (42852d7): comparison url.

Summary: This benchmark run did not return any relevant changes.

If you disagree with this performance assessment, please file an issue in rust-lang/rustc-perf.

@rustbot label: -perf-regression

flip1995 pushed a commit to flip1995/rust that referenced this pull request Jan 27, 2022
@bors
Auto merge of rust-lang#92740 - cuviper:update-rayons, r=Mark-Simulacrum
938b4c3 
Update rayon and rustc-rayon

This updates rayon for various tools and rustc-rayon for the compiler's parallel mode.

- rayon v1.3.1 -> v1.5.1
- rayon-core v1.7.1 -> v1.9.1
- rustc-rayon v0.3.1 -> v0.3.2
- rustc-rayon-core v0.3.1 -> v0.3.2

... and indirectly, this updates all of crossbeam-* to their latest versions.

Fixes rust-lang#92677 by removing crossbeam-queue, but there's still a lingering question about how tidy discovers "runtime" dependencies. None of this is truly in the standard library's dependency tree at all.
@ehuss ehuss mentioned this pull request Jan 27, 2022
Closed
@cuviper cuviper deleted the update-rayons branch April 12, 2022 17:55
# for free to join this conversation on GitHub. Already have an account? # to comment
Reviewers
No reviews
Assignees

@Mark-Simulacrum Mark-Simulacrum

Labels
merged-by-bors This PR was explicitly merged by bors. S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue.
Projects
None yet
Milestone
1.60.0
Development

Successfully merging this pull request may close these issues.

tidy license check error for crossbeam-queue
9 participants
@cuviper @rust-highfive @Mark-Simulacrum @bors @rust-log-analyzer @mati865 @klensy @rust-timer @rustbot