pin rev dependency + remove obsolete wasm feature

dimforge · Jan 6, 2025 · f972eb8 · f972eb8
1 parent 9b09a1c
commit f972eb8
Show file tree

Hide file tree

Showing 5 changed files with 29 additions and 31 deletions.
diff --git a/.github/workflows/salva-ci-build.yml b/.github/workflows/salva-ci-build.yml
@@ -2,17 +2,17 @@ name: Salva CI build
 
 on:
   push:
-    branches: [ master ]
-  pull_request: 
-    branches: [ master ]
+    branches: [master]
+  pull_request:
+    branches: [master]
 
 jobs:
   check-fmt:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v2
-    - name: Check formatting
-      run: cargo fmt -- --check
+      - uses: actions/checkout@v2
+      - name: Check formatting
+        run: cargo fmt -- --check
   build-native:
     runs-on: ubuntu-latest
     env:
@@ -22,10 +22,10 @@ jobs:
         package: [salva2d, salva3d]
         feature: [default, parallel, sampling, parry, rapier, rapier-testbed]
     steps:
-    - uses: actions/checkout@v2
-    - run: sudo apt-get install -y cmake libxcb-composite0-dev
-    - name: build ${{ matrix.package }} --features ${{ matrix.feature }}
-      run: cargo build --verbose -p ${{ matrix.package }} --features ${{ matrix.feature }}
+      - uses: actions/checkout@v2
+      - run: sudo apt-get install -y cmake libxcb-composite0-dev
+      - name: build ${{ matrix.package }} --features ${{ matrix.feature }}
+        run: cargo build --verbose -p ${{ matrix.package }} --features ${{ matrix.feature }}
   all-features-native:
     runs-on: ubuntu-latest
     env:
@@ -34,10 +34,10 @@ jobs:
       matrix:
         package: [salva2d, salva3d]
     steps:
-    - uses: actions/checkout@v2
-    - run: sudo apt-get install -y cmake
-    - name: build ${{ matrix.package }} --all-features
-      run: cargo build --verbose -p ${{ matrix.package }} --all-features
+      - uses: actions/checkout@v2
+      - run: sudo apt-get install -y cmake
+      - name: build ${{ matrix.package }} --all-features
+        run: cargo build --verbose -p ${{ matrix.package }} --all-features
   test-native:
     runs-on: ubuntu-latest
     env:
@@ -46,10 +46,10 @@ jobs:
       matrix:
         package: [salva2d, salva3d]
     steps:
-    - uses: actions/checkout@v2
-    - run: sudo apt-get install -y cmake
-    - name: test ${{ matrix.package }}
-      run: cargo test --verbose -p ${{ matrix.package }}
+      - uses: actions/checkout@v2
+      - run: sudo apt-get install -y cmake
+      - name: test ${{ matrix.package }}
+        run: cargo test --verbose -p ${{ matrix.package }}
   examples-native:
     runs-on: ubuntu-latest
     env:
@@ -59,22 +59,22 @@ jobs:
         package: [examples2d, examples3d]
         feature: [default, parallel]
     steps:
-    - uses: actions/checkout@v2
-    - run: sudo apt-get install -y cmake libxcb-composite0-dev libx11-dev libasound2-dev libudev-dev
-    - name: build ${{ matrix.package }} --features ${{ matrix.feature }}
-      run: cargo build --verbose -p ${{ matrix.package }} --features ${{ matrix.feature }}
+      - uses: actions/checkout@v2
+      - run: sudo apt-get install -y cmake libxcb-composite0-dev libx11-dev libasound2-dev libudev-dev
+      - name: build ${{ matrix.package }} --features ${{ matrix.feature }}
+        run: cargo build --verbose -p ${{ matrix.package }} --features ${{ matrix.feature }}
   build-wasm:
     runs-on: ubuntu-latest
     env:
       RUSTFLAGS: -D warnings
     strategy:
       matrix:
-          package: [salva2d, salva3d]
+        package: [salva2d, salva3d]
     steps:
       - uses: actions/checkout@v2
       - run: rustup target add wasm32-unknown-unknown
       - name: wasm build ${{ matrix.package }}
-        run: cargo build -p ${{ matrix.package }}  --verbose --features wasm-bindgen --target wasm32-unknown-unknown;
+        run: cargo build -p ${{ matrix.package }}  --verbose --target wasm32-unknown-unknown;
   # build-wasm-emscripten:
   #   runs-on: ubuntu-latest
   #   env:

diff --git a/Cargo.toml b/Cargo.toml
@@ -22,10 +22,10 @@ salva3d = { path = "./build/salva3d" }
 #rapier_testbed2d = { git = "https://github.com/dimforge/rapier", branch = "split_geom"  }
 #rapier_testbed3d = { git = "https://github.com/dimforge/rapier", branch = "split_geom"  }
 
-rapier2d = { git = "https://github.com/dimforge/rapier" }
-rapier3d = { git = "https://github.com/dimforge/rapier" }
-rapier_testbed2d = { git = "https://github.com/dimforge/rapier" }
-rapier_testbed3d = { git = "https://github.com/dimforge/rapier" }
+rapier2d = { git = "https://github.com/dimforge/rapier", rev = "cf77b5bf574f8363794f979510deec5c08e58401" }
+rapier3d = { git = "https://github.com/dimforge/rapier", rev = "cf77b5bf574f8363794f979510deec5c08e58401" }
+rapier_testbed2d = { git = "https://github.com/dimforge/rapier", rev = "cf77b5bf574f8363794f979510deec5c08e58401" }
+rapier_testbed3d = { git = "https://github.com/dimforge/rapier", rev = "cf77b5bf574f8363794f979510deec5c08e58401" }
 
 # rapier2d = { git = "https://github.com/dimforge/rapier", rev = "3b0d256" }
 # rapier3d = { git = "https://github.com/dimforge/rapier", rev = "3b0d256" }

diff --git a/build/salva2d/Cargo.toml b/build/salva2d/Cargo.toml
@@ -35,7 +35,6 @@ rapier = ["parry", "rapier2d"]
 rapier-testbed = ["rapier", "rapier_testbed2d", "graphics"]
 rapier-harness = ["rapier-testbed"]
 parry = ["parry2d"]
-wasm-bindgen = ["rapier2d/wasm-bindgen"]
 graphics = ["bevy", "bevy_egui"]
 
 [lib]

diff --git a/build/salva3d/Cargo.toml b/build/salva3d/Cargo.toml
@@ -25,7 +25,6 @@ sampling = ["rapier"]
 rapier-testbed = ["rapier", "rapier_testbed3d", "graphics"]
 rapier-harness = ["rapier-testbed"]
 parry = ["parry3d"]
-wasm-bindgen = ["rapier3d/wasm-bindgen"]
 graphics = ["bevy", "bevy_egui"]
 
 [lib]

diff --git a/src/integrations/rapier/fluids_pipeline.rs b/src/integrations/rapier/fluids_pipeline.rs
@@ -126,7 +126,7 @@ impl ColliderCouplingSet {
         &'a mut self,
         colliders: &'a ColliderSet,
         bodies: &'a mut RigidBodySet,
-    ) -> ColliderCouplingManager {
+    ) -> ColliderCouplingManager<'a> {
         ColliderCouplingManager {
             coupling: self,
             colliders,