Skip to content

Commit

Permalink
Bump Rust to 1.79 (from 1.77)
Browse files Browse the repository at this point in the history
  • Loading branch information
Marcin-Radecki committed Nov 29, 2024
1 parent 50a04d3 commit 739b1ea
Show file tree
Hide file tree
Showing 4 changed files with 3 additions and 5 deletions.
2 changes: 1 addition & 1 deletion consensus/src/extension/election.rs
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ impl<U: UnitWithParents> CandidateElection<U> {

fn vote(&mut self, voter: &U) -> Result<(), CandidateOutcome<U::Hasher>> {
// If the vote is already computed we are done.
if self.votes.get(&voter.hash()).is_some() {
if self.votes.contains_key(&voter.hash()) {
return Ok(());
}
// Votes for old units are never used, so we just return.
Expand Down
1 change: 0 additions & 1 deletion consensus/src/testing/mod.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
#![cfg(test)]
mod alerts;
mod byzantine;
mod crash;
Expand Down
3 changes: 1 addition & 2 deletions examples/ordering/src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,7 @@ use dataio::{Data, DataProvider, FinalizationHandler};
use futures::{channel::oneshot, io, StreamExt};
use log::{debug, error, info};
use network::Network;
use std::sync::Arc;
use std::{path::Path, time::Duration};
use std::{path::Path, sync::Arc, time::Duration};
use time::{macros::format_description, OffsetDateTime};
use tokio::fs::{self, File};
use tokio_util::compat::{Compat, TokioAsyncWriteCompatExt};
Expand Down
2 changes: 1 addition & 1 deletion rust-toolchain.toml
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
[toolchain]
channel = "1.77.0"
channel = "1.79.0"

0 comments on commit 739b1ea

Please sign in to comment.