From 6bd62afa56f9ec515cb54aeaf1c11f8feffad28e Mon Sep 17 00:00:00 2001 From: Clement Rey Date: Wed, 6 Nov 2024 14:49:50 +0100 Subject: [PATCH] dont mind me --- .github/workflows/nightly.yml | 2 +- BUILD.md | 4 ++-- CHANGELOG.md | 4 ++-- Cargo.toml | 2 +- clippy.toml | 2 +- .../viewer/re_viewer/data/quick_start_guides/rust_connect.md | 2 +- crates/viewer/re_viewer/data/quick_start_guides/rust_spawn.md | 2 +- docs/content/getting-started/installing-viewer.md | 2 +- docs/content/getting-started/quick-start/rust.md | 2 +- docs/content/reference/migration/migration-0-19.md | 2 +- examples/rust/clock/Cargo.toml | 2 +- examples/rust/custom_data_loader/Cargo.toml | 2 +- examples/rust/custom_space_view/Cargo.toml | 2 +- examples/rust/custom_store_subscriber/Cargo.toml | 2 +- examples/rust/dataframe_query/Cargo.toml | 2 +- examples/rust/dna/Cargo.toml | 2 +- examples/rust/extend_viewer_ui/Cargo.toml | 2 +- examples/rust/external_data_loader/Cargo.toml | 2 +- examples/rust/incremental_logging/Cargo.toml | 2 +- examples/rust/log_file/Cargo.toml | 2 +- examples/rust/minimal/Cargo.toml | 2 +- examples/rust/minimal_options/Cargo.toml | 2 +- examples/rust/minimal_serve/Cargo.toml | 2 +- examples/rust/objectron/Cargo.toml | 2 +- examples/rust/raw_mesh/Cargo.toml | 2 +- examples/rust/shared_recording/Cargo.toml | 2 +- examples/rust/spawn_viewer/Cargo.toml | 2 +- examples/rust/stdio/Cargo.toml | 2 +- examples/rust/template/Cargo.toml | 2 +- rust-toolchain | 2 +- scripts/check_env.py | 4 ++-- scripts/clippy_wasm/clippy.toml | 2 +- scripts/lint.py | 2 +- 33 files changed, 36 insertions(+), 36 deletions(-) diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index f22905cfcc4c..b586c858d39c 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -59,7 +59,7 @@ jobs: - uses: actions/checkout@v4 - uses: dtolnay/rust-toolchain@master with: - toolchain: 1.79.0 + toolchain: 1.80.0 - run: cargo build -p rerun diff --git a/BUILD.md b/BUILD.md index 8e22c44d6c3c..ba986e935f6d 100644 --- a/BUILD.md +++ b/BUILD.md @@ -23,12 +23,12 @@ cd rerun Now install the `pixi` package manager: -Make sure `cargo --version` prints `1.79.0` once you are done. +Make sure `cargo --version` prints `1.80.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.79.0 +rustup set default-host aarch64-apple-darwin && rustup install 1.80.0 ``` ## Validating your environment diff --git a/CHANGELOG.md b/CHANGELOG.md index d52434269ab5..1f66a68174a7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -46,7 +46,7 @@ Read more about our video supports (and its limits) [in our video docs](https:// ### ⚠️ Breaking changes * 🗾 Blueprint files (.rbl) from previous Rerun versions will no longer load _automatically_ * 🐧 Linux: Rerun now requires glibc 2.17+ -* 🦀 Rust: The minimum supported Rust version is now 1.79 +* 🦀 Rust: The minimum supported Rust version is now 1.80 🧳 Migration guide: http://rerun.io/docs/reference/migration/migration-0-19 @@ -70,7 +70,7 @@ Read more about our video supports (and its limits) [in our video docs](https:// - Add support for NumPy arrays to the arrow serializer for string datatypes [#7689](https://github.com/rerun-io/rerun/pull/7689) #### 🦀 Rust API -- Update MSRV to Rust 1.79 [#7563](https://github.com/rerun-io/rerun/pull/7563) +- Update MSRV to Rust 1.80 [#7563](https://github.com/rerun-io/rerun/pull/7563) - Update ndarray to 0.16 and ndarray-rand to 0.15 [#7358](https://github.com/rerun-io/rerun/pull/7358) (thanks [@benliepert](https://github.com/benliepert)!) - Replace `host_web_viewer` method with `WebViewerConfig::host_web_viewer` [#7553](https://github.com/rerun-io/rerun/pull/7553) - Fix Rust's `TimeColumn::new_seconds/new_nanos` creating sequence timelines [#7402](https://github.com/rerun-io/rerun/pull/7402) diff --git a/Cargo.toml b/Cargo.toml index 588f1cae5d28..4502bf923f7d 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -24,7 +24,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.79" +rust-version = "1.80" version = "0.20.0-alpha.1+dev" [workspace.dependencies] diff --git a/clippy.toml b/clippy.toml index 183ee3f5f3e5..b9f05c287f9e 100644 --- a/clippy.toml +++ b/clippy.toml @@ -3,7 +3,7 @@ # ----------------------------------------------------------------------------- # Section identical to the main scripts/clippy_wasm/clippy.toml: -msrv = "1.79" +msrv = "1.80" allow-unwrap-in-tests = true diff --git a/crates/viewer/re_viewer/data/quick_start_guides/rust_connect.md b/crates/viewer/re_viewer/data/quick_start_guides/rust_connect.md index fb8bde3efc96..c5b748b7772f 100644 --- a/crates/viewer/re_viewer/data/quick_start_guides/rust_connect.md +++ b/crates/viewer/re_viewer/data/quick_start_guides/rust_connect.md @@ -10,7 +10,7 @@ Let's try it out in a brand-new Rust project: cargo init cube && cd cube && cargo add rerun --features native_viewer ``` -Note that the Rerun SDK requires a working installation of Rust 1.79+. +Note that the Rerun SDK requires a working installation of Rust 1.80+. ## Logging your own data diff --git a/crates/viewer/re_viewer/data/quick_start_guides/rust_spawn.md b/crates/viewer/re_viewer/data/quick_start_guides/rust_spawn.md index 639c828875c2..cde772f1aad2 100644 --- a/crates/viewer/re_viewer/data/quick_start_guides/rust_spawn.md +++ b/crates/viewer/re_viewer/data/quick_start_guides/rust_spawn.md @@ -10,7 +10,7 @@ Let's try it out in a brand-new Rust project: cargo init cube && cd cube && cargo add rerun ``` -Note that the Rerun SDK requires a working installation of Rust 1.79+. +Note that the Rerun SDK requires a working installation of Rust 1.80+. ## Logging your own data diff --git a/docs/content/getting-started/installing-viewer.md b/docs/content/getting-started/installing-viewer.md index 863796974311..55ebc55e8ab8 100644 --- a/docs/content/getting-started/installing-viewer.md +++ b/docs/content/getting-started/installing-viewer.md @@ -40,7 +40,7 @@ There are many ways to install the viewer. Please pick whatever works best for y - Download `rerun-cli` for your platform from the [GitHub Release artifacts](https://github.com/rerun-io/rerun/releases/latest/). - Via Cargo - `cargo binstall rerun-cli` - download binaries via [`cargo binstall`](https://github.com/cargo-bins/cargo-binstall) - - `cargo install rerun-cli --locked` - build it from source (this requires Rust 1.79+) + - `cargo install rerun-cli --locked` - build it from source (this requires Rust 1.80+) - Together with the Rerun [Python SDK](./quick-start/python.md): - `pip3 install rerun-sdk` - download it via pip - `conda install -c conda-forge rerun-sdk` - download via Conda diff --git a/docs/content/getting-started/quick-start/rust.md b/docs/content/getting-started/quick-start/rust.md index f1355e514b31..c79bc34db7c2 100644 --- a/docs/content/getting-started/quick-start/rust.md +++ b/docs/content/getting-started/quick-start/rust.md @@ -5,7 +5,7 @@ order: 3 ## Setup -The Rerun SDK for Rust requires a working installation of Rust 1.79+. +The Rerun SDK for Rust requires a working installation of Rust 1.80+. After you have [installed the viewer](../installing-viewer.md#installing-the-viewer) you can simply add [the Rerun crate](https://crates.io/crates/rerun) to your project with `cargo add rerun`. diff --git a/docs/content/reference/migration/migration-0-19.md b/docs/content/reference/migration/migration-0-19.md index 53985ec3bccb..9dcd64f8eedb 100644 --- a/docs/content/reference/migration/migration-0-19.md +++ b/docs/content/reference/migration/migration-0-19.md @@ -11,5 +11,5 @@ Rerun now require glibc 2.17 or higher. This is because we updated the Rust version. See for more details. ### 🦀 Rust -- Update MSRV to Rust 1.79 [#7563](https://github.com/rerun-io/rerun/pull/7563) +- Update MSRV to Rust 1.80 [#7563](https://github.com/rerun-io/rerun/pull/7563) - Update ndarray to 0.16 and ndarray-rand to 0.15 [#7358](https://github.com/rerun-io/rerun/pull/7358) (thanks [@benliepert](https://github.com/benliepert)!) diff --git a/examples/rust/clock/Cargo.toml b/examples/rust/clock/Cargo.toml index 43ce29a8b54b..74ac112e68e5 100644 --- a/examples/rust/clock/Cargo.toml +++ b/examples/rust/clock/Cargo.toml @@ -2,7 +2,7 @@ name = "clock" version = "0.20.0-alpha.1+dev" edition = "2021" -rust-version = "1.79" +rust-version = "1.80" license = "MIT OR Apache-2.0" publish = false diff --git a/examples/rust/custom_data_loader/Cargo.toml b/examples/rust/custom_data_loader/Cargo.toml index db7b9415f8cb..4778d6364e56 100644 --- a/examples/rust/custom_data_loader/Cargo.toml +++ b/examples/rust/custom_data_loader/Cargo.toml @@ -2,7 +2,7 @@ name = "custom_data_loader" version = "0.20.0-alpha.1+dev" edition = "2021" -rust-version = "1.79" +rust-version = "1.80" license = "MIT OR Apache-2.0" publish = false diff --git a/examples/rust/custom_space_view/Cargo.toml b/examples/rust/custom_space_view/Cargo.toml index 999e2f408954..af3ce4716741 100644 --- a/examples/rust/custom_space_view/Cargo.toml +++ b/examples/rust/custom_space_view/Cargo.toml @@ -2,7 +2,7 @@ name = "custom_space_view" version = "0.20.0-alpha.1+dev" edition = "2021" -rust-version = "1.79" +rust-version = "1.80" license = "MIT OR Apache-2.0" publish = false diff --git a/examples/rust/custom_store_subscriber/Cargo.toml b/examples/rust/custom_store_subscriber/Cargo.toml index 6daed5c7ba69..bacbd66e29ca 100644 --- a/examples/rust/custom_store_subscriber/Cargo.toml +++ b/examples/rust/custom_store_subscriber/Cargo.toml @@ -2,7 +2,7 @@ name = "custom_store_subscriber" version = "0.20.0-alpha.1+dev" edition = "2021" -rust-version = "1.79" +rust-version = "1.80" license = "MIT OR Apache-2.0" publish = false diff --git a/examples/rust/dataframe_query/Cargo.toml b/examples/rust/dataframe_query/Cargo.toml index c5ff000589f9..80e5124d8810 100644 --- a/examples/rust/dataframe_query/Cargo.toml +++ b/examples/rust/dataframe_query/Cargo.toml @@ -2,7 +2,7 @@ name = "dataframe_query" version = "0.19.0-alpha.7" edition = "2021" -rust-version = "1.79" +rust-version = "1.80" license = "MIT OR Apache-2.0" publish = false diff --git a/examples/rust/dna/Cargo.toml b/examples/rust/dna/Cargo.toml index 2ae54d944609..2ba7cd3fd8d5 100644 --- a/examples/rust/dna/Cargo.toml +++ b/examples/rust/dna/Cargo.toml @@ -2,7 +2,7 @@ name = "dna" version = "0.20.0-alpha.1+dev" edition = "2021" -rust-version = "1.79" +rust-version = "1.80" license = "MIT OR Apache-2.0" publish = false diff --git a/examples/rust/extend_viewer_ui/Cargo.toml b/examples/rust/extend_viewer_ui/Cargo.toml index f6ca4bd5af13..136d6de7b71a 100644 --- a/examples/rust/extend_viewer_ui/Cargo.toml +++ b/examples/rust/extend_viewer_ui/Cargo.toml @@ -2,7 +2,7 @@ name = "extend_viewer_ui" version = "0.20.0-alpha.1+dev" edition = "2021" -rust-version = "1.79" +rust-version = "1.80" license = "MIT OR Apache-2.0" publish = false diff --git a/examples/rust/external_data_loader/Cargo.toml b/examples/rust/external_data_loader/Cargo.toml index 41093497abd6..b97f3f20e017 100644 --- a/examples/rust/external_data_loader/Cargo.toml +++ b/examples/rust/external_data_loader/Cargo.toml @@ -2,7 +2,7 @@ name = "rerun-loader-rust-file" version = "0.20.0-alpha.1+dev" edition = "2021" -rust-version = "1.79" +rust-version = "1.80" license = "MIT OR Apache-2.0" publish = false diff --git a/examples/rust/incremental_logging/Cargo.toml b/examples/rust/incremental_logging/Cargo.toml index 1526d2e86103..e51055ab1acc 100644 --- a/examples/rust/incremental_logging/Cargo.toml +++ b/examples/rust/incremental_logging/Cargo.toml @@ -2,7 +2,7 @@ name = "incremental_logging" version = "0.20.0-alpha.1+dev" edition = "2021" -rust-version = "1.79" +rust-version = "1.80" license = "MIT OR Apache-2.0" publish = false diff --git a/examples/rust/log_file/Cargo.toml b/examples/rust/log_file/Cargo.toml index 1cdee09bbdc1..0a6ecb89c977 100644 --- a/examples/rust/log_file/Cargo.toml +++ b/examples/rust/log_file/Cargo.toml @@ -2,7 +2,7 @@ name = "log_file" version = "0.20.0-alpha.1+dev" edition = "2021" -rust-version = "1.79" +rust-version = "1.80" license = "MIT OR Apache-2.0" publish = false diff --git a/examples/rust/minimal/Cargo.toml b/examples/rust/minimal/Cargo.toml index 902b9161106b..651fde0f61c4 100644 --- a/examples/rust/minimal/Cargo.toml +++ b/examples/rust/minimal/Cargo.toml @@ -2,7 +2,7 @@ name = "minimal" version = "0.20.0-alpha.1+dev" edition = "2021" -rust-version = "1.79" +rust-version = "1.80" license = "MIT OR Apache-2.0" publish = false diff --git a/examples/rust/minimal_options/Cargo.toml b/examples/rust/minimal_options/Cargo.toml index 1eb9173c3d53..55ea02f59fea 100644 --- a/examples/rust/minimal_options/Cargo.toml +++ b/examples/rust/minimal_options/Cargo.toml @@ -2,7 +2,7 @@ name = "minimal_options" version = "0.20.0-alpha.1+dev" edition = "2021" -rust-version = "1.79" +rust-version = "1.80" license = "MIT OR Apache-2.0" publish = false diff --git a/examples/rust/minimal_serve/Cargo.toml b/examples/rust/minimal_serve/Cargo.toml index 4fb7f927f588..27fce971299a 100644 --- a/examples/rust/minimal_serve/Cargo.toml +++ b/examples/rust/minimal_serve/Cargo.toml @@ -2,7 +2,7 @@ name = "minimal_serve" version = "0.20.0-alpha.1+dev" edition = "2021" -rust-version = "1.79" +rust-version = "1.80" license = "MIT OR Apache-2.0" publish = false diff --git a/examples/rust/objectron/Cargo.toml b/examples/rust/objectron/Cargo.toml index 323ad5923c2e..f430f0fce699 100644 --- a/examples/rust/objectron/Cargo.toml +++ b/examples/rust/objectron/Cargo.toml @@ -2,7 +2,7 @@ name = "objectron" version = "0.20.0-alpha.1+dev" edition = "2021" -rust-version = "1.79" +rust-version = "1.80" license = "MIT OR Apache-2.0" publish = false diff --git a/examples/rust/raw_mesh/Cargo.toml b/examples/rust/raw_mesh/Cargo.toml index 908e3584fc94..8a5701d372eb 100644 --- a/examples/rust/raw_mesh/Cargo.toml +++ b/examples/rust/raw_mesh/Cargo.toml @@ -2,7 +2,7 @@ name = "raw_mesh" version = "0.20.0-alpha.1+dev" edition = "2021" -rust-version = "1.79" +rust-version = "1.80" license = "MIT OR Apache-2.0" publish = false diff --git a/examples/rust/shared_recording/Cargo.toml b/examples/rust/shared_recording/Cargo.toml index 28b2bfc040fc..f3390efc0fa5 100644 --- a/examples/rust/shared_recording/Cargo.toml +++ b/examples/rust/shared_recording/Cargo.toml @@ -2,7 +2,7 @@ name = "shared_recording" version = "0.20.0-alpha.1+dev" edition = "2021" -rust-version = "1.79" +rust-version = "1.80" license = "MIT OR Apache-2.0" publish = false diff --git a/examples/rust/spawn_viewer/Cargo.toml b/examples/rust/spawn_viewer/Cargo.toml index 4d8046355e75..75f5cff50cd6 100644 --- a/examples/rust/spawn_viewer/Cargo.toml +++ b/examples/rust/spawn_viewer/Cargo.toml @@ -2,7 +2,7 @@ name = "spawn_viewer" version = "0.20.0-alpha.1+dev" edition = "2021" -rust-version = "1.79" +rust-version = "1.80" license = "MIT OR Apache-2.0" publish = false diff --git a/examples/rust/stdio/Cargo.toml b/examples/rust/stdio/Cargo.toml index 3b9cbf34dd06..e3560ab49ac0 100644 --- a/examples/rust/stdio/Cargo.toml +++ b/examples/rust/stdio/Cargo.toml @@ -2,7 +2,7 @@ name = "stdio" version = "0.20.0-alpha.1+dev" edition = "2021" -rust-version = "1.79" +rust-version = "1.80" license = "MIT OR Apache-2.0" publish = false diff --git a/examples/rust/template/Cargo.toml b/examples/rust/template/Cargo.toml index e728cd265541..9fca448c7476 100644 --- a/examples/rust/template/Cargo.toml +++ b/examples/rust/template/Cargo.toml @@ -2,7 +2,7 @@ name = "template" version = "0.20.0-alpha.1+dev" edition = "2021" -rust-version = "1.79" +rust-version = "1.80" license = "MIT OR Apache-2.0" publish = false diff --git a/rust-toolchain b/rust-toolchain index 9fdafb7a67a2..38e5e90f3acf 100644 --- 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.79.0" +channel = "1.80.0" components = ["rustfmt", "clippy"] targets = ["wasm32-unknown-unknown"] diff --git a/scripts/check_env.py b/scripts/check_env.py index 7e735397399a..dfafd00230c6 100644 --- a/scripts/check_env.py +++ b/scripts/check_env.py @@ -7,8 +7,8 @@ import subprocess PIXI_VERSION = "0.34.0" -CARGO_VERSION = "1.79.0" -RUST_VERSION = "1.79.0" +CARGO_VERSION = "1.80.0" +RUST_VERSION = "1.80.0" def check_version(cmd: str, expected: str, update: str, install: str) -> bool: diff --git a/scripts/clippy_wasm/clippy.toml b/scripts/clippy_wasm/clippy.toml index 81d0fde1d1e2..1db82f4f0cec 100644 --- a/scripts/clippy_wasm/clippy.toml +++ b/scripts/clippy_wasm/clippy.toml @@ -6,7 +6,7 @@ # ----------------------------------------------------------------------------- # Section identical to the main clippy.toml: -msrv = "1.79" +msrv = "1.80" allow-unwrap-in-tests = true diff --git a/scripts/lint.py b/scripts/lint.py index a870aee89d94..87b81d387b08 100755 --- a/scripts/lint.py +++ b/scripts/lint.py @@ -600,7 +600,7 @@ def test_lint_workspace_deps() -> None: name = "clock" version = "0.6.0-alpha.0" edition = "2021" - rust-version = "1.79" + rust-version = "1.80" license = "MIT OR Apache-2.0" publish = false