ci: ???

rsonquery · Sep 10, 2023 · 05f2fc5 · 05f2fc5
1 parent 0a5d415
commit 05f2fc5
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 10 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -103,15 +103,18 @@ jobs:
         run: sudo apt install lld
       - name: Install lld (MacOS)
         if: matrix.os == 'macos-latest'
-        run: brew install --with-lld --HEAD llvm
-      - name: Install winget (Windows)
-        if: matrix.os == 'windows-latest'
-        uses: Cyberboss/install-winget@3301de662a82d09e8aded238e995a8e1259159c8
-        with:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      - name: Install lld (Windows)
-        if: matrix.os == 'windows-latest'
-        run: winget install LLVM.LLVM --accept-source-agreements --accept-package-agreements
+        run: |
+          brew install llvm
+          export PATH=/usr/local/opt/llvm/bin:$PATH
+          export LD_LIBRARY_PATH=$(llvm-config --libdir):$LD_LIBRARY_PATH
+      #- name: Install winget (Windows)
+      #  if: matrix.os == 'windows-latest'
+      #  uses: Cyberboss/install-winget@3301de662a82d09e8aded238e995a8e1259159c8
+      #  with:
+      #    GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      #- name: Install lld (Windows)
+      #  if: matrix.os == 'windows-latest'
+      #  run: winget install LLVM.LLVM --accept-source-agreements --accept-package-agreements
       - name: Install Rust toolchain (stable)
         uses: dtolnay/rust-toolchain@5cb429dd810e16ff67df78472fa81cf760f4d1c0 # stable
         with:

diff --git a/crates/rsonpath-lib/src/classification/simd.rs b/crates/rsonpath-lib/src/classification/simd.rs
@@ -512,7 +512,7 @@ cfg_if! {
             };
         }
     }
-    else if #[cfg(arch = "x86")] {
+    else if #[cfg(target_arch = "x86")] {
         macro_rules! simd_dispatch {
             ($conf:expr => |$simd:ident| $b:block) => {
                 {
@@ -632,6 +632,10 @@ cfg_if! {
     else {
         macro_rules! simd_dispatch {
             ($conf:expr => |$simd:ident| $b:block) => {
+                let conf = $conf;
+                assert_eq!(conf.highest_simd(), SimdTag::Nosimd);
+                assert!(!conf.fast_quotes());
+                assert!(!conf.fast_popcnt());
                 let $simd = $crate::classification::simd::ResolvedSimd::<
                     $crate::classification::quotes::nosimd::Constructor,
                     $crate::classification::structural::nosimd::Constructor,