Skip to content

Commit 8b35d43

Browse files
committed
Merge rust-bitcoin/rust-bitcoin#1126: Remove stale MSRV docs
fe840f0 Fix stale toolchain docs (Tobin C. Harding) 73b506e Remove stale MSRV docs (Tobin C. Harding) Pull request description: We have stale docs referring to the old MSRV. We do not need MSRV docs in `CONTRIBUTING` because we have them in the README already. Fix stale docs by doing: - Remove the MSRV docs from readme in favour of `CONTRIBUTING.md`. - Add a sentence to the redame pointing readers towards `CONTRIBUTING.md`. - Point readers towards `RUSTUP_TOOLCHAIN` ACKs for top commit: apoelstra: ACK fe840f0 Kixunil: ACK fe840f0 Tree-SHA512: 6d3006db7a460e5d7146b73ff4b99dc322d396e65da39f5ea47c4904aa387c8a36e4a8ae707653dbab90096e692bf69918e6c19c4d3d989c85b22dba4dcba904
2 parents 3afd11d + 85ef411 commit 8b35d43

File tree

2 files changed

+4
-8
lines changed

2 files changed

+4
-8
lines changed

CONTRIBUTING.md

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -128,9 +128,9 @@ PR authors may also find it useful to run the following script locally in order
128128
to check that each of the commits within the PR satisfies the requirements
129129
above, before submitting the PR to review:
130130
```shell script
131-
BITCOIN_MSRV=1.29.0 ./contrib/test.sh
131+
RUSTUP_TOOLCHAIN=1.41.1 ./contrib/test.sh
132132
```
133-
Please replace the value in `BITCOIN_MSRV=1.29.0` with the current MSRV from
133+
Please replace the value in `RUSTUP_TOOLCHAIN=1.41.1` with the current MSRV from
134134
[README.md].
135135

136136
NB: Please keep in mind that the script above replaces `Cargo.lock` file, which
@@ -183,12 +183,6 @@ and [how it is planned to coordinate it with crate refactoring](https://github.c
183183
For the new code it is recommended to follow style of the existing codebase and
184184
avoid any end-line space characters.
185185

186-
### MSRV
187-
188-
The Minimal Supported Rust Version (MSRV) is 1.29; it is enforced by our CI.
189-
Later we plan to increase MSRV to support Rust 2018 and you are welcome to check
190-
the [tracking issue](https://github.com/rust-bitcoin/rust-bitcoin/issues/510).
191-
192186
### Naming conventions
193187

194188
Naming of data structures/enums and their fields/variants must follow names used

README.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,8 @@ please join us in
7171
[#bitcoin-rust](https://web.libera.chat/?channel=#bitcoin-rust) on
7272
[libera.chat](https://libera.chat).
7373

74+
For more information please see `./CONTRIBUTING.md`.
75+
7476
## Minimum Supported Rust Version (MSRV)
7577

7678
This library should always compile with any combination of features (minus

0 commit comments

Comments
 (0)