clippy (#17)

garro95 · Sep 6, 2023 · b03f2c9 · b03f2c9
1 parent 46036ce
commit b03f2c9
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 15 deletions.
diff --git a/examples/finite_resource.rs b/examples/finite_resource.rs
@@ -52,7 +52,7 @@ impl State {
 }
 
 struct FiniteQueue {
-    quantity: usize,
+    _quantity: usize,
     available: usize,
     queue: [Option<Event<State>>; Q_SIZE],
     queue_start: usize,
@@ -76,17 +76,15 @@ impl Resource<State> for FiniteQueue {
         if self.available > 0 {
             self.available -= 1;
             Some(event)
+        } else if self.queue_len == Q_SIZE {
+            let mut event = event;
+            event.state_mut().queue_full = true;
+            Some(event)
         } else {
-            if self.queue_len == Q_SIZE {
-                let mut event = event;
-                event.state_mut().queue_full = true;
-                Some(event)
-            } else {
-                let first_position = (self.queue_start + self.queue_len) % Q_SIZE;
-                self.queue[first_position] = Some(event);
-                self.queue_len += 1;
-                None
-            }
+            let first_position = (self.queue_start + self.queue_len) % Q_SIZE;
+            self.queue[first_position] = Some(event);
+            self.queue_len += 1;
+            None
         }
     }
     fn release_and_schedule_next(&mut self, event: Event<State>) -> Option<Event<State>> {
@@ -121,7 +119,7 @@ fn main() {
     let rng = Rng::from_entropy();
 
     let res = FiniteQueue {
-        quantity: 4,
+        _quantity: 4,
         available: 4,
         queue: [None; Q_SIZE],
         queue_start: 0,

diff --git a/examples/monitoring-state.rs b/examples/monitoring-state.rs
@@ -99,7 +99,7 @@ impl PCBStateCtx {
     #[inline]
     fn res(&mut self, r_id: ResourceId, should_log: bool, stage: PCBStage, need: bool) -> PCBState {
         let mut r_state = self.state.clone();
-        r_state.stage = stage.clone();
+        r_state.stage = stage;
         r_state.log = should_log;
         if need {
             r_state.effect = Effect::Request(r_id);
@@ -134,14 +134,14 @@ impl PCBStateCtx {
         let st = match self.state.stage {
             PCBStage::Init => (15 + self.rng.next_u32() % 20) as f64,
             PCBStage::SurfaceMountPlaced => (30 + self.rng.next_u32() % 20) as f64,
-            _ => 0.0 as f64,
+            _ => 0.0_f64,
         };
         self.work(true, st, PCBStage::InWork)
     }
     fn et_work(&mut self) -> PCBState {
         let st = match self.state.stage {
             PCBStage::ThruHolePlaced => (5 + self.rng.next_u32() % 5) as f64,
-            _ => 0.0 as f64,
+            _ => 0.0_f64,
         };
         self.work(true, st, PCBStage::InWork)
     }