diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml index bc7bc984..e985c78d 100644 --- a/.github/workflows/rust.yml +++ b/.github/workflows/rust.yml @@ -18,7 +18,7 @@ jobs: - rust: nightly env: DUMMY: true - - rust: 1.29.0 + - rust: 1.36.0 env: PIN_VERSIONS: true steps: diff --git a/README.md b/README.md index 4f77ccfd..b28a1879 100644 --- a/README.md +++ b/README.md @@ -9,15 +9,5 @@ structures and network messages related to Elements ## Minimum Supported Rust Version (MSRV) -This library should always compile with any combination of features on **Rust 1.29**. -Because some dependencies have broken the build in minor/patch releases, to -compile with 1.29.0 you will need to run the following version-pinning command: -``` -cargo update -p cc --precise "1.0.41" --verbose -``` -In order to have serde support, the following versions also need to be pinned: -``` -cargo update --package "serde" --precise "1.0.98" -cargo update --package "serde_derive" --precise "1.0.98" -``` +This library should always compile with any combination of features on **Rust 1.36**. diff --git a/contrib/test.sh b/contrib/test.sh index 640c3a08..cddb21cd 100755 --- a/contrib/test.sh +++ b/contrib/test.sh @@ -2,19 +2,6 @@ FEATURES="serde-feature" -pin_common_verions() { - cargo generate-lockfile --verbose - cargo update -p cc --precise "1.0.41" --verbose - cargo update -p serde --precise "1.0.98" --verbose - cargo update -p serde_derive --precise "1.0.98" --verbose -} - -# Pin `cc` for Rust 1.29 -if [ -n "$PIN_VERSIONS" ]; then - pin_common_verions -fi - - # Use toolchain if explicitly specified if [ -n "$TOOLCHAIN" ] then diff --git a/src/address.rs b/src/address.rs index 529e4ff0..e61b4bb3 100644 --- a/src/address.rs +++ b/src/address.rs @@ -19,10 +19,6 @@ use std::error; use std::fmt; use std::str::FromStr; -// AsciiExt is needed until for Rust 1.26 but not for newer versions -#[allow(unused_imports, deprecated)] -use std::ascii::AsciiExt; - use bitcoin::bech32::{self, u5, FromBase32, ToBase32}; use bitcoin::util::base58; use bitcoin::PublicKey; diff --git a/src/blech32.rs b/src/blech32.rs index fd35bcca..6bdd9530 100644 --- a/src/blech32.rs +++ b/src/blech32.rs @@ -42,10 +42,6 @@ use std::fmt; -// AsciiExt is needed until for Rust 1.26 but not for newer versions -#[allow(unused_imports, deprecated)] -use std::ascii::AsciiExt; - use bitcoin::bech32::{u5, Error}; /// Encode a bech32 payload to an [fmt::Formatter].