Merge pull request #25 from martinjrobins/i3-nighly-hang

#3 workaround for this issue
martinjrobins · Apr 4, 2024 · 2c11af2 · 2c11af2
2 parents 03edd91 + 161b5ec
commit 2c11af2
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 5 deletions.
diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
@@ -30,12 +30,15 @@ jobs:
         matrix:
           toolchain:
             - stable
-            #- beta
-            #- nightly
           os:
             - ubuntu-latest
             - macos-latest
             - windows-latest
+          include:
+            - toolchain: beta
+              os: ubuntu-latest
+            - toolchain: nightly
+              os: ubuntu-latest
 
     steps:
     - uses: actions/checkout@v4
@@ -46,7 +49,7 @@ jobs:
           target
         key: unit-test-${{ runner.os }}-${{ matrix.toolchain}}
     - name: Set up Rust
-      run: rustup default ${{ matrix.toolchain }} && rustup update ${{ matrix.toolchain }} --no-self-update
+      run: rustup default ${{ matrix.toolchain }} && rustup update ${{ matrix.toolchain }} --no-self-update && rustup component add clippy
     - name: Rust version
       run: rustc -Vv
     - name: Install LLVM and Clang

diff --git a/src/vector/mod.rs b/src/vector/mod.rs
@@ -101,8 +101,10 @@ pub trait VectorView<'a>:
 pub trait Vector:
     VectorOpsByValue<Self>
     + for<'b> VectorOpsByValue<&'b Self>
-    + for<'a> VectorOpsByValue<Self::View<'a>>
-    + for<'a, 'b> VectorOpsByValue<&'b Self::View<'a>>
+    // TODO: commenting out these because they cause a compiler hang (https://github.com/martinjrobins/diffsol/issues/3)
+    // TODO: replace when this is fixed
+    //+ for<'a> VectorOpsByValue<Self::View<'a>>
+    //+ for<'a, 'b> VectorOpsByValue<&'b Self::View<'a>>
     + Mul<Scale<Self::T>, Output = Self>
     + Div<Scale<Self::T>, Output = Self>
     + VectorMutOpsByValue<Self>