rerun-io · teh-cmc · May 2, 2023 · Apr 19, 2023 · Apr 19, 2023 · Apr 20, 2023
diff --git a/.github/workflows/reusable_build_web.yml b/.github/workflows/reusable_build_web.yml
@@ -44,13 +44,6 @@ jobs:
     steps:
       - uses: actions/checkout@v3
 
-      - uses: actions-rs/toolchain@v1
-        with:
-          profile: minimal
-          toolchain: 1.67.0
-          target: wasm32-unknown-unknown
-          override: true
-
       - name: Set up cargo cache
         uses: Swatinem/rust-cache@v2
         with:

diff --git a/.github/workflows/reusable_checks.yml b/.github/workflows/reusable_checks.yml
@@ -206,13 +206,6 @@ jobs:
     steps:
       - uses: actions/checkout@v3
 
-      - uses: actions-rs/toolchain@v1
-        with:
-          profile: default
-          toolchain: 1.67.1
-          target: wasm32-unknown-unknown
-          override: true
-
       - name: Set up cargo cache
         uses: Swatinem/rust-cache@v2
         with:
@@ -249,12 +242,6 @@ jobs:
 
       - uses: actions/checkout@v3
 
-      - uses: actions-rs/toolchain@v1
-        with:
-          profile: minimal
-          toolchain: 1.67.1
-          override: true
-
       - name: Set up cargo cache
         uses: Swatinem/rust-cache@v2
         with:

diff --git a/BUILD.md b/BUILD.md
@@ -15,15 +15,15 @@ This is a guide to how to build Rerun.
 * Install the Rust toolchain: <https://rustup.rs/>
 * `git clone git@github.com:rerun-io/rerun.git && cd rerun`
 * Run `./scripts/setup_dev.sh`.
-* Make sure `cargo --version` prints `1.67.1` once you are done
+* Make sure `cargo --version` prints `1.69.0` once you are done
 
 
 ### Apple-silicon Macs
 
 If you are using an Apple-silicon Mac (M1, M2), make sure `rustc -vV` outputs `host: aarch64-apple-darwin`. If not, this should fix it:
 
 ```sh
-rustup set default-host aarch64-apple-darwin && rustup install 1.67.1
+rustup set default-host aarch64-apple-darwin && rustup install 1.69.0
 ```
 
 ## Building the docs

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -15,7 +15,7 @@ homepage = "https://rerun.io"
 include = ["../../LICENSE-APACHE", "../../LICENSE-MIT", "**/*.rs", "Cargo.toml"]
 license = "MIT OR Apache-2.0"
 repository = "https://github.com/rerun-io/rerun"
-rust-version = "1.67"
+rust-version = "1.69"
 version = "0.6.0-alpha.0"
 
 [workspace.dependencies]
@@ -83,9 +83,11 @@ polars-ops = "0.27.1"
 puffin = "0.14"
 smallvec = { version = "1.0", features = ["const_generics", "union"] }
 thiserror = "1.0"
-time = { version = "0.3", features = ["wasm-bindgen"] }
+time = { version = "0.3", default-features = false, features = [
+  "wasm-bindgen",
+] }
 tinyvec = { version = "1.6", features = ["alloc", "rustc_1_55"] }
-tokio = "1.24"
+tokio = { version = "1.24", default-features = false }
 wgpu = { version = "0.16" }
 wgpu-core = { version = "0.16" }
 

diff --git a/ci_docker/Dockerfile b/ci_docker/Dockerfile
@@ -36,7 +36,7 @@ RUN curl -L https://github.com/NixOS/patchelf/releases/download/0.17.2/patchelf-
 ENV RUSTUP_HOME=/usr/local/rustup \
     CARGO_HOME=/usr/local/cargo \
     PATH=/usr/local/cargo/bin:$PATH \
-    RUST_VERSION=1.67.1 \
+    RUST_VERSION=1.69.0 \
     RUSTUP_VERSION=1.25.2
 
 # Install Rust

diff --git a/clippy.toml b/clippy.toml
@@ -1,6 +1,6 @@
 # There is also a scripts/clippy_wasm/clippy.toml which forbids some methods that are not available in wasm.
 
-msrv = "1.67"
+msrv = "1.69"
 
 allow-unwrap-in-tests = true
 

