Merge rust-bitcoin/rust-bitcoin#2109: ci: bump rustc to 1.60 for fuzz test

6b5d06f23e ci: fix the byteorder to 1.4.3 for edition 2018 (Vincenzo Palazzo)
98513ef151 clippy: more worning fixes (Vincenzo Palazzo)
05d3dc5d72 Remove redundant guard (Tobin C. Harding)
4537634e7e ci: bump rustc to 1.60 for fuzz test (Vincenzo Palazzo)

Pull request description:

  Ci looks like broken, so this should fix
  it

ACKs for top commit:
  apoelstra:
    ACK 6b5d06f23e

Tree-SHA512: bfa0eaf8cbc02a671237d99221db8c21264ce9df91301818c95c41dcc5ad4935e91254b0b3fa8f36738a9d71b6541fb8784ac8280d67057960a3d20e385a9f17

.github/workflows/fuzz.yml

@@ -49,7 +49,7 @@ hashes_sha1,
           key: cache-${{ matrix.target }}-${{ hashFiles('**/Cargo.toml','**/Cargo.lock') }}
       - uses: actions-rs/toolchain@v1
         with:
-          toolchain: 1.58
+          toolchain: 1.65.0
           override: true
           profile: minimal
       - name: fuzz

bitcoin/examples/taproot-psbt.rs

@@ -450,10 +450,7 @@ impl BenefactorWallet {
         );
 
         let input = Input {
-            witness_utxo: {
-                let script_pubkey = script_pubkey;
-                Some(TxOut { value, script_pubkey })
-            },
+            witness_utxo: { Some(TxOut { value, script_pubkey }) },
             tap_key_origins: origins,
             tap_merkle_root: taproot_spend_info.merkle_root(),
             sighash_type: Some(ty),

bitcoin/src/amount.rs

@@ -244,7 +244,7 @@ fn parse_signed_to_satoshi(
             let last_n = unsigned_abs(precision_diff).into();
             if is_too_precise(s, last_n) {
                 match s.parse::<i64>() {
-                    Ok(v) if v == 0_i64 => return Ok((is_negative, 0)),
+                    Ok(0) => return Ok((is_negative, 0)),
                     _ => return Err(ParseAmountError::TooPrecise),
                 }
             }

bitcoin/src/psbt/mod.rs

@@ -1092,7 +1092,6 @@ mod tests {
             Err(FeeRate::from_sat_per_kwu(15060240960843))
         );
         assert!(psbt
-            .clone()
             .extract_tx_with_fee_rate_limit(FeeRate::from_sat_per_kwu(15060240960843))
             .is_ok());
 

bitcoin/src/psbt/raw.rs

@@ -87,7 +87,8 @@ impl Key {
             return Err(encode::Error::OversizedVectorAllocation {
                 requested: key_byte_size as usize,
                 max: MAX_VEC_SIZE,
-            })?;
+            }
+            .into());
         }
 
         let type_value: u8 = Decodable::consensus_decode(r)?;

bitcoin/src/psbt/serialize.rs

@@ -210,7 +210,7 @@ impl Deserialize for KeySource {
         while !d.is_empty() {
             match u32::consensus_decode(&mut d) {
                 Ok(index) => dpath.push(index.into()),
-                Err(e) => return Err(e)?,
+                Err(e) => return Err(e.into()),
             }
         }
 

contrib/test.sh

@@ -19,6 +19,8 @@ if cargo --version | grep ${MSRV}; then
     cargo update -p schemars_derive --precise 0.8.12
     # memcrh 2.6.0 uses edition 2021
     cargo update -p memchr --precise 2.5.0
+    # byteorder 1.5.0 uses edition 2021
+    cargo update -p byteorder --precise 1.4.3
 
     cargo update -p bitcoin:0.30.1 --precise 0.30.0