Rust 1.72 + format let-else (!) (rerun-io#3102)

Woohoo ### What ### Checklist * [x] I have read and agree to [Contributor Guide](https://github.com/rerun-io/rerun/blob/main/CONTRIBUTING.md) and the [Code of Conduct](https://github.com/rerun-io/rerun/blob/main/CODE_OF_CONDUCT.md) * [x] I've included a screenshot or gif (if applicable) * [x] I have tested [demo.rerun.io](https://demo.rerun.io/pr/3102) (if applicable) - [PR Build Summary](https://build.rerun.io/pr/3102) - [Docs preview](https://rerun.io/preview/c72d547fb67e2a6b678bef8c757c4ea84416d675/docs)  - [Examples preview](https://rerun.io/preview/c72d547fb67e2a6b678bef8c757c4ea84416d675/examples)  - [Recent benchmark results](https://ref.rerun.io/dev/bench/) - [Wasm size tracking](https://ref.rerun.io/dev/sizes/) --------- Co-authored-by: Emil Ernerfeldt <[email protected]> Co-authored-by: Antoine Beyeler <[email protected]> Co-authored-by: Jeremy Leibs <[email protected]>
yuancaimaiyi · Aug 25, 2023 · 4c33262 · 4c33262
1 parent 8e3870f
commit 4c33262
Show file tree

Hide file tree

Showing 82 changed files with 303 additions and 223 deletions.
diff --git a/.github/workflows/reusable_bench.yml b/.github/workflows/reusable_bench.yml
@@ -56,7 +56,7 @@ jobs:
     runs-on: ubuntu-latest-16-cores
 
     container:
-      image: rerunio/ci_docker:0.8
+      image: rerunio/ci_docker:0.9
 
     steps:
       - uses: actions/checkout@v3

diff --git a/.github/workflows/reusable_build_and_test_wheels.yml b/.github/workflows/reusable_build_and_test_wheels.yml
@@ -74,7 +74,7 @@ jobs:
               runner="ubuntu-latest-16-cores"
               target="x86_64-unknown-linux-gnu"
               run_tests="true"
-              container="{'image': 'rerunio/ci_docker:0.8'}"
+              container="{'image': 'rerunio/ci_docker:0.9'}"
               ;;
             windows)
               runner="windows-latest-8-cores"

diff --git a/.github/workflows/reusable_build_and_upload_rerun_c.yml b/.github/workflows/reusable_build_and_upload_rerun_c.yml
@@ -94,7 +94,7 @@ jobs:
               runner="ubuntu-latest-16-cores"
               target="x86_64-unknown-linux-gnu"
               run_tests="true"
-              container="{'image': 'rerunio/ci_docker:0.8'}"
+              container="{'image': 'rerunio/ci_docker:0.9'}"
               lib_name="librerun_c.a"
               ;;
             windows)

diff --git a/.github/workflows/reusable_build_web.yml b/.github/workflows/reusable_build_web.yml
@@ -38,7 +38,7 @@ jobs:
     runs-on: ubuntu-latest-16-cores
 
     container:
-      image: rerunio/ci_docker:0.8
+      image: rerunio/ci_docker:0.9
 
     steps:
       - uses: actions/checkout@v3

diff --git a/.github/workflows/reusable_build_web_demo.yml b/.github/workflows/reusable_build_web_demo.yml
@@ -40,7 +40,7 @@ jobs:
     runs-on: ubuntu-latest-16-cores
 
     container:
-      image: rerunio/ci_docker:0.8
+      image: rerunio/ci_docker:0.9
 
     steps:
       - uses: actions/checkout@v3

diff --git a/.github/workflows/reusable_checks.yml b/.github/workflows/reusable_checks.yml
@@ -108,7 +108,7 @@ jobs:
     name: Rust lints (fmt, check, cranky, tests, doc)
     runs-on: ubuntu-latest-16-cores
     container:
-      image: rerunio/ci_docker:0.8
+      image: rerunio/ci_docker:0.9
     env:
       RUSTC_WRAPPER: "sccache"
     steps:
@@ -191,7 +191,7 @@ jobs:
     name: Check Rust web build (wasm32 + wasm-bindgen)
     runs-on: ubuntu-latest-16-cores
     container:
