Skip to content

Commit 4c5a015

Browse files
committed
Downgrade hashbrown to meet MSRV
`hashbrown` depends on `ahash` which depends on `once_cell`. Sadly, in matklad/once_cell#201 the `once_cell` maintainer decided they didn't want to do the work of having an MSRV policy for `once_cell`, making `ahash`, and thus `hashbrown` require the latest compiler. I've reached out to `ahash` to suggest they drop the dependency (as they could trivially work around not having it), but until then we simply downgrade `hashbrown`. `rust-bitcoin` also requires an older `hashbrown` so we're actually reducing our total `no-std` code here anyway.
1 parent 8edc132 commit 4c5a015

File tree

3 files changed

+4
-3
lines changed

3 files changed

+4
-3
lines changed

lightning-invoice/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ lightning = { version = "0.0.111", path = "../lightning", default-features = fal
2424
secp256k1 = { version = "0.24.0", default-features = false, features = ["recovery", "alloc"] }
2525
num-traits = { version = "0.2.8", default-features = false }
2626
bitcoin_hashes = { version = "0.11", default-features = false }
27-
hashbrown = { version = "0.11", optional = true }
27+
hashbrown = { version = "0.8", optional = true }
2828
serde = { version = "1.0.118", optional = true }
2929

3030
[dev-dependencies]

lightning-invoice/src/payment.rs

+2-1
Original file line numberDiff line numberDiff line change
@@ -149,6 +149,7 @@ use lightning::routing::router::{PaymentParameters, Route, RouteHop, RouteParame
149149
use lightning::util::errors::APIError;
150150
use lightning::util::events::{Event, EventHandler};
151151
use lightning::util::logger::Logger;
152+
use lightning::util::ser::Writeable;
152153
use time_utils::Time;
153154
use crate::sync::Mutex;
154155

@@ -746,7 +747,7 @@ impl InFlightHtlcs {
746747
}
747748
}
748749

749-
impl lightning::util::ser::Writeable for InFlightHtlcs {
750+
impl Writeable for InFlightHtlcs {
750751
fn write<W: lightning::util::ser::Writer>(&self, writer: &mut W) -> Result<(), io::Error> { self.0.write(writer) }
751752
}
752753

lightning/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ default = ["std", "grind_signatures"]
4040
[dependencies]
4141
bitcoin = { version = "0.29.0", default-features = false, features = ["secp-recovery"] }
4242

43-
hashbrown = { version = "0.11", optional = true }
43+
hashbrown = { version = "0.8", optional = true }
4444
hex = { version = "0.4", optional = true }
4545
regex = { version = "1.5.6", optional = true }
4646
backtrace = { version = "0.3", optional = true }

0 commit comments

Comments
 (0)