Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

upgrade rust toolchain 1.62.0 && cargo clippy --fix #3500

Merged
merged 2 commits into from
Jul 2, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion cmd/miner_client/src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ fn main() {
});
if let Err(err) = system.block_on(async move {
let registry = RegistryService::launch();
let _ = registry.put_shared(config).await?;
registry.put_shared(config).await?;
let stratum_cli_srv = registry
.register_by_factory::<StratumClientService, StratumClientServiceServiceFactory>()
.await?;
Expand Down
4 changes: 2 additions & 2 deletions commons/stream-task/src/event.rs
Original file line number Diff line number Diff line change
Expand Up @@ -227,14 +227,14 @@ impl TaskEventCounterHandle {
.iter()
.map(|counter| counter.get_report())
.collect::<Vec<_>>();
if let Some(counter) = self.current_counter.lock().as_ref().take() {
if let Some(counter) = self.current_counter.lock().as_ref() {
reports.push(counter.get_report());
}
reports
}

pub fn total_report(&self) -> Option<TaskProgressReport> {
if let Some(current_counter) = self.current_counter.lock().as_ref().take() {
if let Some(current_counter) = self.current_counter.lock().as_ref() {
let task_name = current_counter.task_name.clone();
let mut reports = self
.previous_counters
Expand Down
2 changes: 1 addition & 1 deletion miner/src/create_block_template/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -349,7 +349,7 @@ where
let excluded_txns = opened_block.push_txns(txns)?;
let template = opened_block.finalize()?;
for invalid_txn in excluded_txns.discarded_txns {
let _ = self.tx_provider.remove_invalid_txn(invalid_txn.id());
self.tx_provider.remove_invalid_txn(invalid_txn.id());
}

Ok(BlockTemplateResponse {
Expand Down
2 changes: 1 addition & 1 deletion rust-toolchain
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.61.0
1.62.0
2 changes: 1 addition & 1 deletion stratum/src/stratum.rs
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,7 @@ impl ServiceHandler<Self, SubmitShareEvent> for Stratum {
let mut seal: MinerSubmitSealRequest = msg.0.try_into()?;

seal.minting_blob = current_mint_event.minting_blob;
let _ = self.miner_service.try_send(seal)?;
self.miner_service.try_send(seal)?;
}
Ok(())
}
Expand Down