Update to Rust 1.85 (#29)

Author: emilk

.github/workflows/cargo_machete.yml

@@ -0,0 +1,24 @@
+name: Cargo Shear
+
+on:
+  push:
+    branches:
+      - "main"
+  pull_request:
+    types: [opened, synchronize]
+
+jobs:
+  cargo-shear:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Install Cargo Shear
+        uses: taiki-e/install-action@v2.48.7
+        with:
+          tool: cargo-shear@1.1.11
+
+      - name: Run Cargo Shear
+        run: |
+          cargo shear

.github/workflows/cargo_shear.yml

@@ -0,0 +1,34 @@
+name: PR Branch Name Check
+
+on:
+  pull_request_target:
+    types: [opened, reopened, synchronize]
+
+jobs:
+  check-source-branch:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Check PR source branch
+        run: |
+          # Check if PR is from a fork
+          if [[ "${{ github.event.pull_request.head.repo.fork }}" == "true" ]]; then
+            # Check if PR is from the master/main branch of a fork
+            if [[ "${{ github.event.pull_request.head.ref }}" == "master" || "${{ github.event.pull_request.head.ref }}" == "main" ]]; then
+              echo "ERROR: Pull requests from the master/main branch of forks are not allowed, because it prevents maintainers from contributing to your PR"
+              echo "Please create a feature branch in your fork and submit the PR from that branch instead."
+              exit 1
+            fi
+          fi
+
+      - name: Leave comment if PR is from master/main branch of fork d
+        if: ${{ failure() }}
+        uses: actions/github-script@v6
+        with:
+          github-token: ${{ secrets.GITHUB_TOKEN }}
+          script: |
+            github.rest.issues.createComment({
+              issue_number: context.issue.number,
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              body: '⚠️ **ERROR:** Pull requests from the `master`/`main` branch of forks are not allowed, because it prevents maintainers from contributing to your PR. Please create a feature branch in your fork and submit the PR from that branch instead.'
+            })

.github/workflows/enforce_branch_name.yml

@@ -15,8 +15,8 @@ jobs:
     steps:
       - uses: actions/checkout@v4
 
-      - name: Restore link checker cache
-        uses: actions/cache@v3
+      - name: Restore lychee cache
+        uses: actions/cache@v4
         with:
           path: .lycheecache
           key: cache-lychee-${{ github.sha }}
@@ -25,10 +25,9 @@ jobs:
       # Check https://github.com/lycheeverse/lychee on how to run locally.
       - name: Link Checker
         id: lychee
-        uses: lycheeverse/lychee-action@v1.9.0
+        uses: lycheeverse/lychee-action@v2
         with:
           fail: true
-          lycheeVersion: "0.14.3"
           # When given a directory, lychee checks only markdown, html and text files, everything else we have to glob in manually.
           args: |
             --base . --cache --max-cache-age 1d . "**/*.rs" "**/*.toml" "**/*.hpp" "**/*.cpp" "**/CMakeLists.txt" "**/*.py" "**/*.yml"

.github/workflows/links.yml

@@ -19,10 +19,10 @@ jobs:
     steps:
       - uses: actions/checkout@v4
 
-      - uses: actions-rs/toolchain@v1
+      - uses: actions-rust-lang/setup-rust-toolchain@v1
         with:
-          profile: default
-          toolchain: 1.81.0
+          components: rust-docs, clippy, rustfmt
+          toolchain: 1.85.0
           override: true
 
       - name: Install packages (Linux)
@@ -104,16 +104,12 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-      - uses: actions-rs/toolchain@v1
+      - uses: actions-rust-lang/setup-rust-toolchain@v1
         with:
-          profile: minimal
-          toolchain: 1.81.0
-          target: wasm32-unknown-unknown
+          toolchain: 1.85.0
           override: true
-          components: clippy
-
-      - name: Set up cargo cache
-        uses: Swatinem/rust-cache@v2
+          target: wasm32-unknown-unknown
+          components: clippy,rustfmt
 
       - name: Check wasm32
         uses: actions-rs/cargo@v1
@@ -135,6 +131,6 @@ jobs:
     - uses: actions/checkout@v3
     - uses: EmbarkStudios/cargo-deny-action@v2
       with:
-        rust-version: "1.81.0"
+        rust-version: "1.85.0"
         log-level: warn
         command: check

.github/workflows/rust.yml

@@ -8,20 +8,21 @@
     "files.autoGuessEncoding": true,
     "files.insertFinalNewline": true,
     "files.trimTrailingWhitespace": true,
-    // don't share a cargo lock with rust-analyzer.
-    // see https://github.com/rerun-io/rerun/pull/519 for rationale
+
+    // Don't share a cargo lock with rust-analyzer.
+    // See https://github.com/rerun-io/rerun/pull/519 for rationale.
     "rust-analyzer.check.overrideCommand": [
         "cargo",
         "clippy",
         "--target-dir=target_ra",
         "--workspace",
         "--message-format=json",
         "--all-targets",
-        "--all-features"
+        "--all-features",
     ],
     "rust-analyzer.cargo.buildScripts.overrideCommand": [
         "cargo",
-        "check",
+        "clippy",
         "--quiet",
         "--target-dir=target_ra",
         "--workspace",
@@ -33,17 +34,17 @@
     // Having Rust Analyzer do this while doing other builds can lead to catastrophic failures.
     // INCLUDING attempts to publish a new release!
     "rust-analyzer.cargo.buildScripts.enable": false,
+
+    // Uncomment the following option and restart rust-analyzer to get it to check code behind `cfg(target_arch=wasm32)`.
+    // Don't forget to put it in a comment again before committing.
+    // "rust-analyzer.cargo.target": "wasm32-unknown-unknown",
+
     "C_Cpp.default.configurationProvider": "ms-vscode.cmake-tools", // Use cmake-tools to grab configs.
     "C_Cpp.autoAddFileAssociations": false,
     "cmake.buildDirectory": "${workspaceRoot}/build/debug",
     "cmake.generator": "Ninja", // Use Ninja, just like we do in our just/pixi command.
     "rust-analyzer.showUnlinkedFileNotification": false,
-    "ruff.format.args": [
-        "--config=pyproject.toml"
-    ],
-    "ruff.lint.args": [
-        "--config=pyproject.toml"
-    ],
+    "ruff.configuration": "pyproject.toml",
     "prettier.requireConfig": true,
     "prettier.configPath": ".prettierrc.toml",
     "[python]": {

.vscode/settings.json

@@ -3,7 +3,7 @@
 
 ## 0.3.0 - 2025-02-05 - Update to egui 0.31
 * Update to egui 0.31 [#22](https://github.com/rerun-io/egui_table/pull/22) by [@emilk](https://github.com/emilk)
-* Update MSRV to 1.81 [#21](https://github.com/rerun-io/egui_table/pull/21) by [@emilk](https://github.com/emilk)
+* Update MSRV to 1.85 [#21](https://github.com/rerun-io/egui_table/pull/21) by [@emilk](https://github.com/emilk)
 * Fix ghost column when no sticky columns [#20](https://github.com/rerun-io/egui_table/pull/20) by [@EpixScripts](https://github.com/EpixScripts)
 
 

CHANGELOG.md

@@ -4,9 +4,9 @@ members = ["egui_table", "demo"]
 
 
 [workspace.package]
-edition = "2021"
+edition = "2024"
 license = "MIT OR Apache-2.0"
-rust-version = "1.81"
+rust-version = "1.85"
 version = "0.3.0"
 
 
@@ -17,10 +17,8 @@ opt-level = 2 # fast and small wasm
 [workspace.dependencies]
 egui_table = { version = "0.3.0", path = "egui_table", default-features = false }
 
-document-features = " 0.2.10"
 eframe = { version = "0.31.0", default-features = false }
 egui = { version = "0.31.0", default-features = false }
-emath = { version = "0.31.0", default-features = false }
 env_logger = { version = "0.10", default-features = false, features = [
     "auto-color",
     "humantime",
@@ -41,6 +39,8 @@ web-sys = "0.3.72"
 # egui = { path = "../../egui/crates/egui" }
 # eframe = { path = "../../egui/crates/eframe" }
 
+# ----------------------------------------------------------------------------------------
+# Lints:
 
 [workspace.lints.rust]
 unsafe_code = "deny"
@@ -81,6 +81,7 @@ disallowed_methods = "warn"                 # See clippy.toml
 disallowed_names = "warn"                   # See clippy.toml
 disallowed_script_idents = "warn"           # See clippy.toml
 disallowed_types = "warn"                   # See clippy.toml
+doc_include_without_cfg  = "warn"
 doc_link_with_quotes = "warn"
 doc_markdown = "warn"
 empty_enum = "warn"
@@ -100,7 +101,6 @@ fn_params_excessive_bools = "warn"
 fn_to_numeric_cast_any = "warn"
 from_iter_instead_of_collect = "warn"
 get_unwrap = "warn"
-if_let_mutex = "warn"
 implicit_clone = "warn"
 imprecise_flops = "warn"
 index_refutable_slice = "warn"
@@ -124,25 +124,25 @@ let_underscore_must_use = "warn"
 let_underscore_untyped = "warn"
 let_unit_value = "warn"
 linkedlist = "warn"
+literal_string_with_formatting_args = "warn"
 lossy_float_literal = "warn"
 macro_use_imports = "warn"
 manual_assert = "warn"
 manual_clamp = "warn"
 manual_instant_elapsed = "warn"
+manual_is_power_of_two = "warn"
 manual_is_variant_and = "warn"
 manual_let_else = "warn"
 manual_ok_or = "warn"
 manual_string_new = "warn"
 map_err_ignore = "warn"
 map_flatten = "warn"
-map_unwrap_or = "warn"
 match_bool = "warn"
 match_on_vec_items = "warn"
 match_same_arms = "warn"
 match_wild_err_arm = "warn"
 match_wildcard_for_single_variants = "warn"
 mem_forget = "warn"
-mismatched_target_os = "warn"
 mismatching_type_param_order = "warn"
 missing_assert_message = "warn"
 missing_enforced_import_renames = "warn"
@@ -157,10 +157,12 @@ needless_for_each = "warn"
 needless_pass_by_ref_mut = "warn"
 needless_pass_by_value = "warn"
 negative_feature_names = "warn"
+non_zero_suggestions = "warn"
 nonstandard_macro_braces = "warn"
 option_as_ref_cloned = "warn"
 option_option = "warn"
 path_buf_push_overwrite = "warn"
+pathbuf_init_then_push = "warn"
 ptr_as_ptr = "warn"
 ptr_cast_constness = "warn"
 pub_underscore_fields = "warn"
@@ -170,12 +172,12 @@ readonly_write_lock = "warn"
 redundant_type_annotations = "warn"
 ref_as_ptr = "warn"
 ref_option_ref = "warn"
-ref_patterns = "warn"
 rest_pat_in_fully_bound_structs = "warn"
 same_functions_in_if_condition = "warn"
 semicolon_if_nothing_returned = "warn"
+set_contains_or_insert = "warn"
 should_panic_without_expect = "warn"
-significant_drop_tightening = "warn"
+single_char_pattern = "warn"
 single_match_else = "warn"
 str_split_at_newline = "warn"
 str_to_string = "warn"
@@ -187,6 +189,7 @@ string_to_string = "warn"
 suspicious_command_arg_space = "warn"
 suspicious_xor_used_as_pow = "warn"
 todo = "warn"
+too_long_first_doc_paragraph = "warn"
 too_many_lines = "warn"
 trailing_empty_array = "warn"
 trait_duplication_in_bounds = "warn"
@@ -197,13 +200,15 @@ unimplemented = "warn"
 uninhabited_references = "warn"
 uninlined_format_args = "warn"
 unnecessary_box_returns = "warn"
+unnecessary_literal_bound = "warn"
 unnecessary_safety_doc = "warn"
 unnecessary_struct_initialization = "warn"
 unnecessary_wraps = "warn"
 unnested_or_patterns = "warn"
 unused_peekable = "warn"
 unused_rounding = "warn"
 unused_self = "warn"
+unused_trait_names = "warn"
 unwrap_used = "warn"
 use_self = "warn"
 useless_transmute = "warn"
@@ -212,4 +217,6 @@ wildcard_dependencies = "warn"
 wildcard_imports = "warn"
 zero_sized_map_values = "warn"
 
-manual_range_contains = "allow" # this one is just worse imho
+manual_range_contains = "allow"       # this is better on 'allow'
+map_unwrap_or = "allow"               # this is better on 'allow'
+ref_patterns = "allow"                # It's nice to avoid ref pattern, but there are some situations that are hard (impossible?) to express without.

Cargo.toml

@@ -5,5 +5,5 @@
 * [ ] `git commit -m 'Release 0.x.0 - summary'`
 * [ ] `cargo publish --quiet -p egui_table`
 * [ ] `git tag -a 0.x.0 -m 'Release 0.x.0 - summary'`
-* [ ] `git pull --tags && git tag -d latest && git tag -a latest -m 'Latest release' && git push --tags origin latest --force && git push origin main ; git push --tags`
+* [ ] `git pull --tags ; git tag -d latest && git tag -a latest -m 'Latest release' && git push --tags origin latest --force ; git push --tags`
 * [ ] Do a GitHub release: https://github.com/rerun-io/egui_table/releases/new

RELEASES.md

@@ -5,7 +5,7 @@
 # -----------------------------------------------------------------------------
 # Section identical to scripts/clippy_wasm/clippy.toml:
 
-msrv = "1.81"
+msrv = "1.85"
 
 allow-unwrap-in-tests = true