Update to Rust 1.85, 2024 edition.

Author: elliottslaughter

.github/workflows/pages.yml

@@ -23,7 +23,7 @@ jobs:
       - uses: actions-rs/toolchain@v1 # get rust toolchain for wasm
         with:
           profile: minimal
-          toolchain: stable
+          toolchain: 1.85.1
           target: wasm32-unknown-unknown
           override: true
       - name: Rust Cache # cache the rust build artefacts

.github/workflows/rust.yml

@@ -17,7 +17,7 @@ jobs:
       - uses: actions-rs/toolchain@v1
         with:
           profile: minimal
-          toolchain: 1.74.1
+          toolchain: 1.85.1
           override: true
       - uses: actions-rs/cargo@v1
         with:
@@ -44,7 +44,7 @@ jobs:
       - uses: actions-rs/toolchain@v1
         with:
           profile: minimal
-          toolchain: 1.74.1
+          toolchain: 1.85.1
           override: true
       - uses: actions-rs/cargo@v1
         with:
@@ -71,7 +71,7 @@ jobs:
       - uses: actions-rs/toolchain@v1
         with:
           profile: minimal
-          toolchain: 1.74.1
+          toolchain: 1.85.1
           target: wasm32-unknown-unknown
           override: true
       - uses: actions-rs/cargo@v1
@@ -91,7 +91,7 @@ jobs:
       - uses: actions-rs/toolchain@v1
         with:
           profile: minimal
-          toolchain: 1.74.1
+          toolchain: 1.85.1
           override: true
       - run: sudo apt-get install libxcb-render0-dev libxcb-shape0-dev libxcb-xfixes0-dev libspeechd-dev libxkbcommon-dev libssl-dev
       - uses: actions-rs/cargo@v1
@@ -107,7 +107,7 @@ jobs:
       - uses: actions-rs/toolchain@v1
         with:
           profile: minimal
-          toolchain: 1.74.1
+          toolchain: 1.85.1
           override: true
           components: rustfmt
       - uses: actions-rs/cargo@v1
@@ -123,7 +123,7 @@ jobs:
       - uses: actions-rs/toolchain@v1
         with:
           profile: minimal
-          toolchain: 1.74.1
+          toolchain: 1.85.1
           override: true
           components: clippy
       - uses: actions-rs/cargo@v1
@@ -139,7 +139,7 @@ jobs:
       - uses: actions-rs/toolchain@v1
         with:
           profile: minimal
-          toolchain: 1.74.1
+          toolchain: 1.85.1
           target: wasm32-unknown-unknown
           override: true
       - name: Download and install Trunk binary

Cargo.toml

@@ -11,8 +11,8 @@ keywords = ["legion", "legion-prof", "profiler"]
 categories = ["development-tools::profiling"]
 license = "Apache-2.0"
 
-edition = "2021"
-rust-version = "1.74"
+edition = "2024"
+rust-version = "1.85"
 
 [features]
 default = []

src/app.rs

@@ -11,7 +11,7 @@ use egui_extras::{Column, TableBuilder};
 #[cfg(not(target_arch = "wasm32"))]
 use itertools::Itertools;
 use percentage::{Percentage, PercentageInteger};
-use regex::{escape, Regex};
+use regex::{Regex, escape};
 use serde::{Deserialize, Serialize};
 
 use crate::data::{

src/archive_data.rs

@@ -1,4 +1,4 @@
-use std::fs::{create_dir, remove_dir_all, File};
+use std::fs::{File, create_dir, remove_dir_all};
 use std::io;
 use std::path::{Path, PathBuf};
 

src/data.rs

@@ -218,7 +218,7 @@ pub trait DataSource {
     fn fetch_summary_tile(&self, entry_id: &EntryID, tile_id: TileID, full: bool) -> SummaryTile;
     fn fetch_slot_tile(&self, entry_id: &EntryID, tile_id: TileID, full: bool) -> SlotTile;
     fn fetch_slot_meta_tile(&self, entry_id: &EntryID, tile_id: TileID, full: bool)
-        -> SlotMetaTile;
+    -> SlotMetaTile;
 }
 
 impl EntryID {
@@ -389,9 +389,9 @@ pub struct EntryIDSlug<'a>(pub &'a EntryID);
 
 impl<'a> fmt::Display for EntryIDSlug<'a> {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        for (i, e) in self.0 .0.iter().enumerate() {
+        for (i, e) in self.0.0.iter().enumerate() {
             write!(f, "{}", e)?;
-            if i < self.0 .0.len() - 1 {
+            if i < self.0.0.len() - 1 {
                 write!(f, "_")?;
             }
         }
@@ -403,9 +403,9 @@ pub struct TileIDSlug(pub TileID);
 
 impl fmt::Display for TileIDSlug {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        write!(f, "{}", self.0 .0.start.0)?;
+        write!(f, "{}", self.0.0.start.0)?;
         write!(f, "_")?;
-        write!(f, "{}", self.0 .0.stop.0)
+        write!(f, "{}", self.0.0.stop.0)
     }
 }
 

src/http/client.rs

@@ -17,7 +17,7 @@ use crate::data::{
     DataSourceDescription, DataSourceInfo, EntryID, SlotMetaTile, SlotTile, SummaryTile, TileID,
 };
 use crate::deferred_data::DeferredDataSource;
-use crate::http::fetch::{fetch, DataSourceResponse};
+use crate::http::fetch::{DataSourceResponse, fetch};
 use crate::http::schema::TileRequestRef;
 
 pub struct HTTPClientDataSource {

src/http/fetch.rs

@@ -1,9 +1,9 @@
 use bytes::Bytes;
 
-#[cfg(not(target_arch = "wasm32"))]
-use reqwest::blocking::RequestBuilder;
 #[cfg(target_arch = "wasm32")]
 use reqwest::RequestBuilder;
+#[cfg(not(target_arch = "wasm32"))]
+use reqwest::blocking::RequestBuilder;
 
 pub struct DataSourceResponse {
     pub body: Bytes,

src/http/server.rs

@@ -2,9 +2,8 @@ use std::sync::Arc;
 
 use actix_cors::Cors;
 use actix_web::{
-    error, get, http, middleware,
+    App, HttpServer, Responder, Result, error, get, http, middleware,
     web::{self, Data},
-    App, HttpServer, Responder, Result,
 };
 
 use serde::Serialize;

src/main.rs

@@ -129,7 +129,7 @@ impl RandomDataSource {
     ) {
         let time = Timestamp((first.time.0 + last.time.0) / 2);
         let util = (first.util + last.util) * 0.5;
-        let diff = (rng.gen::<f32>() - 0.5) / 1.2_f32.powi(max_level - level);
+        let diff = (rng.r#gen::<f32>() - 0.5) / 1.2_f32.powi(max_level - level);
         let util = (util + diff).at_least(0.0).at_most(1.0);
         let point = UtilPoint { time, util };
         if level > 0 {
@@ -147,11 +147,11 @@ impl RandomDataSource {
             const LEVELS: i32 = 8;
             let first = UtilPoint {
                 time: self.info.interval.start,
-                util: state.rng.gen(),
+                util: state.rng.r#gen(),
             };
             let last = UtilPoint {
                 time: self.info.interval.stop,
-                util: state.rng.gen(),
+                util: state.rng.r#gen(),
             };
             let mut utilization = Vec::new();
             utilization.push(first);