Skip to content

Commit a54d0a9

Browse files
authored
Merge branch 'main' into remove-lazy-static
2 parents 426d63b + 4b78455 commit a54d0a9

File tree

5 files changed

+5
-25
lines changed

5 files changed

+5
-25
lines changed

.github/workflows/rust.yml

Lines changed: 1 addition & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
include:
2323
- build: pinned
2424
os: ubuntu-24.04
25-
rust: 1.74.0
25+
rust: 1.82.0
2626
- build: stable
2727
os: ubuntu-24.04
2828
rust: stable
@@ -77,25 +77,5 @@ jobs:
7777
- name: Clean and Run tests for derive with features enabled
7878
if: ${{ matrix.build == 'nightly' }}
7979
run: cd proptest-derive && cargo clean && cargo test --features boxed_union
80-
- name: Run state machine tests
81-
if: ${{ matrix.build != 'pinned' }}
82-
run: cd proptest-state-machine && cargo test --verbose
83-
84-
# State machine testing on MSRV 1.82, until the general MSRV
85-
# is caught up to 1.82.0
86-
state-machine:
87-
name: State Machine (MSRV 1.82)
88-
runs-on: ubuntu-24.04
89-
steps:
90-
- name: Checkout repository
91-
uses: actions/checkout@v3
92-
with:
93-
fetch-depth: 1
94-
- name: Install Rust 1.82.0
95-
uses: hecrj/setup-rust-action@v1
96-
with:
97-
rust-version: 1.82.0
98-
- name: Build state machine
99-
run: cd proptest-state-machine && cargo build --verbose
10080
- name: Run state machine tests
10181
run: cd proptest-state-machine && cargo test --verbose

proptest-derive/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ authors = ["Mazdak Farrokhzad <[email protected]>"]
55
license = "MIT OR Apache-2.0"
66
readme = "README.md"
77
edition = "2021"
8-
rust-version = "1.80"
8+
rust-version = "1.82"
99

1010
repository = "https://github.com/proptest-rs/proptest"
1111
documentation = "https://proptest-rs.github.io/proptest/proptest-derive/index.html"

proptest-macro/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ description = "Procedural macros for the proptest crate"
44
version = "0.3.1"
55
authors = ["The Proptest Developers"]
66
edition = "2021"
7-
rust-version = "1.74"
7+
rust-version = "1.82"
88
license = "MIT OR Apache-2.0"
99
repository = "https://github.com/proptest-rs/proptest"
1010
homepage = "https://proptest-rs.github.io/proptest/proptest/index.html"

proptest/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ documentation = "https://docs.rs/proptest/latest/proptest/"
1010
keywords = ["property", "testing", "quickcheck", "fuzz", "hypothesis"]
1111
categories = ["development-tools::testing"]
1212
edition = "2021"
13-
rust-version = "1.80"
13+
rust-version = "1.82"
1414
exclude = ["/gen-*.sh", "/readme-*.md"]
1515

1616
description = """

proptest/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ for a full list of substantial historical changes, breaking and otherwise.
3333

3434
### MSRV
3535

36-
The current MSRV of this crate is 1.74.
36+
The current MSRV of this crate is 1.82.
3737
The MSRV is guaranteed to not exceed `<current stable release> - 7`, though in practice it may be lower than this - your mileage may vary.
3838
If we change this policy in a backwards incompatible way (e.g. changing it to `<current stable release> - 1`), this constitutes a breaking change, and would be a major version bump (e.g. 1.1 -> 2.0).
3939

0 commit comments

Comments
 (0)