fix test error messages

sklose · Feb 21, 2022 · fa7ad87 · fa7ad87
1 parent 6d41862
commit fa7ad87
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 24 deletions.
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
@@ -9,7 +9,7 @@ jobs:
       - uses: actions/checkout@v2
       - uses: actions-rs/toolchain@v1
         with:
-          toolchain: stable
+          toolchain: 1.58.1
           components: clippy
           override: true
       - uses: actions-rs/cargo@v1

diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
@@ -11,7 +11,7 @@ jobs:
       - uses: actions/checkout@v2
       - uses: actions-rs/toolchain@v1
         with:
-          toolchain: stable
+          toolchain: 1.58.1
           profile: minimal
           override: true
       - run: cargo publish --token ${CRATES_TOKEN}

diff --git a/rust-toolchain b/rust-toolchain
@@ -0,0 +1 @@
+1.58.1
diff --git a/tests/cve/cve_2020_36470_1.stderr b/tests/cve/cve_2020_36470_1.stderr
@@ -14,7 +14,3 @@ note: required because it appears within the type `NonSend`
     = note: required because of the requirements on the impl of `Send` for `RingBuffer<NonSend>`
     = note: required because it appears within the type `[closure@$DIR/tests/cve/cve_2020_36470_1.rs:34:32: 36:6]`
 note: required by a bound in `std::thread::spawn`
-   --> $RUST/std/src/thread/mod.rs
-    |
-    |     F: Send + 'static,
-    |        ^^^^ required by this bound in `std::thread::spawn`
diff --git a/tests/cve/cve_2020_36470_2.stderr b/tests/cve/cve_2020_36470_2.stderr
@@ -16,18 +16,13 @@ note: required by a bound in `DisrustorBuilder::new`
 error[E0599]: the method `with_spin_wait` exists for struct `WithDataProvider<RingBuffer<Cell<RefOrInt>>, Cell<RefOrInt>>`, but its trait bounds were not satisfied
    --> tests/cve/cve_2020_36470_2.rs:32:14
     |
-32  |             .with_spin_wait()
-    |              ^^^^^^^^^^^^^^ method cannot be called on `WithDataProvider<RingBuffer<Cell<RefOrInt>>, Cell<RefOrInt>>` due to unsatisfied trait bounds
-    |
-   ::: $RUST/core/src/cell.rs
-    |
-    | pub struct Cell<T: ?Sized> {
-    | -------------------------- doesn't satisfy `Cell<RefOrInt>: Sync`
+32  |               .with_spin_wait()
+    |                ^^^^^^^^^^^^^^ method cannot be called on `WithDataProvider<RingBuffer<Cell<RefOrInt>>, Cell<RefOrInt>>` due to unsatisfied trait bounds
     |
    ::: src/ringbuffer.rs
     |
-    | pub struct RingBuffer<T> {
-    | ------------------------ doesn't satisfy `_: DataProvider<Cell<RefOrInt>>`
+    |   pub struct RingBuffer<T> {
+    |   ------------------------ doesn't satisfy `_: DataProvider<Cell<RefOrInt>>`
     |
     = note: the following trait bounds were not satisfied:
             `RingBuffer<Cell<RefOrInt>>: DataProvider<Cell<RefOrInt>>`
@@ -64,18 +59,13 @@ note: required by a bound in `DisrustorBuilder::new`
 error[E0599]: the method `with_spin_wait` exists for struct `WithDataProvider<RingBuffer<Cell<RefOrInt>>, Cell<RefOrInt>>`, but its trait bounds were not satisfied
    --> tests/cve/cve_2020_36470_2.rs:45:10
     |
-45  |         .with_spin_wait()
-    |          ^^^^^^^^^^^^^^ method cannot be called on `WithDataProvider<RingBuffer<Cell<RefOrInt>>, Cell<RefOrInt>>` due to unsatisfied trait bounds
-    |
-   ::: $RUST/core/src/cell.rs
-    |
-    | pub struct Cell<T: ?Sized> {
-    | -------------------------- doesn't satisfy `Cell<RefOrInt>: Sync`
+45  |           .with_spin_wait()
+    |            ^^^^^^^^^^^^^^ method cannot be called on `WithDataProvider<RingBuffer<Cell<RefOrInt>>, Cell<RefOrInt>>` due to unsatisfied trait bounds
     |
    ::: src/ringbuffer.rs
     |
-    | pub struct RingBuffer<T> {
-    | ------------------------ doesn't satisfy `_: DataProvider<Cell<RefOrInt>>`
+    |   pub struct RingBuffer<T> {
+    |   ------------------------ doesn't satisfy `_: DataProvider<Cell<RefOrInt>>`
     |
     = note: the following trait bounds were not satisfied:
             `RingBuffer<Cell<RefOrInt>>: DataProvider<Cell<RefOrInt>>`