diff --git a/crates/re_log_types/Cargo.toml b/crates/re_log_types/Cargo.toml
@@ -73,10 +73,7 @@ num-derive = "0.3"
 num-traits = "0.2"
 smallvec.workspace = true
 thiserror.workspace = true
-time = { workspace = true, default-features = false, features = [
-  "formatting",
-  "macros",
-] }
+time = { workspace = true, features = ["formatting", "macros"] }
 typenum = "1.15"
 uuid = { version = "1.1", features = ["serde", "v4", "js"] }
 

diff --git a/crates/re_log_types/src/component_types/mesh3d.rs b/crates/re_log_types/src/component_types/mesh3d.rs
@@ -23,7 +23,7 @@ pub struct MeshId(pub uuid::Uuid);
 impl nohash_hasher::IsEnabled for MeshId {}
 
 // required for [`nohash_hasher`].
-#[allow(clippy::derive_hash_xor_eq)]
+#[allow(clippy::derived_hash_with_manual_eq)]
 impl std::hash::Hash for MeshId {
     #[inline]
     fn hash<H: std::hash::Hasher>(&self, state: &mut H) {

diff --git a/crates/re_log_types/src/component_types/tensor.rs b/crates/re_log_types/src/component_types/tensor.rs
@@ -21,7 +21,7 @@ pub struct TensorId(pub uuid::Uuid);
 impl nohash_hasher::IsEnabled for TensorId {}
 
 // required for [`nohash_hasher`].
-#[allow(clippy::derive_hash_xor_eq)]
+#[allow(clippy::derived_hash_with_manual_eq)]
 impl std::hash::Hash for TensorId {
     #[inline]
     fn hash<H: std::hash::Hasher>(&self, state: &mut H) {

diff --git a/crates/re_log_types/src/lib.rs b/crates/re_log_types/src/lib.rs
@@ -83,7 +83,7 @@ pub struct RecordingId(uuid::Uuid);
 impl nohash_hasher::IsEnabled for RecordingId {}
 
 // required for [`nohash_hasher`].
-#[allow(clippy::derive_hash_xor_eq)]
+#[allow(clippy::derived_hash_with_manual_eq)]
 impl std::hash::Hash for RecordingId {
     #[inline]
     fn hash<H: std::hash::Hasher>(&self, state: &mut H) {

diff --git a/crates/re_log_types/src/time_point/timeline.rs b/crates/re_log_types/src/time_point/timeline.rs
@@ -108,7 +108,7 @@ impl SizeBytes for Timeline {
 }
 
 // required for [`nohash_hasher`].
-#[allow(clippy::derive_hash_xor_eq)]
+#[allow(clippy::derived_hash_with_manual_eq)]
 impl std::hash::Hash for Timeline {
     #[inline]
     fn hash<H: std::hash::Hasher>(&self, state: &mut H) {

diff --git a/crates/re_string_interner/src/lib.rs b/crates/re_string_interner/src/lib.rs
@@ -169,7 +169,8 @@ impl StringInterner {
         // and that is wat `ier()` gives us, so this is all correct.
         self.map
             .iter()
-            .map(|(k, v)| std::mem::size_of_val(k) + std::mem::size_of_val(v) + v.len())
+            // NOTE: v is a `&&str`!
+            .map(|(k, v)| std::mem::size_of_val(k) + std::mem::size_of_val(*v) + v.len())
             .sum()
     }
 }

diff --git a/crates/re_viewer/Cargo.toml b/crates/re_viewer/Cargo.toml
@@ -101,7 +101,7 @@ serde = { version = "1", features = ["derive"] }
 slotmap = { version = "1.0.6", features = ["serde"] }
 smallvec = { workspace = true, features = ["serde"] }
 thiserror.workspace = true
-time = { workspace = true, default-features = false, features = ["formatting"] }
+time = { workspace = true, features = ["formatting"] }
 uuid = { version = "1.1", features = ["serde", "v4", "js"] }
 vec1 = "1.8"
 wgpu.workspace = true

diff --git a/crates/re_ws_comms/Cargo.toml b/crates/re_ws_comms/Cargo.toml
@@ -61,7 +61,7 @@ futures-util = { version = "0.3", optional = true, default-features = false, fea
 ] }
 parking_lot = { workspace = true, optional = true }
 tokio-tungstenite = { version = "0.17.1", optional = true }
-tokio = { workspace = true, optional = true, default-features = false, features = [
+tokio = { workspace = true, optional = true, features = [
   "io-std",
   "macros",
   "net",

diff --git a/crates/re_ws_comms/src/server.rs b/crates/re_ws_comms/src/server.rs
@@ -110,8 +110,7 @@ impl RerunServerHandle {
         let rt = tokio::runtime::Handle::current();
 
         let ws_server = rt.block_on(tokio::spawn(async move {
-            let ws_server = RerunServer::new(requested_port).await;
-            ws_server
+            RerunServer::new(requested_port).await
         }))??;
 
         let port = ws_server.port;

diff --git a/examples/rust/raw_mesh/src/main.rs b/examples/rust/raw_mesh/src/main.rs
@@ -272,7 +272,7 @@ fn node_primitives<'data>(
             let reader = primitive.reader(|buffer| Some(&buffers[buffer.index()]));
 
             let indices = reader.read_indices();
-            let indices = indices.map(|indices| indices.into_u32().into_iter().collect());
+            let indices = indices.map(|indices| indices.into_u32().collect());
 
             let vertex_positions = reader.read_positions().unwrap();
             let vertex_positions = vertex_positions.collect();

diff --git a/rerun_py/Cargo.toml b/rerun_py/Cargo.toml
@@ -44,11 +44,7 @@ re_error.workspace = true
 re_log.workspace = true
 re_log_types.workspace = true
 re_memory.workspace = true
-rerun = { workspace = true, default-features = false, features = [
-  "analytics",
-  "server",
-  "sdk",
-] }
+rerun = { workspace = true, features = ["analytics", "server", "sdk"] }
 re_web_viewer_server = { workspace = true, optional = true }
 re_ws_comms = { workspace = true, optional = true }
 

diff --git a/rerun_py/README.md b/rerun_py/README.md
@@ -61,7 +61,7 @@ Setup:
 * Install the Rust toolchain: <https://rustup.rs/>
 * `git clone git@github.com:rerun-io/rerun.git && cd rerun`
 * Run `./scripts/setup_dev.sh`.
-* Make sure `cargo --version` prints `1.67.1` once you are done
+* Make sure `cargo --version` prints `1.69.0` once you are done
 
 ## Building
 To build from source and install Rerun into your *current* Python environment run:
@@ -152,10 +152,10 @@ You can run with `RUST_LOG=debug` to get more output out of the rerun SDK.
 If you are using an Apple-silicon Mac, make sure `rustc -vV` outputs `host: aarch64-apple-darwin`. If not, this should fix it:
 
 ``` sh
-rustup set default-host aarch64-apple-darwin && rustup install 1.67
+rustup set default-host aarch64-apple-darwin && rustup install 1.69
 ```
 
 If you want to switch back, this is how:
 ``` sh
-rustup set default-host x86_64-apple-darwin && rustup install 1.67
+rustup set default-host x86_64-apple-darwin && rustup install 1.69
 ```
diff --git a/rust-toolchain b/rust-toolchain
@@ -5,6 +5,6 @@
 # to the user in the error, instead of "error: invalid channel name '[toolchain]'".
 
 [toolchain]
-channel = "1.67.1"
+channel = "1.69.0"
 components = ["rustfmt", "clippy"]
 targets = ["wasm32-unknown-unknown"]
diff --git a/scripts/clippy_wasm/clippy.toml b/scripts/clippy_wasm/clippy.toml
@@ -3,7 +3,7 @@
 # We cannot forbid all these methods in the main `clippy.toml` because of
 # https://github.com/rust-lang/rust-clippy/issues/10406
 
-msrv = "1.67"
+msrv = "1.69"
 
 # https://rust-lang.github.io/rust-clippy/master/index.html#disallowed_methods
 disallowed-methods = [

diff --git a/scripts/setup.sh b/scripts/setup.sh
@@ -32,7 +32,7 @@ elif [ -x "$(command -v dnf)" ];   then
 fi
 
 # Needed to compile and check the code:
-rustup install 1.67.1
+rustup install 1.69.0
 ./scripts/setup_web.sh
 
 echo "setup.sh completed!"