f rebase error

TheBlueMatt · TheBlueMatt · commit 019f4895290c · 2023-03-30T22:31:26.000Z
diff --git a/lightning-invoice/src/lib.rs b/lightning-invoice/src/lib.rs
@@ -621,7 +621,7 @@ impl<H: tb::Bool, T: tb::Bool, C: tb::Bool, S: tb::Bool, M: tb::Bool> InvoiceBui
 	}
 
 	/// Set the description or description hash. This function is only available if no description (hash) was set.
-	pub fn invoice_description(self, description: InvoiceDescription) -> InvoiceBuilder<tb::True, H, T, C, S> {
+	pub fn invoice_description(self, description: InvoiceDescription) -> InvoiceBuilder<tb::True, H, T, C, S, M> {
 		match description {
 			InvoiceDescription::Direct(desc) => {
 				self.description(desc.clone().into_inner())

Original file line number	Diff line number	Diff line change
`@@ -621,7 +621,7 @@ impl<H: tb::Bool, T: tb::Bool, C: tb::Bool, S: tb::Bool, M: tb::Bool> InvoiceBui`
`621`	`621`	`}`
`622`	`622`
`623`	`623`	`/// Set the description or description hash. This function is only available if no description (hash) was set.`
`624`		`- pub fn invoice_description(self, description: InvoiceDescription) -> InvoiceBuilder<tb::True, H, T, C, S> {`
	`624`	`+ pub fn invoice_description(self, description: InvoiceDescription) -> InvoiceBuilder<tb::True, H, T, C, S, M> {`
`625`	`625`	`match description {`
`626`	`626`	`InvoiceDescription::Direct(desc) => {`
`627`	`627`	`self.description(desc.clone().into_inner())`