-      image: rerunio/ci_docker:0.8
+      image: rerunio/ci_docker:0.9
     env:
       RUSTC_WRAPPER: "sccache"
     steps:
@@ -295,7 +295,7 @@ jobs:
     name: Cargo Deny
     runs-on: ubuntu-latest
     container:
-      image: rerunio/ci_docker:0.8
+      image: rerunio/ci_docker:0.9
     steps:
       - uses: actions/checkout@v3
 
@@ -323,7 +323,7 @@ jobs:
     name: C++ tests
     runs-on: ubuntu-latest
     container:
-      image: rerunio/ci_docker:0.8
+      image: rerunio/ci_docker:0.9
     env:
       RUSTC_WRAPPER: "sccache"
     steps:

diff --git a/.github/workflows/reusable_deploy_docs.yml b/.github/workflows/reusable_deploy_docs.yml
@@ -106,7 +106,7 @@ jobs:
     name: Rust
     runs-on: ubuntu-latest-16-cores
     container:
-      image: rerunio/ci_docker:0.8
+      image: rerunio/ci_docker:0.9
     steps:
       - name: Show context
         run: |

diff --git a/.github/workflows/reusable_run_notebook.yml b/.github/workflows/reusable_run_notebook.yml
@@ -32,7 +32,7 @@ jobs:
     runs-on: ubuntu-latest
 
     container:
-      image: rerunio/ci_docker:0.8
+      image: rerunio/ci_docker:0.9
 
     steps:
       - uses: actions/checkout@v3

diff --git a/.github/workflows/reusable_upload_wheels.yml b/.github/workflows/reusable_upload_wheels.yml
@@ -30,7 +30,7 @@ jobs:
     runs-on: ubuntu-latest
 
     container:
-      image: rerunio/ci_docker:0.8
+      image: rerunio/ci_docker:0.9
 
     permissions:
       contents: "read"

diff --git a/BUILD.md b/BUILD.md
@@ -27,12 +27,12 @@ Finally, run the following script to install the dependencies and CLI tools need
 ./scripts/setup_dev.sh
 ```
 
-Make sure `cargo --version` prints `1.69.0` once you are done.
+Make sure `cargo --version` prints `1.72.0` once you are done.
 
 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.69.0
+rustup set default-host aarch64-apple-darwin && rustup install 1.72.0
 ```
 
 ## Building and running the viewer

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -17,7 +17,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.69"
+rust-version = "1.72"
 version = "0.9.0-alpha.2+dev"
 
 [workspace.dependencies]
@@ -77,7 +77,6 @@ camino = "1.1"
 cfg-if = "1.0"
 clap = "4.0"
 comfy-table = { version = "6.1", default-features = false }
