re-run clippy

This commit is contained in:
Robin Müller 2022-12-21 09:47:27 +01:00
parent e963ee7bc4
commit 8d85681ad4
No known key found for this signature in database
GPG Key ID: 71B58F8A3CDFA9AC
3 changed files with 12 additions and 5 deletions

View File

@ -28,7 +28,7 @@ use spacepackets::time::TimeWriter;
use spacepackets::tm::PusTm; use spacepackets::tm::PusTm;
use std::collections::HashMap; use std::collections::HashMap;
use std::net::{IpAddr, SocketAddr}; use std::net::{IpAddr, SocketAddr};
use std::sync::mpsc::channel; use std::sync::mpsc::{channel, TryRecvError};
use std::sync::{mpsc, Arc, RwLock}; use std::sync::{mpsc, Arc, RwLock};
use std::thread; use std::thread;
use std::time::Duration; use std::time::Duration;
@ -181,8 +181,15 @@ fn main() {
println!("Starting AOCS thread"); println!("Starting AOCS thread");
let jh3 = thread::spawn(move || loop { let jh3 = thread::spawn(move || loop {
match acs_thread_rx.try_recv() { match acs_thread_rx.try_recv() {
Ok(_) => {} Ok(request) => {
Err(_) => {} println!("ACS thread: Received request {:?}", request)
}
Err(e) => match e {
TryRecvError::Empty => {}
TryRecvError::Disconnected => {
println!("ACS thread: Message Queue TX disconnected!")
}
},
} }
thread::sleep(Duration::from_millis(500)); thread::sleep(Duration::from_millis(500));
}); });

View File

@ -164,7 +164,7 @@ impl PusReceiver {
let sender = self.request_map.get(&addressable_id.target_id).unwrap(); let sender = self.request_map.get(&addressable_id.target_id).unwrap();
sender sender
.send(Request::HkRequest(request)) .send(Request::HkRequest(request))
.expect(&format!("Sending HK request {:?} failed", request)) .unwrap_or_else(|_| panic!("Sending HK request {:?} failed", request));
}; };
if PusPacket::subservice(pus_tc) == hk::Subservice::TcEnableGeneration as u8 { if PusPacket::subservice(pus_tc) == hk::Subservice::TcEnableGeneration as u8 {
send_request(HkRequest::Enable(addressable_id.unique_id)); send_request(HkRequest::Enable(addressable_id.unique_id));

@ -1 +1 @@
Subproject commit db471e313c92c313d270d5a6f06c0414abb5fae3 Subproject commit 83e2cad75377969b1e74379acff2c0dcf858d4cf