From 58cae4ef8d703e32f05fe43875ea38faa0fca3a1 Mon Sep 17 00:00:00 2001
From: Emil Ernerfeldt <emil.ernerfeldt@gmail.com>
Date: Thu, 9 Mar 2023 12:27:23 +0100
Subject: [PATCH] Update `rayon` (#1541)

* cargo update -p rayon

    Updating crates.io index
    Updating rayon v1.6.0 -> v1.7.0
    Updating rayon-core v1.10.1 -> v1.11.0

* Don't use jpeg_rayon
---
 Cargo.lock                     | 12 ++++--------
 crates/re_log_types/Cargo.toml |  1 -
 crates/re_viewer/Cargo.toml    |  1 -
 rerun_py/Cargo.toml            |  4 +---
 4 files changed, 5 insertions(+), 13 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 8ab55045d798..ab75a3766af0 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2355,9 +2355,6 @@ name = "jpeg-decoder"
 version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bc0000e42512c92e31c2252315bda326620a4e034105e900c98ec492fa077b3e"
-dependencies = [
- "rayon",
-]
 
 [[package]]
 name = "js-sys"
@@ -3704,20 +3701,19 @@ checksum = "60a357793950651c4ed0f3f52338f53b2f809f32d83a07f72909fa13e4c6c1e3"
 
 [[package]]
 name = "rayon"
-version = "1.6.0"
+version = "1.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e060280438193c554f654141c9ea9417886713b7acd75974c85b18a69a88e0b"
+checksum = "1d2df5196e37bcc87abebc0053e20787d73847bb33134a69841207dd0a47f03b"
 dependencies = [
- "crossbeam-deque",
  "either",
  "rayon-core",
 ]
 
 [[package]]
 name = "rayon-core"
-version = "1.10.1"
+version = "1.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cac410af5d00ab6884528b4ab69d1e8e146e8d471201800fa1b4524126de6ad3"
+checksum = "4b8f95bd6966f5c87776639160a66bd8ab9895d9d4ab01ddba9fc60661aebe8d"
 dependencies = [
  "crossbeam-channel",
  "crossbeam-deque",
diff --git a/crates/re_log_types/Cargo.toml b/crates/re_log_types/Cargo.toml
index 3666734ffe5f..6bafe68784a3 100644
--- a/crates/re_log_types/Cargo.toml
+++ b/crates/re_log_types/Cargo.toml
@@ -86,7 +86,6 @@ ecolor = { workspace = true, optional = true }
 glam = { workspace = true, optional = true }
 image = { workspace = true, optional = true, default-features = false, features = [
   "jpeg",
-  # "jpeg_rayon", # TODO(emilk): when https://github.com/rayon-rs/rayon/pull/1019 is released
 ] }
 macaw = { workspace = true, optional = true }
 rand = { version = "0.8", optional = true }
diff --git a/crates/re_viewer/Cargo.toml b/crates/re_viewer/Cargo.toml
index b41176022119..afb6def3471b 100644
--- a/crates/re_viewer/Cargo.toml
+++ b/crates/re_viewer/Cargo.toml
@@ -83,7 +83,6 @@ glam = { workspace = true, features = [
 half.workspace = true
 image = { workspace = true, default-features = false, features = [
   "jpeg",
-  # "jpeg_rayon", # TODO(emilk): when https://github.com/rayon-rs/rayon/pull/1019 is released
   "png",
 ] }
 instant = { version = "0.1", features = ["wasm-bindgen"] }
diff --git a/rerun_py/Cargo.toml b/rerun_py/Cargo.toml
index 84e536539ccb..9f5a687e1d86 100644
--- a/rerun_py/Cargo.toml
+++ b/rerun_py/Cargo.toml
@@ -59,9 +59,7 @@ crossbeam = "0.8"
 document-features = "0.2"
 glam.workspace = true
 half.workspace = true
-image = { workspace = true, default-features = false, features = [
-  "jpeg_rayon",
-] }
+image = { workspace = true, default-features = false, features = ["jpeg"] }
 itertools = "0.10"
 macaw.workspace = true
 mimalloc = { workspace = true, features = ["local_dynamic_tls"] }