Escape HTML correctly

Author: ajeetdsouza

.github/workflows/ci.yml

@@ -6,24 +6,24 @@ on:
   workflow_dispatch:
 env:
   CARGO_TERM_COLOR: always
+concurrency:
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
+  cancel-in-progress: true
 jobs:
   lint:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout repository
         uses: actions/checkout@v2
-      - name: Install Rust
-        uses: actions-rs/toolchain@v1
-        with:
-          components: clippy
-          profile: minimal
-          toolchain: 1.78.0
       - name: Install Rust (nightly)
-        uses: actions-rs/toolchain@v1
+        uses: dtolnay/rust-toolchain@nightly
         with:
           components: rustfmt
-          profile: minimal
           toolchain: nightly
+      - name: Install Rust
+        uses: dtolnay/[email protected]
+        with:
+          components: clippy
       - name: Install pnpm
         uses: pnpm/action-setup@v4
         with:
@@ -51,11 +51,9 @@ jobs:
       - name: Checkout repository
         uses: actions/checkout@v2
       - name: Install Rust
-        uses: actions-rs/toolchain@v1
+        uses: dtolnay/rust-toolchain@nightly
         with:
           components: miri
-          profile: minimal
-          toolchain: nightly
       - name: Setup Rust cache
         uses: Swatinem/rust-cache@v1
       - name: Install cargo-nextest
@@ -72,12 +70,9 @@ jobs:
       - name: Checkout repository
         uses: actions/checkout@v2
       - name: Install Rust
-        uses: actions-rs/toolchain@v1
-        with:
-          profile: minimal
-          toolchain: stable
+        uses: dtolnay/[email protected]
       - name: Setup Rust cache
-        uses: Swatinem/rust-cache@v1
+        uses: Swatinem/rust-cache@v2
       - name: Install cargo-nextest
         uses: taiki-e/install-action@v2
         with:

.github/workflows/pages.yml

@@ -32,21 +32,21 @@ jobs:
           cache-dependency-path: playground/pnpm-lock.yaml
           node-version: 18
       - name: Install Rust
-        uses: actions-rs/toolchain@v1
-        with:
-          profile: minimal
-          toolchain: 1.69.0
+        uses: dtolnay/[email protected]
       - name: Setup Rust cache
         uses: Swatinem/rust-cache@v2
         with:
           cache-directories: ./playground/rust/lox-wasm
+      - name: Install Task
+        uses: arduino/setup-task@v2
+        with:
+          version: 3.x
       - name: Build playground
-        run: pnpm install && BASE_PATH=/loxcraft pnpm run build
-        working-directory: playground
+        run: BASE_PATH=/loxcraft task build-playground
       - name: Upload artifact
-        uses: actions/upload-pages-artifact@v1
+        uses: actions/upload-pages-artifact@v3
         with:
           path: playground/out/
       - name: Deploy to GitHub Pages
         id: deployment
-        uses: actions/deploy-pages@v1
+        uses: actions/deploy-pages@v4

Cargo.lock

@@ -5,7 +5,7 @@ authors = [
 ]
 categories = ["development-tools"]
 description = "A compiler, VM, language server, and online playground for the Lox programming language"
-edition = "2021"
+edition = "2024"
 keywords = [
     "cli",
     "compiler",
@@ -24,7 +24,7 @@ keywords = [
 license = "MIT"
 name = "loxcraft"
 repository = "https://github.com/ajeetdsouza/loxcraft"
-rust-version = "1.70.0"
+rust-version = "1.85.0"
 version = "0.1.1"
 
 [badges]
@@ -75,7 +75,7 @@ warp-embed = { version = "0.5.0", optional = true }
 webbrowser = { version = "1.0.2", optional = true }
 
 [target.'cfg(target_family = "wasm")'.dependencies]
-wasm-bindgen = "0.2.67"
+wasm-bindgen = "0.2.100"
 
 [target.'cfg(not(any(miri, target_family = "wasm")))'.dependencies]
 mimalloc = { version = "0.1.27", default-features = false }

Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "lox-wasm"
 version = "0.1.0"
-edition = "2021"
+edition = "2024"
 
 [lib]
 crate-type = ["cdylib"]

playground/out/.gitkeep

@@ -10,11 +10,11 @@ use wasm_bindgen::prelude::*;
 #[wasm_bindgen]
 #[allow(non_snake_case)]
 pub fn loxRun(source: &str) {
-    let output = &mut Output::new();
-    match VM::default().run(source, output) {
+    let writer = Output::new();
+    let mut writer = HtmlWriter::new(writer);
+    match VM::default().run(source, &mut writer) {
         Ok(()) => postMessage(&Message::ExitSuccess.to_string()),
         Err(errors) => {
-            let mut writer = HtmlWriter::new(output);
             for e in errors.iter() {
                 report_error(&mut writer, source, e);
             }

playground/rust/lox-wasm/Cargo.lock

@@ -16,7 +16,7 @@ impl<'a> Lexer<'a> {
     }
 }
 
-impl<'a> Iterator for Lexer<'a> {
+impl Iterator for Lexer<'_> {
     type Item = Result<(usize, Token, usize), ErrorS>;
 
     fn next(&mut self) -> Option<Self::Item> {

playground/rust/lox-wasm/Cargo.toml

@@ -28,21 +28,21 @@ impl<T> Allocator<T> {
 unsafe impl<T: GlobalAlloc> GlobalAlloc for Allocator<T> {
     unsafe fn alloc(&self, layout: Layout) -> *mut u8 {
         self.allocated_bytes.fetch_add(layout.size(), Ordering::Relaxed);
-        self.inner.alloc(layout)
+        unsafe { self.inner.alloc(layout) }
     }
 
     unsafe fn dealloc(&self, ptr: *mut u8, layout: Layout) {
         self.allocated_bytes.fetch_sub(layout.size(), Ordering::Relaxed);
-        self.inner.dealloc(ptr, layout)
+        unsafe { self.inner.dealloc(ptr, layout) }
     }
 
     unsafe fn alloc_zeroed(&self, layout: Layout) -> *mut u8 {
         self.allocated_bytes.fetch_add(layout.size(), Ordering::Relaxed);
-        self.inner.alloc_zeroed(layout)
+        unsafe { self.inner.alloc_zeroed(layout) }
     }
 
     unsafe fn realloc(&self, ptr: *mut u8, layout: Layout, new_size: usize) -> *mut u8 {
         self.allocated_bytes.fetch_add(new_size.wrapping_sub(layout.size()), Ordering::Relaxed);
-        self.inner.realloc(ptr, layout, new_size)
+        unsafe { self.inner.realloc(ptr, layout, new_size) }
     }
 }

playground/rust/lox-wasm/src/lib.rs

@@ -23,6 +23,7 @@ pub fn now() -> f64 {
         .as_secs_f64()
 }
 
+#[inline(always)]
 pub const fn unreachable() -> ! {
     if cfg!(debug_assertions) { unreachable!() } else { unsafe { hint::unreachable_unchecked() } }
 }