Skip to content

Commit

Permalink
Merge #34: Enable edition 2018
Browse files Browse the repository at this point in the history
ec6459e Bump version 0.19.0-3 -> 0.19.0-0.4.0 (Tobin Harding)
31c695f Update to use edition 2018 (Tobin Harding)
4be3bf2 Update MSRV in CI and Readme from 1.29 to 1.41.1 (Tobin Harding)

Pull request description:

  Update the MSRV to Rust 1.41.1 and enable edition 2018.

  Should not be merged without rust-bitcoin organization-wide planning on how to go about this upgrade.

  ~Leaving as draft until rust-bitcoin Taproot release is done.~

  Discussion: rust-bitcoin/rust-bitcoin#510 (comment)

Top commit has no ACKs.

Tree-SHA512: bf38d3884ccf5c151ee2956e4ee285ec778602792752fe696a2b56b5cbcb2d3e13b7eaed42517f6b1fb49a0db90ea946d58c124532f596e1f8ad649c61730f78
  • Loading branch information
tcharding committed May 18, 2022
2 parents e209356 + ec6459e commit 26a110c
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 18 deletions.
5 changes: 1 addition & 4 deletions .github/workflows/rust.yml
Expand Up @@ -10,7 +10,7 @@ jobs:
fail-fast: false
matrix:
rust:
- 1.29.0
- 1.41.1
- nightly
- beta
- stable
Expand All @@ -25,9 +25,6 @@ jobs:
profile: minimal
toolchain: ${{ matrix.rust }}
override: true
- name: Pin cc if rust 1.29
if: matrix.rust == '1.29.0'
run: cargo generate-lockfile && cargo update -p cc --precise "1.0.41" --verbose
- name: Running Cargo test
run: cargo test

Expand Down
3 changes: 2 additions & 1 deletion Cargo.toml
@@ -1,6 +1,6 @@
[package]
name = "bitcoinconsensus"
version = "0.19.0-3"
version = "0.19.0-0.4.0"
authors = ["Tamas Blummer <tamas.blummer@gmail.com>"]
license = "Apache-2.0"
homepage = "https://github.com/rust-bitcoin/rust-bitcoinconsensus/"
Expand All @@ -10,6 +10,7 @@ keywords = [ "bitcoin", "bitcoinconsensus", "libbitcoinconsensus" ]
readme = "README.md"
exclude = ["/depend/bitcoin/.github/**", "/depend/bitcoin/.tx/**", "/depend/bitcoin/build-aux/**", "/depend/bitcoin/contrib/**", "/depend/bitcoin/depends/**", "/depend/bitcoin/doc/**", "/depend/bitcoin/share/**", "/depend/bitcoin/test/**", "/depend/bitcoin/src/bench/**", "/depend/bitcoin/src/config/**", "/depend/bitcoin/src/consensus/**", "/depend/bitcoin/src/leveldb/**", "/depend/bitcoin/src/policy/**", "/depend/bitcoin/src/qt/**", "/depend/bitcoin/src/rpc/**", "/depend/bitcoin/src/support/**", "/depend/bitcoin/src/test/**", "/depend/bitcoin/src/univalue/**", "/depend/bitcoin/src/wallet/**", "/depend/bitcoin/src/zmq/**"]
build = "build.rs"
edition = "2018"

[lib]
name = "bitcoinconsensus"
Expand Down
14 changes: 1 addition & 13 deletions README.md
Expand Up @@ -36,19 +36,7 @@ I verified the build for Linux and OSX. Aleksey Sidorov contributed the windows

## MSRV

The MSRV of this crate is 1.29.0.

The build dependency `cc` might require a more recent version of the Rust compiler.
To ensure compilation with Rust 1.29.0, pin its version in your `Cargo.lock`
with `cargo update -p cc --precise 1.0.41`. If you're using `secp256k1` in a library,
to make sure it compiles in CI, you'll need to generate a lockfile first.
Example for Travis CI:
```yml
before_script:
- if [ "$TRAVIS_RUST_VERSION" == "1.29.0" ]; then
cargo generate-lockfile --verbose && cargo update -p cc --precise "1.0.41" --verbose;
fi
```
The MSRV of this crate is **1.41.1**.

## API
The API is very basic, exposing Bitcoin's as is. This is intentional to keep this project minimal footprint and no further runtime dependencies. You will need another Rust library to serialize Bitcoin transactions and scripts.
Expand Down

0 comments on commit 26a110c

Please sign in to comment.