Update to Rust 1.89

Author: VonTum

.github/workflows/ci.yml

@@ -20,7 +20,7 @@ jobs:
         submodules: recursive
     - uses: actions-rs/toolchain@v1
       with:
-        toolchain: 1.82
+        toolchain: 1.89
         override: true
         components: rustfmt, clippy
     - name: Build
@@ -40,7 +40,7 @@ jobs:
         submodules: recursive
     - uses: actions-rs/toolchain@v1
       with:
-        toolchain: 1.82
+        toolchain: 1.89
         override: true
         components: rustfmt, clippy
     - name: format

Cargo.toml

@@ -3,14 +3,14 @@ name = "sus_compiler"
 description = "Compiler for the SUS Hardware Design Language"
 version = "0.3.0-devel"
 authors = ["Lennart Van Hirtum <[email protected]>"]
-edition = "2021"
 license = "GPL-3.0-or-later"
 repository = "https://github.com/pc2/sus-compiler"
 homepage = "https://github.com/pc2/sus-compiler"
 readme = "README.md"
 keywords = ["sus", "fpga", "vlsi", "hdl", "verilog"]
 categories = ["compilers", "text-processing"]
-rust-version = "1.80"
+edition = "2024"
+rust-version = "1.89"
 
 include = ["/src", "/std/*", "/README.md", "/LICENSE", "/CHANGELOG.md", "/build.rs", "/rustfmt.toml"]
 

src/alloc.rs

@@ -131,7 +131,7 @@ impl<IndexMarker> UUIDRange<IndexMarker> {
         self.len() == 0
     }
     pub fn contains(&self, id: UUID<IndexMarker>) -> bool {
-        self.0 .0 >= id.0 && self.1 .0 < id.0
+        self.0.0 >= id.0 && self.1.0 < id.0
     }
     pub fn iter(&self) -> UUIDRangeIter<IndexMarker> {
         self.into_iter()
@@ -156,17 +156,17 @@ impl<IndexMarker> UUIDRange<IndexMarker> {
         })
     }
     pub fn len(&self) -> usize {
-        self.1 .0 - self.0 .0
+        self.1.0 - self.0.0
     }
     pub fn unwrap_len_1(&self) -> UUID<IndexMarker> {
         assert!(self.len() == 1);
         self.0
     }
     pub fn first(&self) -> Option<UUID<IndexMarker>> {
-        (self.0 .0 < self.1 .0).then_some(self.0)
+        (self.0.0 < self.1.0).then_some(self.0)
     }
     pub fn last(&self) -> Option<UUID<IndexMarker>> {
-        (self.0 .0 < self.1 .0).then_some(UUID(self.1 .0 - 1, PhantomData))
+        (self.0.0 < self.1.0).then_some(UUID(self.1.0 - 1, PhantomData))
     }
 }
 
