Skip to content

Commit a9c8c08

Browse files
borsbors
committed
Auto merge of #60288 - Zoxc:update-rayon, r=nikomatsakis
Update rustc-rayon version r? @nikomatsakis
2 parents c751c7a + 0e05a9b commit a9c8c08

File tree

5 files changed

+35
-12
lines changed

5 files changed

+35
-12
lines changed

‎Cargo.lock

+29-6
Original file line numberDiff line numberDiff line change
@@ -2365,8 +2365,8 @@ dependencies = [
23652365
"num_cpus 1.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
23662366
"parking_lot 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)",
23672367
"polonius-engine 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
2368-
"rustc-rayon 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
2369-
"rustc-rayon-core 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
2368+
"rustc-rayon 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
2369+
"rustc-rayon-core 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
23702370
"rustc_apfloat 0.0.0",
23712371
"rustc_data_structures 0.0.0",
23722372
"rustc_errors 0.0.0",
@@ -2526,6 +2526,16 @@ dependencies = [
25262526
"rustc-rayon-core 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
25272527
]
25282528

2529+
[[package]]
2530+
name = "rustc-rayon"
2531+
version = "0.2.0"
2532+
source = "registry+https://github.com/rust-lang/crates.io-index"
2533+
dependencies = [
2534+
"crossbeam-deque 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
2535+
"either 1.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
2536+
"rustc-rayon-core 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
2537+
]
2538+
25292539
[[package]]
25302540
name = "rustc-rayon-core"
25312541
version = "0.1.2"
@@ -2537,6 +2547,17 @@ dependencies = [
25372547
"num_cpus 1.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
25382548
]
25392549

2550+
[[package]]
2551+
name = "rustc-rayon-core"
2552+
version = "0.2.0"
2553+
source = "registry+https://github.com/rust-lang/crates.io-index"
2554+
dependencies = [
2555+
"crossbeam-deque 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
2556+
"lazy_static 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
2557+
"libc 0.2.51 (registry+https://github.com/rust-lang/crates.io-index)",
2558+
"num_cpus 1.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
2559+
]
2560+
25402561
[[package]]
25412562
name = "rustc-serialize"
25422563
version = "0.3.24"
@@ -2695,8 +2716,8 @@ dependencies = [
26952716
"log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
26962717
"parking_lot 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)",
26972718
"rustc-hash 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
2698-
"rustc-rayon 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
2699-
"rustc-rayon-core 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
2719+
"rustc-rayon 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
2720+
"rustc-rayon-core 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
27002721
"rustc_cratesio_shim 0.0.0",
27012722
"serialize 0.0.0",
27022723
"smallvec 0.6.7 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -2712,7 +2733,7 @@ dependencies = [
27122733
"graphviz 0.0.0",
27132734
"log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
27142735
"rustc 0.0.0",
2715-
"rustc-rayon 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
2736+
"rustc-rayon 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
27162737
"rustc_allocator 0.0.0",
27172738
"rustc_borrowck 0.0.0",
27182739
"rustc_codegen_utils 0.0.0",
@@ -2778,7 +2799,7 @@ version = "0.0.0"
27782799
dependencies = [
27792800
"log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
27802801
"rustc 0.0.0",
2781-
"rustc-rayon 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
2802+
"rustc-rayon 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
27822803
"rustc_allocator 0.0.0",
27832804
"rustc_borrowck 0.0.0",
27842805
"rustc_codegen_utils 0.0.0",
@@ -4260,7 +4281,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
42604281
"checksum rustc-demangle 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)" = "82ae957aa1b3055d8e086486723c0ccd3d7b8fa190ae8fa2e35543b6171c810e"
42614282
"checksum rustc-hash 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "7540fc8b0c49f096ee9c961cda096467dce8084bec6bdca2fc83895fd9b28cb8"
42624283
"checksum rustc-rayon 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "8d98c51d9cbbe810c8b6693236d3412d8cd60513ff27a3e1b6af483dca0af544"
4284+
"checksum rustc-rayon 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "0d2e07e19601f21c59aad953c2632172ba70cb27e685771514ea66e4062b3363"
42634285
"checksum rustc-rayon-core 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "526e7b6d2707a5b9bec3927d424ad70fa3cfc68e0ac1b75e46cdbbc95adc5108"
4286+
"checksum rustc-rayon-core 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "79d38ca7cbc22fa59f09d8534ea4b27f67b0facf0cbe274433aceea227a02543"
42644287
"checksum rustc-serialize 0.3.24 (registry+https://github.com/rust-lang/crates.io-index)" = "dcf128d1287d2ea9d80910b5f1120d0b8eede3fbf1abe91c40d39ea7d51e6fda"
42654288
"checksum rustc_tools_util 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "b3c5a95edfa0c893236ae4778bb7c4752760e4c0d245e19b5eff33c5aa5eb9dc"
42664289
"checksum rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "138e3e0acb6c9fb258b19b67cb8abd63c00679d2851805ea151465464fe9030a"

‎src/librustc/Cargo.toml

+2-2
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ num_cpus = "1.0"
2020
scoped-tls = "1.0"
2121
log = { version = "0.4", features = ["release_max_level_info", "std"] }
2222
polonius-engine = "0.7.0"
23-
rustc-rayon = "0.1.2"
24-
rustc-rayon-core = "0.1.2"
23+
rustc-rayon = "0.2.0"
24+
rustc-rayon-core = "0.2.0"
2525
rustc_apfloat = { path = "../librustc_apfloat" }
2626
rustc_target = { path = "../librustc_target" }
2727
rustc_macros = { path = "../librustc_macros" }

‎src/librustc_data_structures/Cargo.toml

+2-2
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ serialize = { path = "../libserialize" }
1919
graphviz = { path = "../libgraphviz" }
2020
cfg-if = "0.1.2"
2121
stable_deref_trait = "1.0.0"
22-
rayon = { version = "0.1.2", package = "rustc-rayon" }
23-
rayon-core = { version = "0.1.2", package = "rustc-rayon-core" }
22+
rayon = { version = "0.2.0", package = "rustc-rayon" }
23+
rayon-core = { version = "0.2.0", package = "rustc-rayon-core" }
2424
rustc-hash = "1.0.1"
2525
smallvec = { version = "0.6.7", features = ["union", "may_dangle"] }
2626

‎src/librustc_driver/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ arena = { path = "../libarena" }
1414
graphviz = { path = "../libgraphviz" }
1515
log = "0.4"
1616
env_logger = { version = "0.5", default-features = false }
17-
rayon = { version = "0.1.2", package = "rustc-rayon" }
17+
rayon = { version = "0.2.0", package = "rustc-rayon" }
1818
scoped-tls = "1.0"
1919
rustc = { path = "../librustc" }
2020
rustc_allocator = { path = "../librustc_allocator" }

‎src/librustc_interface/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ crate-type = ["dylib"]
1111

1212
[dependencies]
1313
log = "0.4"
14-
rayon = { version = "0.1.1", package = "rustc-rayon" }
14+
rayon = { version = "0.2.0", package = "rustc-rayon" }
1515
smallvec = { version = "0.6.7", features = ["union", "may_dangle"] }
1616
scoped-tls = "1.0"
1717
syntax = { path = "../libsyntax" }

0 commit comments

Comments
 (0)