update rust toolchain

.github/workflows/checks.yaml

@@ -2,28 +2,15 @@ name: "Nix CI"
 on:
   pull_request:
   push:
-jobs:
-  nix-build:
-    runs-on: ${{ matrix.os }}
-    strategy:
-      fail-fast: false
-      matrix:
-        include:
-          - os: ubuntu-latest
-          - os: macos-latest
 
+jobs:
+  flake-show:
+    runs-on: ubuntu-latest
+    outputs:
+      matrix: ${{ steps.set-matrix.outputs.matrix }}
     steps:
-    - uses: actions/checkout@v3
-    - uses: DeterminateSystems/nix-installer-action@main
-    - uses: DeterminateSystems/magic-nix-cache-action@main
-
-    - name: Nix Flake Check
-      run: nix -Lv flake check
-
-    - uses: cachix/cachix-action@v10
-      with:
-        name: emacsng
-        authToken: "${{ secrets.CACHIX_AUTH_TOKEN }}"
-
-    - name: Run Emacsng Exec
-      run: nix -Lv run .#emacsng-noNativeComp -- --version
+      - uses: actions/[email protected]
+      - uses: cachix/install-nix-action@v24
+      - id: set-matrix
+        name: Evaluate flake
+        run: nix flake show --all-systems

flake.nix

@@ -39,12 +39,12 @@
               self.overlays.default
               emacs-overlay.overlay
               (import rust-overlay)
-              devshell.overlay
+              devshell.overlays.default
             ];
             config = {};
           };
         in rec {
-          devShells.default = with pkgs; let
+          devshell = with pkgs; let
             custom-llvmPackages = llvmPackages_latest;
           in
             pkgs.devshell.mkShell {
@@ -121,7 +121,7 @@
           withWebrender = true;
         in
           (
-            final.emacsGit.override
+            final.emacs-unstable.override
             {
               withImageMagick = true;
               withNS = false;
@@ -217,6 +217,9 @@
               ++ lib.optionals (! withWebrender) [
                 "--with-harfbuzz"
               ]
+              # ++ lib.optionals stdenv.cc.isClang [
+              #   "RUSTFLAGS='-l${stdenv.cc.libcxx.cxxabi.libName}'"
+              # ]
               ++ lib.optionals stdenv.isLinux [
                 "--with-dbus"
               ];
@@ -244,10 +247,9 @@
                   python3
                 ]
                 ++ rpathLibs)
+              ++ [cargo rustc]
               ++ (with rustPlatform; [
                 cargoSetupHook
-                rust.cargo
-                rust.rustc
               ])
               ++ lib.optionals
               stdenv.isDarwin
@@ -293,7 +295,7 @@
         emacsng-noNativeComp = (
           (
             emacsng.override {
-              nativeComp = false;
+	      withNativeCompilation = false;
             }
           )
           .overrideAttrs (

rust-toolchain

@@ -1 +1 @@
-nightly-2023-02-20
+nightly-2024-01-25

rust_src/crates/emacs/src/symbol.rs

@@ -55,7 +55,7 @@ impl LispSymbolRef {
     }
 
     pub fn set_next(mut self, next: Option<Self>) {
-        let mut s = unsafe { self.u.s.as_mut() };
+        let s = unsafe { self.u.s.as_mut() };
         s.next = match next {
             Some(sym) => sym.as_ptr() as *mut Lisp_Symbol,
             None => ptr::null_mut(),
@@ -110,7 +110,7 @@ impl LispObject {
             self.get_untaggedptr() as EmacsInt
         };
 
-        let lispsym_offset = unsafe { &lispsym as *const _ as EmacsInt };
+        let lispsym_offset = unsafe { ptr::addr_of!(lispsym) as *const _ as EmacsInt };
         ptr_value + lispsym_offset
     }
 }