Update to keep up with rustc

Deploy the playground to GitHub Pages intead of Azure

.github/workflows/main.yml

@@ -26,6 +26,8 @@ jobs:
       run: cargo test --locked
 
   playground:
+    permissions:
+      id-token: write
     runs-on: ubuntu-latest
     steps:
     - name: Rust
@@ -45,13 +47,11 @@ jobs:
         wasm-opt -Os -o src/playground.wasm ../target/wasm32-unknown-unknown/release/playground.wasm
         npm ci
         npm run build
-    - name: Login
+    - name: Upload
       if: github.event_name == 'push'
-      uses: azure/login@v1
+      uses: actions/upload-pages-artifact@v3
       with:
-        creds: ${{ secrets.AZURE_CREDENTIALS }}
+        path: playground/public
     - name: Deploy
       if: github.event_name == 'push'
-      run: |
-        az storage blob sync --account-name dejavu --container \$web --source playground/public
-        az cdn endpoint purge --resource-group dejavu --profile-name dejavu --name dejavu --content-paths "/*"
+      uses: actions/deploy-pages@v4

Cargo.toml

@@ -1,5 +1,3 @@
-cargo-features = ["strip"]
-
 [workspace]
 resolver = "2"
 members = [

gml/src/back/analysis.rs

@@ -46,7 +46,7 @@ impl ControlFlow {
 /// that live across basic block boundaries. A block can either be dominated by a live definition,
 /// or it can contain a definition that dominates later blocks.
 pub struct Liveness {
-    pub in_: HandleMap<ssa::Label, HashSet<ssa::Value>>,
+    pub _in: HandleMap<ssa::Label, HashSet<ssa::Value>>,
     pub out: HandleMap<ssa::Label, HashSet<ssa::Value>>,
 }
 
@@ -107,6 +107,6 @@ impl Liveness {
             }
         }
 
-        Liveness { in_, out }
+        Liveness { _in: in_, out }
     }
 }

gml/src/back/codegen.rs

@@ -27,7 +27,7 @@ pub struct Codegen<'p> {
 }
 
 impl<'p> Codegen<'p> {
-    pub fn new(prototypes: &'p HashMap<Symbol, ssa::Prototype>) -> Codegen {
+    pub fn new(prototypes: &'p HashMap<Symbol, ssa::Prototype>) -> Codegen<'p> {
         Codegen {
             function: code::Function::new(),
             locations: code::Locations::default(),

gml/src/vm/dll.rs

@@ -69,10 +69,14 @@ pub fn thunk(calltype: Cc, restype: Type, argtypes: &[Type]) -> Result<Thunk, Er
 macro_rules! generate_thunks { [$(($($t:ty),*))*] => { [
     $(<unsafe extern "C" fn($($t),*) -> f64 as FnExtern>::call,)*
     $(<unsafe extern "C" fn($($t),*) -> *const c_char as FnExtern>::call,)*
-    $(<unsafe extern "stdcall" fn($($t),*) -> f64 as FnExtern>::call,)*
-    $(<unsafe extern "stdcall" fn($($t),*) -> *const c_char as FnExtern>::call,)*
+    $(#[cfg(windows)] <unsafe extern "stdcall" fn($($t),*) -> f64 as FnExtern>::call,)*
+    $(#[cfg(windows)] <unsafe extern "stdcall" fn($($t),*) -> *const c_char as FnExtern>::call,)*
 ] } }
-static THUNKS: [Thunk; 172] = generate_thunks![
+#[cfg(not(windows))]
+const NUM_THUNKS: usize = 86;
+#[cfg(windows)]
+const NUM_THUNKS: usize = 86 + 86;
+static THUNKS: [Thunk; NUM_THUNKS] = generate_thunks![
     ()
 
     (f64)
@@ -192,4 +196,6 @@ macro_rules! impl_fn_extern_params { ($cc:literal) => {
 } }
 
 impl_fn_extern_params!("C");
+
+#[cfg(windows)]
 impl_fn_extern_params!("stdcall");

gml/src/vm/interpreter.rs

@@ -200,14 +200,16 @@ impl Thread {
     pub fn execute<W: for<'r> vm::Project<'r, (&'r mut World, &'r mut Assets<W>)>>(
         &mut self, cx: &mut W, f: Function, args: Vec<Value>
     ) -> Result<Value> {
-        let cx: &mut dyn vm::Project<(&mut World, &mut Assets<W>)> = cx;
-        let cx = unsafe { &mut *(cx as *mut _ as *mut _) };
-        execute_internal(self, cx, f, args)
+        unsafe {
+            let cx: *mut dyn for<'r> vm::Project<'r, (&'r mut World, &'r mut Assets<W>)> = cx;
+            let cx: *mut dyn for<'r> vm::Project<'r, (&'r mut World, &'r mut Assets<self::W>)> = mem::transmute(cx);
+            execute_internal(self, &mut *cx, f, args)
+        }
     }
 }
 
 // Opaque type to erase the runner-side container for `vm::World` and `vm::Assets`.
-extern { type W; }
+extern "C" { type W; }
 
 fn execute_internal(
     thread: &mut Thread, cx: &mut dyn for<'r> vm::Project<'r, (&'r mut World, &'r mut Assets<W>)>,

playground/src/lib.rs

@@ -1,5 +1,4 @@
 #![cfg(target_arch = "wasm32")]
-#![feature(const_mut_refs)]
 
 use std::{io, ptr, slice};
 use std::io::Write;

runner/src/platform/unknown.rs

@@ -34,7 +34,7 @@ pub fn run(mut cx: crate::Context) {
     crate::motion::State::simulate(&mut cx);
 }
 
-pub struct Library(*mut ());
+pub struct Library;
 
 impl Library {
     pub fn load(_dll: Symbol) -> Option<Library> { None }

runner/src/platform/web.rs

@@ -61,7 +61,7 @@ extern "system" {
     pub fn stop();
 }
 
-pub struct Library(*mut ());
+pub struct Library;
 
 impl Library {
     pub fn load(_dll: Symbol) -> Option<Library> { None }