@@ -215,11 +215,11 @@ impl<IndexMarker> Iterator for UUIDRangeIter<IndexMarker> {
     type Item = UUID<IndexMarker>;
 
     fn next(&mut self) -> Option<Self::Item> {
-        if self.0 .0 == self.1 .0 {
+        if self.0.0 == self.1.0 {
             None
         } else {
-            let result = UUID(self.0 .0, PhantomData);
-            self.0 .0 += 1;
+            let result = UUID(self.0.0, PhantomData);
+            self.0.0 += 1;
             Some(result)
         }
     }
@@ -231,18 +231,18 @@ impl<IndexMarker> Iterator for UUIDRangeIter<IndexMarker> {
 
 impl<IndexMarker> ExactSizeIterator for UUIDRangeIter<IndexMarker> {
     fn len(&self) -> usize {
-        self.1 .0 - self.0 .0
+        self.1.0 - self.0.0
     }
 }
 
 impl<IndexMarker> UUIDRangeIter<IndexMarker> {
     pub fn skip_to(&mut self, to: UUID<IndexMarker>) {
-        assert!(to.0 >= self.0 .0);
-        assert!(to.0 <= self.1 .0);
+        assert!(to.0 >= self.0.0);
+        assert!(to.0 <= self.1.0);
         self.0 = to;
     }
     pub fn len(&self) -> usize {
-        self.1 .0 - self.0 .0
+        self.1.0 - self.0.0
     }
     pub fn is_empty(&self) -> bool {
         self.len() == 0
@@ -647,7 +647,10 @@ impl<T, IndexMarker> FlatAlloc<T, IndexMarker> {
         IndexMarker: UUIDMarker,
     {
         let found_id = self.alloc(value);
-        assert_eq!(id, found_id, "There was an element inserted between a call to [FlatAlloc::get_next_alloc_id] and [FlatAlloc::alloc_next_alloc_id]")
+        assert_eq!(
+            id, found_id,
+            "There was an element inserted between a call to [FlatAlloc::get_next_alloc_id] and [FlatAlloc::alloc_next_alloc_id]"
+        )
     }
     pub fn len(&self) -> usize {
         self.data.len()
@@ -948,12 +951,12 @@ pub struct ZippedIterator<
 }
 
 impl<
-        IDMarker,
-        OA,
-        OB,
-        IterA: Iterator<Item = (UUID<IDMarker>, OA)>,
-        IterB: Iterator<Item = (UUID<IDMarker>, OB)>,
-    > Iterator for ZippedIterator<IDMarker, OA, OB, IterA, IterB>
+    IDMarker,
+    OA,
+    OB,
+    IterA: Iterator<Item = (UUID<IDMarker>, OA)>,
+    IterB: Iterator<Item = (UUID<IDMarker>, OB)>,
+> Iterator for ZippedIterator<IDMarker, OA, OB, IterA, IterB>
 {
     type Item = (UUID<IDMarker>, OA, OB);
 
@@ -996,14 +999,14 @@ pub struct ZippedIterator3<
 }
 
 impl<
-        IDMarker,
-        OA,
-        OB,
-        OC,
-        IterA: Iterator<Item = (UUID<IDMarker>, OA)>,
-        IterB: Iterator<Item = (UUID<IDMarker>, OB)>,
-        IterC: Iterator<Item = (UUID<IDMarker>, OC)>,
-    > Iterator for ZippedIterator3<IDMarker, OA, OB, OC, IterA, IterB, IterC>
+    IDMarker,
+    OA,
+    OB,
+    OC,
+    IterA: Iterator<Item = (UUID<IDMarker>, OA)>,
+    IterB: Iterator<Item = (UUID<IDMarker>, OB)>,
+    IterC: Iterator<Item = (UUID<IDMarker>, OC)>,
+> Iterator for ZippedIterator3<IDMarker, OA, OB, OC, IterA, IterB, IterC>
 {
     type Item = (UUID<IDMarker>, OA, OB, OC);
 

src/codegen/vhdl.rs

@@ -1,8 +1,8 @@
 use crate::{
+    FlatAlloc, InstantiatedModule, Linker, Module, WireIDMarker,
     flattening::{DeclarationKind, Direction, Instruction},
     linker::IsExtern,
     typing::concrete_type::ConcreteType,
-    FlatAlloc, InstantiatedModule, Linker, Module, WireIDMarker,
 };
 use std::fmt::Write;
 use std::ops::Deref;
@@ -140,10 +140,9 @@ impl<Stream: std::fmt::Write> CodeGenerationContext<'_, '_, Stream> {
             .filter(|(_, wire)| {
                 if let Instruction::Declaration(wire_decl) =
                     &self.md.link_info.instructions[wire.original_instruction]
+                    && let DeclarationKind::Port { .. } = wire_decl.decl_kind
                 {
-                    if let DeclarationKind::Port { .. } = wire_decl.decl_kind {
-                        return false;
-                    }
+                    return false;
                 }
                 true
             })

src/compiler_top.rs

@@ -3,10 +3,10 @@ use std::path::{Path, PathBuf};
 
 use crate::config::EarlyExitUpTo;
 use crate::flattening::typecheck::{perform_lints, typecheck};
+use crate::linker::GlobalObj;
 use crate::linker::checkpoint::{
     AFTER_FLATTEN_CP, AFTER_INITIAL_PARSE_CP, AFTER_LINTS_CP, AFTER_TYPE_CHECK_CP,
 };
-use crate::linker::GlobalObj;
 use crate::prelude::*;
 use crate::typing::concrete_type::ConcreteGlobalReference;
 
@@ -138,10 +138,12 @@ impl Linker {
         info_mngr: &mut ExtraInfoManager,
     ) -> FileUUID {
         // File doesn't yet exist
-        assert!(!self
-            .files
-            .iter()
-            .any(|fd| fd.1.file_identifier == file_identifier));
+        assert!(
+            !self
+                .files
+                .iter()
+                .any(|fd| fd.1.file_identifier == file_identifier)
+        );
 
         let mut parser = Parser::new();
         parser.set_language(&tree_sitter_sus::language()).unwrap();

src/debug.rs

@@ -2,8 +2,8 @@ use std::{
     cell::RefCell,
     ops::Range,
     sync::{
-        atomic::{AtomicBool, AtomicPtr},
         Arc, LazyLock, Mutex,
+        atomic::{AtomicBool, AtomicPtr},
     },
     thread,
     time::{Duration, Instant},
@@ -69,7 +69,10 @@ fn print_most_recent_spans(file_data: &FileData, history: &SpanDebuggerStackElem
         }
     }
 
-    println!("Panic unwinding. Printing the last {} spans. BEWARE: These spans may not correspond to this file, thus incorrect spans are possible!", spans_to_print.len());
+    println!(
+        "Panic unwinding. Printing the last {} spans. BEWARE: These spans may not correspond to this file, thus incorrect spans are possible!",
+        spans_to_print.len()
+    );
     pretty_print_spans_in_reverse_order(file_data, spans_to_print);
 }
 
@@ -304,12 +307,13 @@ fn spawn_watchdog_thread() {
     if duration.is_zero() {
         return; // No watchdog
     }
-    thread::spawn(move || loop {
-        thread::sleep(Duration::from_millis(50));
+    thread::spawn(move || {
+        loop {
+            thread::sleep(Duration::from_millis(50));
 
-        let mut timers = WATCHDOG.lock().unwrap();
-        let now = Instant::now();
-        timers.retain(|entry| {
+            let mut timers = WATCHDOG.lock().unwrap();
+            let now = Instant::now();
+            timers.retain(|entry| {
             let deadline = entry.started_at + duration;
             if deadline <= now && entry.alive.load(std::sync::atomic::Ordering::SeqCst) {
                 println!("⏰⏰⏰⏰⏰⏰⏰⏰⏰"); // To show in stdout when this happens too
@@ -324,6 +328,7 @@ fn spawn_watchdog_thread() {
                 deadline > now
             }
         });
+        }
     });
 }
 

src/dev_aid/ariadne_interface.rs

@@ -88,7 +88,9 @@ pub fn compile_all(file_paths: Vec<PathBuf>) -> (Linker, FileSourcesManager) {
             Ok(file_text) => file_text,
             Err(reason) => {
                 let file_path_disp = file_path.display();
-                panic!("Could not open file '{file_path_disp}' for syntax highlighting because {reason}")
+                panic!(
+                    "Could not open file '{file_path_disp}' for syntax highlighting because {reason}"
+                )
             }
         };
 

src/dev_aid/dot_graphs.rs

@@ -1,6 +1,6 @@
 use std::{borrow::Cow, path::PathBuf};
 
-use dot::{render, Edges, GraphWalk, Id, LabelText, Labeller, Nodes, Style};
+use dot::{Edges, GraphWalk, Id, LabelText, Labeller, Nodes, Style, render};
 
 use crate::{
     alloc::FlatAlloc,

src/dev_aid/lsp/mod.rs

@@ -24,7 +24,7 @@ use crate::{
     linker::FileData,
 };
 
-use tree_walk::{get_selected_object, InGlobal, LocationInfo};
+use tree_walk::{InGlobal, LocationInfo, get_selected_object};
 
 use self::tree_walk::RefersTo;
 
@@ -287,10 +287,10 @@ fn for_each_local_reference_in_global(
 ) -> Vec<Span> {
     let mut ref_locations = Vec::new();
     tree_walk::visit_all_in_module(linker, obj_id, |span, info| {
-        if let LocationInfo::InGlobal(_, _, f_id, _) = info {
-            if local == f_id {
-                ref_locations.push(span);
-            }
+        if let LocationInfo::InGlobal(_, _, f_id, _) = info
+            && local == f_id
+        {
+            ref_locations.push(span);
         }
     });
     ref_locations
@@ -626,7 +626,9 @@ fn main_loop(
 }
 
 pub fn lsp_main() -> Result<(), Box<dyn Error + Sync + Send>> {
-    std::env::set_var("RUST_BACKTRACE", "1"); // Enable backtrace because I can't set it in Env vars
+    unsafe {
+        std::env::set_var("RUST_BACKTRACE", "1");
+    } // Enable backtrace because I can't set it in Env vars
 
     println!("starting LSP server");
 

src/errors.rs

@@ -10,7 +10,7 @@ use crate::flattening::{
     Declaration, DomainInfo, Instruction, Interface, InterfaceDeclaration, Module, Port,
     SubModuleInstance,
 };
-use crate::linker::{checkpoint::ErrorCheckpoint, FileData, LinkInfo};
+use crate::linker::{FileData, LinkInfo, checkpoint::ErrorCheckpoint};
 
 #[derive(Debug, Clone, PartialEq, Eq)]
 pub enum ErrorLevel {
@@ -63,7 +63,7 @@ impl ErrorStore {
     }
 
     pub fn take(&mut self) -> Self {
-        std::mem::replace(self, ErrorStore::new())
+        std::mem::take(self)
     }
 
     pub fn checkpoint(&self) -> ErrorCheckpoint {
@@ -375,7 +375,9 @@ impl ErrorInfoObject for Instruction {
             Instruction::Declaration(decl) => decl.make_info(file),
             Instruction::Interface(decl) => decl.make_info(file),
             Instruction::Expression(_) => None,
-            _ => unreachable!("At least there shouldn't be cases where we're referring to something other than SubModule or Declaration")
+            _ => unreachable!(
+                "At least there shouldn't be cases where we're referring to something other than SubModule or Declaration"
+            ),
         }
     }
 }