Skip to content

Commit

Permalink
Merge pull request #68 from rust-lang/renovate/rust-1.x
Browse files Browse the repository at this point in the history
chore(deps): update msrv to v1.76
  • Loading branch information
epage authored Feb 12, 2024
2 parents e04734a + 3968083 commit 21b8525
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 7 deletions.
2 changes: 1 addition & 1 deletion .clippy.toml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
msrv = "1.73" # MSRV
msrv = "1.76" # MSRV
warn-on-all-wildcard-imports = true
allow-expect-in-tests = true
allow-unwrap-in-tests = true
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -49,15 +49,15 @@ jobs:
- name: No-default features
run: cargo test --workspace --no-default-features
msrv:
name: "Check MSRV: 1.73"
name: "Check MSRV: 1.76"
runs-on: ubuntu-latest
steps:
- name: Checkout repository
uses: actions/checkout@v4
- name: Install Rust
uses: dtolnay/rust-toolchain@stable
with:
toolchain: "1.73" # MSRV
toolchain: "1.76" # MSRV
- uses: Swatinem/rust-cache@v2
- name: Default features
run: cargo check --workspace --all-targets
Expand Down Expand Up @@ -119,7 +119,7 @@ jobs:
- name: Install Rust
uses: dtolnay/rust-toolchain@stable
with:
toolchain: "1.73" # MSRV
toolchain: "1.76" # MSRV
components: clippy
- uses: Swatinem/rust-cache@v2
- name: Install SARIF tools
Expand Down
2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ members = ["crates/*"]
[workspace.package]
license = "MIT OR Apache-2.0"
edition = "2021"
rust-version = "1.73" # MSRV
rust-version = "1.76" # MSRV
include = [
"build.rs",
"src/**/*",
Expand Down
5 changes: 3 additions & 2 deletions crates/libtest2-harness/src/harness.rs
Original file line number Diff line number Diff line change
Expand Up @@ -317,14 +317,15 @@ fn run(
let state_fallback = state.clone();
let sync_success = sync_success.clone();
let sync_success_fallback = sync_success.clone();
match cfg.spawn(move || {
let join_handle = cfg.spawn(move || {
let mut notifier = SenderNotifier { tx: tx.clone() };
let case_success = run_case(case.as_ref().as_ref(), &state, &mut notifier)
.expect("`SenderNotifier` is infallible");
if !case_success {
sync_success.store(case_success, std::sync::atomic::Ordering::Relaxed);
}
}) {
});
match join_handle {
Ok(join_handle) => {
running_tests.insert(name.clone(), RunningTest { join_handle });
pending += 1;
Expand Down

0 comments on commit 21b8525

Please sign in to comment.