Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ jobs:
- name: Install Rust
uses: dtolnay/rust-toolchain@stable
with:
toolchain: "1.92" # STABLE
toolchain: "1.93" # STABLE
- uses: Swatinem/rust-cache@v2
- name: Check documentation
env:
Expand All @@ -122,7 +122,7 @@ jobs:
- name: Install Rust
uses: dtolnay/rust-toolchain@stable
with:
toolchain: "1.92" # STABLE
toolchain: "1.93" # STABLE
components: rustfmt
- uses: Swatinem/rust-cache@v2
- name: Check formatting
Expand All @@ -138,7 +138,7 @@ jobs:
- name: Install Rust
uses: dtolnay/rust-toolchain@stable
with:
toolchain: "1.92" # STABLE
toolchain: "1.93" # STABLE
components: clippy
- uses: Swatinem/rust-cache@v2
- name: Install SARIF tools
Expand Down
26 changes: 20 additions & 6 deletions crates/libtest2/tests/ui/unsupported_result_types.stderr
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,16 @@ error[E0277]: the trait bound `Result<i32, std::io::Error>: IntoRunResult` is no
| the trait `IntoRunResult` is not implemented for `Result<i32, std::io::Error>`
| required by a bound introduced by this call
|
= help: the following other types implement trait `IntoRunResult`:
Result<(), E>
Result<(), RunError>
help: the following other types implement trait `IntoRunResult`
--> $WORKSPACE/crates/libtest2-harness/src/error.rs
|
| impl IntoRunResult for RunResult {
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ `Result<(), RunError>`
...
| / impl<E> IntoRunResult for Result<(), E>
| | where
| | E: std::error::Error + Send + Sync + 'static,
| |_________________________________________________^ `Result<(), E>`
= note: this error originates in the macro `$crate::_private::test_parse` which comes from the expansion of the attribute macro `libtest2::test` (in Nightly builds, run with -Z macro-backtrace for more info)

error[E0277]: the trait bound `String: std::error::Error` is not satisfied
Expand All @@ -21,8 +28,15 @@ error[E0277]: the trait bound `String: std::error::Error` is not satisfied
| the trait `std::error::Error` is not implemented for `String`
| required by a bound introduced by this call
|
= help: the following other types implement trait `IntoRunResult`:
Result<(), E>
Result<(), RunError>
help: the following other types implement trait `IntoRunResult`
--> $WORKSPACE/crates/libtest2-harness/src/error.rs
|
| impl IntoRunResult for RunResult {
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ `Result<(), RunError>`
...
| / impl<E> IntoRunResult for Result<(), E>
| | where
| | E: std::error::Error + Send + Sync + 'static,
| |_________________________________________________^ `Result<(), E>`
= note: required for `Result<(), String>` to implement `IntoRunResult`
= note: this error originates in the macro `$crate::_private::test_parse` which comes from the expansion of the attribute macro `libtest2::test` (in Nightly builds, run with -Z macro-backtrace for more info)
17 changes: 13 additions & 4 deletions crates/libtest2/tests/ui/unsupported_return_type.stderr
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,17 @@ error[E0277]: the trait bound `i32: IntoRunResult` is not satisfied
| the trait `IntoRunResult` is not implemented for `i32`
| required by a bound introduced by this call
|
= help: the following other types implement trait `IntoRunResult`:
()
Result<(), E>
Result<(), RunError>
help: the following other types implement trait `IntoRunResult`
--> $WORKSPACE/crates/libtest2-harness/src/error.rs
|
| impl IntoRunResult for () {
| ^^^^^^^^^^^^^^^^^^^^^^^^^ `()`
...
| impl IntoRunResult for RunResult {
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ `Result<(), RunError>`
...
| / impl<E> IntoRunResult for Result<(), E>
| | where
| | E: std::error::Error + Send + Sync + 'static,
| |_________________________________________________^ `Result<(), E>`
= note: this error originates in the macro `$crate::_private::test_parse` which comes from the expansion of the attribute macro `libtest2::test` (in Nightly builds, run with -Z macro-backtrace for more info)
Loading