From 82353bf8a3733ddc817f222f6856db75d3fc8524 Mon Sep 17 00:00:00 2001 From: Andreas Reich Date: Wed, 14 Feb 2024 14:27:46 +0100 Subject: [PATCH] Fix incorrect minimum supported rust version mentioned in docs and examples (#5195) ### What The last rust update in * https://github.com/rerun-io/rerun/pull/4390 didn't catch a whole bunch of places. ### 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 the web demo (if applicable): * Using newly built examples: [app.rerun.io](https://app.rerun.io/pr/5195/index.html) * Using examples from latest `main` build: [app.rerun.io](https://app.rerun.io/pr/5195/index.html?manifest_url=https://app.rerun.io/version/main/examples_manifest.json) * Using full set of examples from `nightly` build: [app.rerun.io](https://app.rerun.io/pr/5195/index.html?manifest_url=https://app.rerun.io/version/nightly/examples_manifest.json) * [x] The PR title and labels are set such as to maximize their usefulness for the next release's CHANGELOG * [x] If applicable, add a new check to the [release checklist](https://github.com/rerun-io/rerun/blob/main/tests/python/release_checklist)! - [PR Build Summary](https://build.rerun.io/pr/5195) - [Docs preview](https://rerun.io/preview/7ac1616173ee2d5da35c31ea3617e3146e2f6a2e/docs) - [Examples preview](https://rerun.io/preview/7ac1616173ee2d5da35c31ea3617e3146e2f6a2e/examples) - [Recent benchmark results](https://build.rerun.io/graphs/crates.html) - [Wasm size tracking](https://build.rerun.io/graphs/sizes.html) --- clippy.toml | 2 +- crates/re_viewer/data/quick_start_guides/rust_connect.md | 2 +- crates/re_viewer/data/quick_start_guides/rust_spawn.md | 2 +- docs/content/getting-started/installing-viewer.md | 2 +- docs/content/getting-started/rust.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/dna/Cargo.toml | 2 +- examples/rust/extend_viewer_ui/Cargo.toml | 2 +- examples/rust/external_data_loader/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 +- rerun_py/README.md | 4 ++-- scripts/clippy_wasm/clippy.toml | 2 +- scripts/lint.py | 2 +- tests/rust/plot_dashboard_stress/Cargo.toml | 2 +- 25 files changed, 26 insertions(+), 26 deletions(-) diff --git a/clippy.toml b/clippy.toml index 09221aff8376..7960922bd6d6 100644 --- a/clippy.toml +++ b/clippy.toml @@ -3,7 +3,7 @@ # ----------------------------------------------------------------------------- # Section identical to the main scripts/clippy_wasm/clippy.toml: -msrv = "1.72" +msrv = "1.74" allow-unwrap-in-tests = true diff --git a/crates/re_viewer/data/quick_start_guides/rust_connect.md b/crates/re_viewer/data/quick_start_guides/rust_connect.md index 3b929fc73420..c7d4236ee4b0 100644 --- a/crates/re_viewer/data/quick_start_guides/rust_connect.md +++ b/crates/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.72+. +Note that the Rerun SDK requires a working installation of Rust 1.74+. ## Logging your own data diff --git a/crates/re_viewer/data/quick_start_guides/rust_spawn.md b/crates/re_viewer/data/quick_start_guides/rust_spawn.md index 991cc8fdd309..2dc664bbb0ba 100644 --- a/crates/re_viewer/data/quick_start_guides/rust_spawn.md +++ b/crates/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.72+. +Note that the Rerun SDK requires a working installation of Rust 1.74+. ## Logging your own data diff --git a/docs/content/getting-started/installing-viewer.md b/docs/content/getting-started/installing-viewer.md index 0105f33008b5..ebb75f43c2d9 100644 --- a/docs/content/getting-started/installing-viewer.md +++ b/docs/content/getting-started/installing-viewer.md @@ -9,7 +9,7 @@ Generally, you should make sure that your SDK version matches the version of the There are many ways to install the viewer. Please pick whatever works best for your setup: * `cargo binstall rerun-cli` - download binaries via [`cargo binstall`](https://github.com/cargo-bins/cargo-binstall) -* `cargo install rerun-cli` - build it from source (this requires Rust 1.72+) +* `cargo install rerun-cli` - build it from source (this requires Rust 1.74+) * Download it from the [GitHub Release artifacts](https://github.com/rerun-io/rerun/releases/latest/) * Together with the Rerun [Python SDK](python.md): * `pip3 install rerun-sdk` - download it via pip diff --git a/docs/content/getting-started/rust.md b/docs/content/getting-started/rust.md index d13c1d8d5a82..e6fda417e6d4 100644 --- a/docs/content/getting-started/rust.md +++ b/docs/content/getting-started/rust.md @@ -4,7 +4,7 @@ order: 3 --- ## Setup -The Rerun SDK for Rust requires a working installation of Rust 1.72+. +The Rerun SDK for Rust requires a working installation of Rust 1.74+. After you have [installed the viewer](installing-viewer.md) you can simply add [the rerun crate](https://crates.io/crates/rerun) to your project with `cargo add rerun`. diff --git a/examples/rust/clock/Cargo.toml b/examples/rust/clock/Cargo.toml index 09bf2d097ca9..399f7d16e054 100644 --- a/examples/rust/clock/Cargo.toml +++ b/examples/rust/clock/Cargo.toml @@ -2,7 +2,7 @@ name = "clock" version = "0.14.0-alpha.1+dev" edition = "2021" -rust-version = "1.72" +rust-version = "1.74" 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 42ae891bf266..0a3819e563e3 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.14.0-alpha.1+dev" edition = "2021" -rust-version = "1.72" +rust-version = "1.74" 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 045c12e9b0e9..a2a1ad42faf6 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.14.0-alpha.1+dev" edition = "2021" -rust-version = "1.72" +rust-version = "1.74" 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 bc9403f1eab5..a1eb7cc914c1 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.14.0-alpha.1+dev" edition = "2021" -rust-version = "1.72" +rust-version = "1.74" license = "MIT OR Apache-2.0" publish = false diff --git a/examples/rust/dna/Cargo.toml b/examples/rust/dna/Cargo.toml index b003a352598a..2643291b9dd4 100644 --- a/examples/rust/dna/Cargo.toml +++ b/examples/rust/dna/Cargo.toml @@ -2,7 +2,7 @@ name = "dna" version = "0.14.0-alpha.1+dev" edition = "2021" -rust-version = "1.72" +rust-version = "1.74" 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 9a19792cdb02..42dc17ba5396 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.14.0-alpha.1+dev" edition = "2021" -rust-version = "1.72" +rust-version = "1.74" 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 7c5b9f1db3af..e6317af621e6 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.14.0-alpha.1+dev" edition = "2021" -rust-version = "1.72" +rust-version = "1.74" license = "MIT OR Apache-2.0" publish = false diff --git a/examples/rust/minimal/Cargo.toml b/examples/rust/minimal/Cargo.toml index 3764f049c22a..feb7b0a453ee 100644 --- a/examples/rust/minimal/Cargo.toml +++ b/examples/rust/minimal/Cargo.toml @@ -2,7 +2,7 @@ name = "minimal" version = "0.14.0-alpha.1+dev" edition = "2021" -rust-version = "1.72" +rust-version = "1.74" 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 eec3034f0171..dce5bcac9962 100644 --- a/examples/rust/minimal_options/Cargo.toml +++ b/examples/rust/minimal_options/Cargo.toml @@ -2,7 +2,7 @@ name = "minimal_options" version = "0.14.0-alpha.1+dev" edition = "2021" -rust-version = "1.72" +rust-version = "1.74" 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 3d1b15236ab4..41a6a2117837 100644 --- a/examples/rust/minimal_serve/Cargo.toml +++ b/examples/rust/minimal_serve/Cargo.toml @@ -2,7 +2,7 @@ name = "minimal_serve" version = "0.14.0-alpha.1+dev" edition = "2021" -rust-version = "1.72" +rust-version = "1.74" license = "MIT OR Apache-2.0" publish = false diff --git a/examples/rust/objectron/Cargo.toml b/examples/rust/objectron/Cargo.toml index 6417766547f9..168c95ff9d5b 100644 --- a/examples/rust/objectron/Cargo.toml +++ b/examples/rust/objectron/Cargo.toml @@ -2,7 +2,7 @@ name = "objectron" version = "0.14.0-alpha.1+dev" edition = "2021" -rust-version = "1.72" +rust-version = "1.74" 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 b2226d4d22f3..036c8fff96e2 100644 --- a/examples/rust/raw_mesh/Cargo.toml +++ b/examples/rust/raw_mesh/Cargo.toml @@ -2,7 +2,7 @@ name = "raw_mesh" version = "0.14.0-alpha.1+dev" edition = "2021" -rust-version = "1.72" +rust-version = "1.74" 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 bc01eda581fc..09c6fd6f7341 100644 --- a/examples/rust/shared_recording/Cargo.toml +++ b/examples/rust/shared_recording/Cargo.toml @@ -2,7 +2,7 @@ name = "shared_recording" version = "0.14.0-alpha.1+dev" edition = "2021" -rust-version = "1.72" +rust-version = "1.74" 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 00cb411d68fa..c470c644371b 100644 --- a/examples/rust/spawn_viewer/Cargo.toml +++ b/examples/rust/spawn_viewer/Cargo.toml @@ -2,7 +2,7 @@ name = "spawn_viewer" version = "0.14.0-alpha.1+dev" edition = "2021" -rust-version = "1.72" +rust-version = "1.74" license = "MIT OR Apache-2.0" publish = false diff --git a/examples/rust/stdio/Cargo.toml b/examples/rust/stdio/Cargo.toml index 64f723a1a06a..167d2f3566ef 100644 --- a/examples/rust/stdio/Cargo.toml +++ b/examples/rust/stdio/Cargo.toml @@ -2,7 +2,7 @@ name = "stdio" version = "0.14.0-alpha.1+dev" edition = "2021" -rust-version = "1.72" +rust-version = "1.74" license = "MIT OR Apache-2.0" publish = false diff --git a/examples/rust/template/Cargo.toml b/examples/rust/template/Cargo.toml index 873a4911bd45..a3881bd7e4da 100644 --- a/examples/rust/template/Cargo.toml +++ b/examples/rust/template/Cargo.toml @@ -2,7 +2,7 @@ name = "template" version = "0.14.0-alpha.1+dev" edition = "2021" -rust-version = "1.72" +rust-version = "1.74" license = "MIT OR Apache-2.0" publish = false diff --git a/rerun_py/README.md b/rerun_py/README.md index daa050e68319..a5f7da8a6de3 100644 --- a/rerun_py/README.md +++ b/rerun_py/README.md @@ -151,10 +151,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.72 +rustup set default-host aarch64-apple-darwin && rustup install 1.74 ``` If you want to switch back, this is how: ``` sh -rustup set default-host x86_64-apple-darwin && rustup install 1.72 +rustup set default-host x86_64-apple-darwin && rustup install 1.74 ``` diff --git a/scripts/clippy_wasm/clippy.toml b/scripts/clippy_wasm/clippy.toml index 47926806dfaa..b061d1e92816 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.72" +msrv = "1.74" allow-unwrap-in-tests = true diff --git a/scripts/lint.py b/scripts/lint.py index ae93779ee540..5340b1f5a901 100755 --- a/scripts/lint.py +++ b/scripts/lint.py @@ -516,7 +516,7 @@ def test_lint_workspace_deps() -> None: name = "clock" version = "0.6.0-alpha.0" edition = "2021" - rust-version = "1.72" + rust-version = "1.74" license = "MIT OR Apache-2.0" publish = false diff --git a/tests/rust/plot_dashboard_stress/Cargo.toml b/tests/rust/plot_dashboard_stress/Cargo.toml index 0140ed7080f2..472e7d73efea 100644 --- a/tests/rust/plot_dashboard_stress/Cargo.toml +++ b/tests/rust/plot_dashboard_stress/Cargo.toml @@ -2,7 +2,7 @@ name = "plot_dashboard_stress" version = "0.14.0-alpha.1+dev" edition = "2021" -rust-version = "1.72" +rust-version = "1.74" license = "MIT OR Apache-2.0" publish = false