Merge pull request #598 from workingjubilee/pull-back-msrv

Pull back MSRV on Windows
rust-lang · Mar 22, 2024 · bdc8b82 · bdc8b82
2 parents 6fa4b85 + edc9f5c
commit bdc8b82
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 9 deletions.
diff --git a/.github/workflows/check-binary-size.yml b/.github/workflows/check-binary-size.yml
@@ -6,8 +6,9 @@ name: Check binary size
 
 on:
   pull_request_target:
-    branches:
-      - master
+    # HACK(jubilee): something broke the distributed LLVM libso and I don't know what.
+    branches: []
+#      - master
 
 # Both the "measure" and "report" jobs need to know this.
 env:

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -26,14 +26,13 @@ jobs:
             rust: stable
           - os: macos-latest
             rust: nightly
-          # Note that these are on nightly due to rust-lang/rust#63700 not being
-          # on stable yet
+          # HACK(jubilee): 1.77 broke backtraces on Windows lol
           - os: windows-latest
-            rust: stable-x86_64-msvc
+            rust: 1.76.0-x86_64-msvc
           - os: windows-latest
-            rust: stable-i686-msvc
+            rust: 1.76.0-i686-msvc
           - os: windows-latest
-            rust: stable-x86_64-gnu
+            rust: 1.76.0-x86_64-gnu
     steps:
     - uses: actions/checkout@v3
       with:
@@ -234,7 +233,13 @@ jobs:
 
   msrv:
     name: MSRV
-    runs-on: ubuntu-20.04
+    runs-on: ${{ matrix.os }}
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - os: ubuntu-20.04
+          - os: windows-latest
     steps:
     - uses: actions/checkout@v3
       with:

diff --git a/src/symbolize/dbghelp.rs b/src/symbolize/dbghelp.rs
@@ -26,6 +26,13 @@ use core::mem;
 use core::ptr;
 use core::slice;
 
+// FIXME: replace with ptr::from_ref once MSRV is high enough
+#[inline(always)]
+#[must_use]
+const fn ptr_from_ref<T: ?Sized>(r: &T) -> *const T {
+    r
+}
+
 // Store an OsString on std so we can provide the symbol name and filename.
 pub struct Symbol<'a> {
     name: *const [u8],
@@ -257,7 +264,7 @@ unsafe fn do_resolve(
 
         let len = len as usize;
 
-        filename = Some(ptr::from_ref(slice::from_raw_parts(base, len)));
+        filename = Some(ptr_from_ref(slice::from_raw_parts(base, len)));
     }
 
     cb(&super::Symbol {