Skip to content

Commit

Permalink
November 2023 - Rust Nightly Update (#413)
Browse files Browse the repository at this point in the history
* Update nightly

* Replace .get(0) with .first()

* allow new clippy lint

---------

Co-authored-by: GitHub Actions <>
Co-authored-by: Luke Parker <[email protected]>
  • Loading branch information
github-actions[bot] and kayabaNerve authored Nov 3, 2023
1 parent ae44953 commit a2089c6
Show file tree
Hide file tree
Showing 11 changed files with 15 additions and 13 deletions.
2 changes: 1 addition & 1 deletion .github/nightly-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
nightly-2023-10-01
nightly-2023-11-01
2 changes: 1 addition & 1 deletion coins/monero/src/block.rs
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ pub struct Block {

impl Block {
pub fn number(&self) -> usize {
match self.miner_tx.prefix.inputs.get(0) {
match self.miner_tx.prefix.inputs.first() {
Some(Input::Gen(number)) => (*number).try_into().unwrap(),
_ => panic!("invalid block, miner TX didn't have a Input::Gen"),
}
Expand Down
2 changes: 1 addition & 1 deletion coins/monero/src/ringct/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -360,7 +360,7 @@ impl RctSignatures {
self
.base
.encrypted_amounts
.get(0)
.first()
.expect("MLSAG with Bulletproofs didn't have any outputs"),
EncryptedAmount::Original { .. }
) {
Expand Down
6 changes: 3 additions & 3 deletions coins/monero/src/rpc/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -247,7 +247,7 @@ impl<R: RpcConnection> Rpc<R> {

// https://github.com/monero-project/monero/issues/8311
if res.as_hex.is_empty() {
match tx.prefix.inputs.get(0) {
match tx.prefix.inputs.first() {
Some(Input::Gen { .. }) => (),
_ => Err(RpcError::PrunedTransaction)?,
}
Expand Down Expand Up @@ -308,7 +308,7 @@ impl<R: RpcConnection> Rpc<R> {
match self.get_block(self.get_block_hash(number).await?).await {
Ok(block) => {
// Make sure this is actually the block for this number
match block.miner_tx.prefix.inputs.get(0) {
match block.miner_tx.prefix.inputs.first() {
Some(Input::Gen(actual)) => {
if usize::try_from(*actual).unwrap() == number {
Ok(block)
Expand Down Expand Up @@ -467,7 +467,7 @@ impl<R: RpcConnection> Rpc<R> {
}
b"status" => {
if bytes_res
.get(0)
.first()
.ok_or_else(|| io::Error::new(io::ErrorKind::Other, "status wasn't a string"))?
.as_slice() !=
b"OK"
Expand Down
5 changes: 3 additions & 2 deletions coins/monero/src/wallet/scan.rs
Original file line number Diff line number Diff line change
Expand Up @@ -493,8 +493,9 @@ impl Scanner {
.iter()
// Filter to v2 miner TX outputs/RCT outputs since we're tracking the RCT output index
.filter(|output| {
((tx.prefix.version == 2) && matches!(tx.prefix.inputs.get(0), Some(Input::Gen(..)))) ||
output.amount.is_none()
let is_v2_miner_tx =
(tx.prefix.version == 2) && matches!(tx.prefix.inputs.first(), Some(Input::Gen(..)));
is_v2_miner_tx || output.amount.is_none()
})
.count(),
)
Expand Down
2 changes: 1 addition & 1 deletion coordinator/src/tributary/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -392,7 +392,7 @@ impl ReadWrite for Transaction {
// is impossible since we'll only read up to u16::MAX items.
writer.write_all(&u16::try_from(shares.len()).unwrap().to_le_bytes())?;

let share_len = shares.get(0).map(|share| share.len()).unwrap_or(0);
let share_len = shares.first().map(|share| share.len()).unwrap_or(0);
// For BLS12-381 G2, this would be:
// - A 32-byte share
// - A 96-byte ephemeral key
Expand Down
2 changes: 1 addition & 1 deletion coordinator/tributary/src/merkle.rs
Original file line number Diff line number Diff line change
Expand Up @@ -33,5 +33,5 @@ pub(crate) fn merkle(hash_args: &[[u8; 32]]) -> [u8; 32] {
hashes = interim;
}

hashes.get(0).copied().map(Into::into).unwrap_or(zero)
hashes.first().copied().map(Into::into).unwrap_or(zero)
}
2 changes: 1 addition & 1 deletion crypto/multiexp/src/batch.rs
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ where
}

slice
.get(0)
.first()
.filter(|(_, value)| !bool::from(multiexp_vartime(value).is_identity()))
.map(|(id, _)| *id)
}
Expand Down
2 changes: 1 addition & 1 deletion processor/src/multisigs/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,7 @@ impl<D: Db, N: Network> MultisigManager<D, N> {
(
MultisigManager {
scanner,
existing: current_keys.get(0).cloned().map(|(activation_block, key)| MultisigViewer {
existing: current_keys.first().cloned().map(|(activation_block, key)| MultisigViewer {
activation_block,
key,
scheduler: schedulers.remove(0),
Expand Down
2 changes: 1 addition & 1 deletion processor/src/networks/monero.rs
Original file line number Diff line number Diff line change
Expand Up @@ -470,7 +470,7 @@ impl Network for Monero {
let mut outputs = Vec::with_capacity(txs.len());
for mut tx_outputs in txs.drain(..) {
for output in tx_outputs.drain(..) {
let mut data = output.arbitrary_data().get(0).cloned().unwrap_or(vec![]);
let mut data = output.arbitrary_data().first().cloned().unwrap_or(vec![]);

// The Output serialization code above uses u16 to represent length
data.truncate(u16::MAX.into());
Expand Down
1 change: 1 addition & 0 deletions tests/coordinator/src/tests/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ mod batch;
pub use batch::batch;

mod sign;
#[allow(unused_imports)]
pub use sign::sign;

pub(crate) const COORDINATORS: usize = 4;
Expand Down

0 comments on commit a2089c6

Please sign in to comment.