Skip to content
New issue

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

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

Already on GitHub? Sign in to your account

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

Merged
merged 14 commits into from
Aug 25, 2023
2 changes: 1 addition & 1 deletion .github/workflows/reusable_bench.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/reusable_build_and_test_wheels.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/reusable_build_and_upload_rerun_c.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/reusable_build_web.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/reusable_build_web_demo.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/reusable_checks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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:
Expand Down Expand Up @@ -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

Expand Down Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/reusable_deploy_docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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: |
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/reusable_run_notebook.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/reusable_upload_wheels.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
4 changes: 2 additions & 2 deletions BUILD.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
37 changes: 10 additions & 27 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 2 additions & 3 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand Down Expand Up @@ -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 = ["x11"] }
Expand All @@ -90,7 +89,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"
Expand Down
11 changes: 11 additions & 0 deletions Cranky.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down Expand Up @@ -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",
Expand Down Expand Up @@ -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",
Expand Down Expand Up @@ -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",
Expand Down
6 changes: 3 additions & 3 deletions ci_docker/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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 '*'
Expand Down
2 changes: 1 addition & 1 deletion ci_docker/publish.sh
Original file line number Diff line number Diff line change
@@ -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`
Expand Down
7 changes: 6 additions & 1 deletion clippy.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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

# -----------------------------------------------------------------------------
Expand Down
Loading