Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Get CI into production-ready shape #1

Merged
merged 6 commits into from
Dec 2, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 7 additions & 3 deletions .github/workflows/rust.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name: build

on: push
on: pull_request

jobs:
codestyle:
Expand Down Expand Up @@ -37,10 +37,10 @@ jobs:
strategy:
matrix:
os: [ubuntu-latest, windows-latest, macOS-latest]
rust: [stable, 1.56.1]
rust: [stable, 1.63.0]
exclude:
- os: macOS-latest
rust: 1.56.1
rust: 1.63.0
runs-on: ${{ matrix.os }}

steps:
Expand All @@ -50,5 +50,9 @@ jobs:
rust-version: ${{ matrix.rust }}
- name: Checkout
uses: actions/checkout@v2
- name: Fixes for MSRV
if: matrix.rust == '1.63.0'
run: |
cargo update
- name: Test
run: cargo test
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ The crate is `no_std` but does require `alloc`.

## MSRV

1.56.1
1.63.0

## License

Expand Down
7 changes: 4 additions & 3 deletions src/de.rs
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ impl<'a, T: DeserializeParams<'a>> Uri<'a, bitcoin::address::NetworkUnchecked, T
}
}

impl<'a, NetVal: NetworkValidation, T> Uri<'a, NetVal, T> {
impl<NetVal: NetworkValidation, T> Uri<'_, NetVal, T> {
/// Makes the lifetime `'static` by converting all fields to owned.
///
/// Note that this does **not** affect `extras`!
Expand Down Expand Up @@ -234,6 +234,7 @@ impl<T: fmt::Display + std::error::Error + 'static> std::error::Error for Error<
pub struct UriError(UriErrorInner);

#[derive(Debug, Clone)]
#[cfg_attr(not(feature = "std"), allow(dead_code))]
enum UriErrorInner {
TooShort,
InvalidScheme,
Expand Down Expand Up @@ -293,7 +294,7 @@ impl std::error::Error for UriError {
}

/// **Warning**: this implementation may needlessly allocate, consider using `TryFrom<&str>` instead.
impl<'a, T: for<'de> DeserializeParams<'de>> core::str::FromStr for Uri<'a, bitcoin::address::NetworkUnchecked, T> {
impl<T: for<'de> DeserializeParams<'de>> core::str::FromStr for Uri<'_, bitcoin::address::NetworkUnchecked, T> {
type Err = Error<T::Error>;

fn from_str(s: &str) -> Result<Self, Self::Err> {
Expand All @@ -310,7 +311,7 @@ impl<'a, T: DeserializeParams<'a>> TryFrom<&'a str> for Uri<'a, bitcoin::address
}

/// **Warning**: this implementation may needlessly allocate, consider using `TryFrom<&str>` instead.
impl<'a, T: for<'de> DeserializeParams<'de>> TryFrom<String> for Uri<'a, bitcoin::address::NetworkUnchecked, T> {
impl<T: for<'de> DeserializeParams<'de>> TryFrom<String> for Uri<'_, bitcoin::address::NetworkUnchecked, T> {
type Error = Error<T::Error>;

fn try_from(s: String) -> Result<Self, Self::Error> {
Expand Down
14 changes: 8 additions & 6 deletions src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ where
pub extras: Extras,
}

impl<'a, NetVal: NetworkValidation, T: Default> Uri<'a, NetVal, T> {
impl<NetVal: NetworkValidation, T: Default> Uri<'_, NetVal, T> {
/// Creates an URI with defaults.
///
/// This sets all fields except `address` to default values.
Expand All @@ -118,7 +118,7 @@ impl<'a, NetVal: NetworkValidation, T: Default> Uri<'a, NetVal, T> {
}
}

impl<'a, NetVal: NetworkValidation, T> Uri<'a, NetVal, T> {
impl<NetVal: NetworkValidation, T> Uri<'_, NetVal, T> {
/// Creates an URI with defaults.
///
/// This sets all fields except `address` and `extras` to default values.
Expand Down Expand Up @@ -194,7 +194,7 @@ impl<'a> From<&'a str> for Param<'a> {
}

/// Cheap conversion
impl<'a> From<String> for Param<'a> {
impl From<String> for Param<'_> {
fn from(value: String) -> Self {
Param(ParamInner::UnencodedString(Cow::Owned(value)))
}
Expand All @@ -212,7 +212,7 @@ impl<'a> From<&'a [u8]> for Param<'a> {
/// Cheap conversion
#[cfg(feature = "non-compliant-bytes")]
#[cfg_attr(docsrs, doc(cfg(feature = "non-compliant-bytes")))]
impl<'a> From<Vec<u8>> for Param<'a> {
impl From<Vec<u8>> for Param<'_> {
fn from(value: Vec<u8>) -> Self {
Param(ParamInner::UnencodedBytes(Cow::Owned(value)))
}
Expand Down Expand Up @@ -284,13 +284,15 @@ enum ParamInner<'a> {
/// The lifetime of this may be shorter than that of [`Param<'a>`].
#[cfg(feature = "non-compliant-bytes")]
#[cfg_attr(docsrs, doc(cfg(feature = "non-compliant-bytes")))]
#[cfg_attr(feature = "non-compliant-bytes", allow(dead_code))]
pub struct ParamBytes<'a>(ParamIterInner<'a, core::iter::Cloned<core::slice::Iter<'a, u8>>>);

/// Iterator over decoded bytes inside paramter.
///
/// The lifetime of this is same as that of [`Param<'a>`].
#[cfg(feature = "non-compliant-bytes")]
#[cfg_attr(docsrs, doc(cfg(feature = "non-compliant-bytes")))]
#[cfg_attr(feature = "non-compliant-bytes", allow(dead_code))]
pub struct ParamBytesOwned<'a>(ParamIterInner<'a, Either<core::iter::Cloned<core::slice::Iter<'a, u8>>, alloc::vec::IntoIter<u8>>>);

#[cfg(feature = "non-compliant-bytes")]
Expand All @@ -315,7 +317,7 @@ impl DeserializationError for NoExtras {
type Error = core::convert::Infallible;
}

impl<'de> DeserializationState<'de> for EmptyState {
impl DeserializationState<'_> for EmptyState {
type Value = NoExtras;

fn is_param_known(&self, _key: &str) -> bool {
Expand All @@ -331,7 +333,7 @@ impl<'de> DeserializationState<'de> for EmptyState {
}
}

impl<'a> SerializeParams for &'a NoExtras {
impl SerializeParams for &NoExtras {
type Key = core::convert::Infallible;
type Value = core::convert::Infallible;
type Iterator = core::iter::Empty<(Self::Key, Self::Value)>;
Expand Down
6 changes: 3 additions & 3 deletions src/ser.rs
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ pub trait SerializeParams {
/// Checks if the display implementation outputs `=` character.
struct EqSignChecker<'a, W: fmt::Write>(W, &'a dyn fmt::Display);

impl<'a, W: fmt::Write> fmt::Write for EqSignChecker<'a, W> {
impl<W: fmt::Write> fmt::Write for EqSignChecker<'_, W> {
fn write_str(&mut self, s: &str) -> fmt::Result {
if s.contains('=') {
panic!("key '{}' contains equal sign", self.1);
Expand Down Expand Up @@ -128,7 +128,7 @@ impl<T: fmt::Display> fmt::Display for DisplayEncoder<T> {
/// This is private because people should generally only display values as decoded
struct DisplayParam<'a>(&'a Param<'a>);

impl<'a> fmt::Display for DisplayParam<'a> {
impl fmt::Display for DisplayParam<'_> {
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
match &(self.0).0 {
// TODO: improve percent_encoding_rfc_3986 so that allocation can be avoided
Expand Down Expand Up @@ -175,7 +175,7 @@ fn maybe_display_param(writer: &mut impl fmt::Write, key: impl fmt::Display, val

/// Formats QR-code-optimized URI if alternate form (`{:#}`) is used.
#[rustfmt::skip]
impl<'a, T> fmt::Display for Uri<'a, bitcoin::address::NetworkChecked, T> where for<'b> &'b T: SerializeParams {
impl<T> fmt::Display for Uri<'_, bitcoin::address::NetworkChecked, T> where for<'a> &'a T: SerializeParams {
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
if f.alternate() {
write!(f, "bitcoin:{:#}", self.address)?;
Expand Down
Loading