Skip to content

Commit

Permalink
Merge rust-bitcoin#2667: Remove deprecated legacy numeric methods
Browse files Browse the repository at this point in the history
051c358 Remove deprecated legacy numeric methods (Divyansh Gupta)

Pull request description:

  As `rustc 1.79.0-nightly (9d79cd5f7 2024-04-05)` is released which solves the issue mentioned , but the release has deperacted legacy numeric methods.
  Thus replaced `u16::max_value()` etc with `u32::MAX` & `core::u16` to directly `u16`.

  fix rust-bitcoin#2639

ACKs for top commit:
  tcharding:
    ACK 051c358
  apoelstra:
    ACK 051c358 thanks! I will remove an equivalent commit from my rust-bitcoin#2669

Tree-SHA512: c08c856f7f3b281417c29283351eac5e0f75cc1c8d23d9aae58d969219a327b2337fe57932053e53773ebb9dbec04254f90149266b6639a66c5c09f2ad1675ef
  • Loading branch information
apoelstra committed Apr 7, 2024
2 parents bae2c75 + 051c358 commit 5c56b69
Show file tree
Hide file tree
Showing 5 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion bitcoin/src/bip152.rs
Original file line number Diff line number Diff line change
Expand Up @@ -492,7 +492,7 @@ mod test {
fn test_getblocktx_panic_when_encoding_u64_max() {
serialize(&BlockTransactionsRequest {
block_hash: Hash::all_zeros(),
indexes: vec![core::u64::MAX],
indexes: vec![u64::MAX],
});
}
}
2 changes: 1 addition & 1 deletion bitcoin/src/consensus/encode.rs
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
//! typically big-endian decimals, etc.)
//!
use core::{fmt, mem, u32};
use core::{fmt, mem};

use hashes::{sha256, sha256d, Hash};
use hex::error::{InvalidCharError, OddLengthStringError};
Expand Down
2 changes: 1 addition & 1 deletion io/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -212,7 +212,7 @@ impl<T: AsRef<[u8]>> Read for Cursor<T> {
let read = core::cmp::min(inner.len().saturating_sub(start_pos), buf.len());
buf[..read].copy_from_slice(&inner[start_pos..start_pos + read]);
self.pos =
self.pos.saturating_add(read.try_into().unwrap_or(u64::max_value() /* unreachable */));
self.pos.saturating_add(read.try_into().unwrap_or(u64::MAX /* unreachable */));
Ok(read)
}
}
Expand Down
2 changes: 1 addition & 1 deletion units/src/locktime/absolute.rs
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@ impl Time {
pub const MIN: Self = Time(LOCK_TIME_THRESHOLD);

/// The maximum absolute block time (Sun Feb 07 2106 06:28:15 GMT+0000).
pub const MAX: Self = Time(u32::max_value());
pub const MAX: Self = Time(u32::MAX);

/// Creates a `Time` from a hex string.
///
Expand Down
4 changes: 2 additions & 2 deletions units/src/locktime/relative.rs
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ impl Height {
pub const MIN: Self = Self::ZERO;

/// The maximum relative block height.
pub const MAX: Self = Height(u16::max_value());
pub const MAX: Self = Height(u16::MAX);

/// Create a [`Height`] using a count of blocks.
#[inline]
Expand Down Expand Up @@ -62,7 +62,7 @@ impl Time {
pub const MIN: Self = Time::ZERO;

/// The maximum relative block time (33,554,432 seconds or approx 388 days).
pub const MAX: Self = Time(u16::max_value());
pub const MAX: Self = Time(u16::MAX);

/// Create a [`Time`] using time intervals where each interval is equivalent to 512 seconds.
///
Expand Down

0 comments on commit 5c56b69

Please sign in to comment.