Inline fn reseed_and_generate

Author: dhardy

src/rngs/thread.rs

@@ -48,34 +48,28 @@ struct ReseedingCore {
 impl Generator for ReseedingCore {
     type Output = Results;
 
+    #[inline(always)]
     fn generate(&mut self, results: &mut Results) {
         if self.inner.get_block_pos() >= RESEED_BLOCK_THRESHOLD {
-            // We get better performance by not calling only `reseed` here
-            // and continuing with the rest of the function, but by directly
-            // returning from a non-inlined function.
-            return self.reseed_and_generate(results);
+            trace!("Reseeding RNG (periodic reseed)");
+
+            if let Err(e) = self.reseed() {
+                warn!("Reseeding RNG failed: {}", e);
+                let _ = e;
+            }
+
+            self.inner.generate(results);
         }
         self.inner.generate(results);
     }
 }
 
 impl ReseedingCore {
     /// Reseed the internal PRNG.
+    #[cold]
     fn reseed(&mut self) -> Result<(), SysError> {
         Core::try_from_rng(&mut SysRng).map(|result| self.inner = result)
     }
-
-    #[inline(never)]
-    fn reseed_and_generate(&mut self, results: &mut Results) {
-        trace!("Reseeding RNG (periodic reseed)");
-
-        if let Err(e) = self.reseed() {
-            warn!("Reseeding RNG failed: {}", e);
-            let _ = e;
-        }
-
-        self.inner.generate(results);
-    }
 }
 
 /// A reference to the thread-local generator