Merge pull request #1733 from TheBlueMatt/2022-09-downgrade-hashbrown

Downgrade `hashbrown` to meet MSRV
lightningdevkit · Sep 22, 2022 · 5211bfd · 5211bfd
2 parents c614a27 + 2e7d924
commit 5211bfd
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/lightning-invoice/Cargo.toml b/lightning-invoice/Cargo.toml
@@ -24,7 +24,7 @@ lightning = { version = "0.0.111", path = "../lightning", default-features = fal
 secp256k1 = { version = "0.24.0", default-features = false, features = ["recovery", "alloc"] }
 num-traits = { version = "0.2.8", default-features = false }
 bitcoin_hashes = { version = "0.11", default-features = false }
-hashbrown = { version = "0.11", optional = true }
+hashbrown = { version = "0.8", optional = true }
 serde = { version = "1.0.118", optional = true }
 
 [dev-dependencies]

diff --git a/lightning-invoice/src/payment.rs b/lightning-invoice/src/payment.rs
@@ -149,6 +149,7 @@ use lightning::routing::router::{PaymentParameters, Route, RouteHop, RouteParame
 use lightning::util::errors::APIError;
 use lightning::util::events::{Event, EventHandler};
 use lightning::util::logger::Logger;
+use lightning::util::ser::Writeable;
 use time_utils::Time;
 use crate::sync::Mutex;
 
@@ -746,7 +747,7 @@ impl InFlightHtlcs {
 	}
 }
 
-impl lightning::util::ser::Writeable for InFlightHtlcs {
+impl Writeable for InFlightHtlcs {
 	fn write<W: lightning::util::ser::Writer>(&self, writer: &mut W) -> Result<(), io::Error> { self.0.write(writer) }
 }
 

diff --git a/lightning/Cargo.toml b/lightning/Cargo.toml
@@ -40,7 +40,7 @@ default = ["std", "grind_signatures"]
 [dependencies]
 bitcoin = { version = "0.29.0", default-features = false, features = ["secp-recovery"] }
 
-hashbrown = { version = "0.11", optional = true }
+hashbrown = { version = "0.8", optional = true }
 hex = { version = "0.4", optional = true }
 regex = { version = "1.5.6", optional = true }
 backtrace = { version = "0.3", optional = true }