From: Matt Corallo <git@bluematt.me>
Date: Fri, 17 Dec 2021 22:38:46 +0000 (+0000)
Subject: Swap around generic argument ordering in DefaultRouter for bindings
X-Git-Tag: v0.0.104^2
X-Git-Url: http://git.bitcoin.ninja/?a=commitdiff_plain;h=27d5c7a2106f163f1c0df462db4ca6247f891af2;p=rust-lightning

Swap around generic argument ordering in DefaultRouter for bindings

The bindings generation really should support default generic types
in where clauses, but currently does not. To avoid needing to add
support during the current release process, we simply swap around
the arguments to move them to the first <> instead of the where.
---

diff --git a/lightning-invoice/src/utils.rs b/lightning-invoice/src/utils.rs
index 5918753ae..53fdc13f2 100644
--- a/lightning-invoice/src/utils.rs
+++ b/lightning-invoice/src/utils.rs
@@ -97,20 +97,20 @@ where
 }
 
 /// A [`Router`] implemented using [`find_route`].
-pub struct DefaultRouter<G, L: Deref> where G: Deref<Target = NetworkGraph>, L::Target: Logger {
+pub struct DefaultRouter<G: Deref<Target = NetworkGraph>, L: Deref> where L::Target: Logger {
 	network_graph: G,
 	logger: L,
 }
 
-impl<G, L: Deref> DefaultRouter<G, L> where G: Deref<Target = NetworkGraph>, L::Target: Logger {
+impl<G: Deref<Target = NetworkGraph>, L: Deref> DefaultRouter<G, L> where L::Target: Logger {
 	/// Creates a new router using the given [`NetworkGraph`] and  [`Logger`].
 	pub fn new(network_graph: G, logger: L) -> Self {
 		Self { network_graph, logger }
 	}
 }
 
-impl<G, L: Deref, S: Score> Router<S> for DefaultRouter<G, L>
-where G: Deref<Target = NetworkGraph>, L::Target: Logger {
+impl<G: Deref<Target = NetworkGraph>, L: Deref, S: Score> Router<S> for DefaultRouter<G, L>
+where L::Target: Logger {
 	fn find_route(
 		&self, payer: &PublicKey, params: &RouteParameters, _payment_hash: &PaymentHash,
 		first_hops: Option<&[&ChannelDetails]>, scorer: &S