-const_panic = { version = "0.2.8", features = ["rust_1_64"] }
 crossbeam = "0.8"
 ecolor = "0.22.0"
 eframe = { version = "0.22.0", default-features = false, features = [
@@ -94,7 +93,7 @@ enumset = "1.0.12"
 epaint = "0.22.0"
 glam = "0.22"
 gltf = "1.1"
-half = "=2.2.1" # Pinned because of https://github.com/starkat99/half-rs/issues/97
+half = "2.3.1"
 image = { version = "0.24", default-features = false }
 itertools = "0.11"
 lazy_static = "1.4"

diff --git a/Cranky.toml b/Cranky.toml
@@ -15,6 +15,7 @@ warn = [
   "clippy::bool_to_int_with_if",
   "clippy::char_lit_as_u8",
   "clippy::checked_conversions",
+  "clippy::clear_with_drain",
   "clippy::cloned_instead_of_copied",
   "clippy::dbg_macro",
   "clippy::debug_assert_with_mut_call",
@@ -54,6 +55,7 @@ warn = [
   "clippy::large_digit_groups",
   "clippy::large_include_file",
   "clippy::large_stack_arrays",
+  "clippy::large_stack_frames",
   "clippy::large_types_passed_by_value",
   "clippy::let_unit_value",
   "clippy::linkedlist",
@@ -88,27 +90,34 @@ warn = [
   "clippy::option_option",
   "clippy::path_buf_push_overwrite",
   "clippy::ptr_as_ptr",
+  "clippy::ptr_cast_constness",
   "clippy::rc_mutex",
+  "clippy::redundant_type_annotations",
   "clippy::ref_option_ref",
   "clippy::rest_pat_in_fully_bound_structs",
   "clippy::same_functions_in_if_condition",
   "clippy::semicolon_if_nothing_returned",
+  "clippy::significant_drop_tightening",
   "clippy::single_match_else",
   "clippy::str_to_string",
   "clippy::string_add_assign",
   "clippy::string_add",
   "clippy::string_lit_as_bytes",
   "clippy::string_to_string",
+  "clippy::suspicious_command_arg_space",
   "clippy::suspicious_xor_used_as_pow",
   "clippy::todo",
   "clippy::too_many_lines",
   "clippy::trailing_empty_array",
   "clippy::trait_duplication_in_bounds",
+  "clippy::tuple_array_conversions",
   "clippy::unchecked_duration_subtraction",
   "clippy::undocumented_unsafe_blocks",
   "clippy::unimplemented",
   "clippy::uninlined_format_args",
+  "clippy::unnecessary_box_returns",
   "clippy::unnecessary_safety_doc",
+  "clippy::unnecessary_struct_initialization",
   "clippy::unnecessary_wraps",
   "clippy::unnested_or_patterns",
   "clippy::unused_peekable",
@@ -138,6 +147,8 @@ allow = [
 
   # TODO(emilk): enable more of these lints:
   "clippy::cloned_instead_of_copied",
+  "clippy::let_underscore_untyped",
+  "clippy::missing_assert_message",
   "clippy::missing_errors_doc",
   "trivial_casts",
   "unused_qualifications",

diff --git a/ci_docker/Dockerfile b/ci_docker/Dockerfile
@@ -2,7 +2,7 @@ FROM ubuntu:20.04
 LABEL maintainer="[email protected]"
 # Remember to update the version in publish.sh
 # TODO(jleibs) use this version in the publish.sh script and below in the CACHE_KEY
-LABEL version="0.8"
+LABEL version="0.9"
 LABEL description="Docker image used for the CI of https://github.com/rerun-io/rerun"
 
 # Install the ubuntu package dependencies
@@ -46,7 +46,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.69.0 \
+    RUST_VERSION=1.72.0 \
     RUSTUP_VERSION=1.26.0
 
 # Install Rust
@@ -84,7 +84,7 @@ RUN ./setup_web.sh || true
 RUN curl -L https://github.com/WebAssembly/binaryen/releases/download/version_112/binaryen-version_112-x86_64-linux.tar.gz | tar xzk --strip-components 1
 
 # Increment this to invalidate cache
-ENV CACHE_KEY=rerun_docker_v0.7
+ENV CACHE_KEY=rerun_docker_v0.9
 
 # See: https://github.com/actions/runner-images/issues/6775#issuecomment-1410270956
 RUN git config --system --add safe.directory '*'

diff --git a/ci_docker/publish.sh b/ci_docker/publish.sh
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 set -eux
 
-VERSION=0.8 # Bump on each new version. Remember to update the version in the Dockerfile too.
+VERSION=0.9 # Bump on each new version. Remember to update the version in the Dockerfile too.
 
 # The build needs to run from top of repo to access the requirements.txt
 cd `git rev-parse --show-toplevel`

diff --git a/clippy.toml b/clippy.toml
@@ -3,19 +3,24 @@
 # -----------------------------------------------------------------------------
 # Section identical to the main scripts/clippy_wasm/clippy.toml:
 
-msrv = "1.69"
+msrv = "1.72"
 
 allow-unwrap-in-tests = true
 
 # https://doc.rust-lang.org/nightly/clippy/lint_configuration.html#avoid-breaking-exported-api
 # We want suggestions, even if it changes public API.
 avoid-breaking-exported-api = false
 
+excessive-nesting-threshold = 16 # TODO(emilk): lower this
+
 max-fn-params-bools = 2 # TODO(emilk): decrease this to 1
 
 # https://rust-lang.github.io/rust-clippy/master/index.html#/large_include_file
 max-include-file-size = 1000000
 
+# https://rust-lang.github.io/rust-clippy/master/index.html#/large_stack_frames
+stack-size-threshold = 512000
+
 too-many-lines-threshold = 600 # TODO(emilk): decrease this
 
 # -----------------------------------------------------------------------------