Merge rust-bitcoin/rust-bitcoin#938: Allow deprecated function call

ChallengeDev210 · ChallengeDev210 · commit f409fe44fccf · 2022-04-11T09:20:24.000-07:00
29843c4 Allow deprecated function call (Tobin Harding) Pull request description: We have a deprecated function call because of the MSRV, tell clippy to ignore it. ACKs for top commit: Kixunil: ACK 29843c4 conditioned on adding this to MSRV bump TODO list. sanket1729: ACK 29843c4. Tree-SHA512: 3e2bf95d05c3baff4f01c447717dde4e78d686cbc6f720591f6656ce1e5d8cf3a276a0c3dc0016dea357b61350091778d4500a59427ea9863eb5bb9344b822e4
diff --git a/src/util/psbt/map/input.rs b/src/util/psbt/map/input.rs
@@ -166,6 +166,7 @@ impl fmt::Display for PsbtSighashType {
     }
 }
 
+#[allow(deprecated)]  // TODO: Swap `trim_left_matches` for `trim_start_matches` once MSRV >= 1.30.
 impl FromStr for PsbtSighashType {
     type Err = SighashTypeParseError;
 
@@ -183,7 +184,6 @@ impl FromStr for PsbtSighashType {
         }
 
         // We accept non-standard sighash values.
-        // TODO: Swap `trim_left_matches` for `trim_start_matches` once MSRV >= 1.30.
         if let Ok(inner) = u32::from_str_radix(s.trim_left_matches("0x"), 16) {
             return Ok(PsbtSighashType { inner });
         }

Original file line number	Diff line number	Diff line change
`@@ -166,6 +166,7 @@ impl fmt::Display for PsbtSighashType {`
`166`	`166`	`}`
`167`	`167`	`}`
`168`	`168`
	`169`	+#[allow(deprecated)] // TODO: Swap `trim_left_matches` for `trim_start_matches` once MSRV >= 1.30.
`169`	`170`	`impl FromStr for PsbtSighashType {`
`170`	`171`	`type Err = SighashTypeParseError;`
`171`	`172`
`@@ -183,7 +184,6 @@ impl FromStr for PsbtSighashType {`
`183`	`184`	`}`
`184`	`185`
`185`	`186`	`// We accept non-standard sighash values.`
`186`		- // TODO: Swap `trim_left_matches` for `trim_start_matches` once MSRV >= 1.30.
`187`	`187`	`if let Ok(inner) = u32::from_str_radix(s.trim_left_matches("0x"), 16) {`
`188`	`188`	`return Ok(PsbtSighashType { inner });`
`189`	`189`	`}`