Merge origin/main

Author: lhecker

Cargo.toml

@@ -29,6 +29,5 @@ lto = "thin"                # Similarly, speed up linking by a ton
 [workspace.dependencies]
 edit = { path = "./crates/edit" }
 lsh = { path = "./crates/lsh" }
-lsh-bin = { path = "./crates/lsh-bin" }
 stdext = { path = "./crates/stdext" }
 unicode-gen = { path = "./crates/unicode-gen" }

crates/edit/src/bin/edit/settings.rs

@@ -56,7 +56,7 @@ impl Settings {
         if let Some(f) = root.get_object("fileAssociations") {
             for &(mut key, ref value) in f.iter() {
                 if !key.contains('/') {
-                    key = arena_format!(&scratch, "**/{key}").leak();
+                    key = arena_format!(&*scratch, "**/{key}").leak();
                 }
 
                 let Some(id) = value.as_str() else {

crates/edit/src/lsh/highlighter.rs

@@ -74,7 +74,7 @@ impl<'doc> Highlighter<'doc> {
         let mut res = self.runtime.parse_next_line(arena, line);
 
         // Adjust the range to account for the line offset.
-        for h in &mut res {
+        for h in res.iter_mut() {
             h.start = line_beg + h.start.min(line.len());
         }
 

crates/lsh/src/compiler/backend.rs

@@ -350,6 +350,8 @@ impl<'a> Backend<'a> {
 
                 ir = next.borrow_mut();
 
+                // If the next instruction was already serialized (e.g. this is some form of loop),
+                // simply jump to the already serialized code. We're done here. Nothing new will come after this.
                 if ir.offset != usize::MAX {
                     self.push_instruction(MovImm {
                         dst: Register::ProgramCounter,
@@ -520,6 +522,7 @@ impl<'a> LivenessAnalysis<'a> {
 
         let ir = cell.borrow();
 
+        #[allow(clippy::collapsible_match)]
         match ir.instr {
             IRI::Mov { dst, src } => {
                 if dst.borrow().physical.is_none() {

crates/lsh/src/compiler/frontend.rs

@@ -643,7 +643,7 @@ impl<'a, 'c, 'src> Parser<'a, 'c, 'src> {
             lhs_span.last.borrow_mut().set_next(add_ir);
             Ok((IRSpan { first: lhs_span.first, last: add_ir }, lhs_vreg))
         } else if lhs_vreg.borrow().physical.is_some() {
-            // For expressions of type `var virtual = phyiscal;`, we need to ensure
+            // For expressions of type `var virtual = physical;`, we need to ensure
             // that we actually copy the physical register into a new virtual one.
             // The remaining code assumes single assignment form, while physical registers are permanent.
             let dst = self.compiler.alloc_vreg();

crates/lsh/src/compiler/generator.rs

@@ -5,7 +5,7 @@
 //!
 //! ## TODO
 //!
-//! - The label lookup (with a `HashMap`) is just plain dumb.
+//! - The label lookup (with a `HashMap`) is $NOT_GREAT.
 //!   The backend should emit metadata, I think.
 
 use std::collections::HashMap;

crates/lsh/src/compiler/optimizer.rs

@@ -157,7 +157,7 @@ fn optimize_redundant_offset_backup_restore<'a>(compiler: &mut Compiler<'a>) {
     optimize_noop(compiler);
 }
 
-/// This isn't an optimization for the VM, it's one for my autistic side.
+/// This isn't an optimization for the VM, it's one for my pedantic side.
 /// I like it if the identifiers are sorted and the values contiguous.
 fn optimize_highlight_kind_values<'a>(compiler: &mut Compiler<'a>) {
     let scratch = scratch_arena(None);

crates/lsh/src/compiler/regex.rs

@@ -412,8 +412,10 @@ impl<'a> RegexParser<'a> {
         let mut charset = Charset::no();
 
         // First char can be ] or - literally
-        if self.peek() == Some(']') {
-            charset.set(b']', true);
+        if let Some(ch) = self.peek()
+            && matches!(ch, ']' | '-')
+        {
+            charset.set(ch as u8, true);
             self.advance();
         }