mirror of
https://github.com/scottlamb/moonfire-nvr.git
synced 2025-11-28 13:09:10 -05:00
automated clippy fixes
This commit is contained in:
@@ -2444,7 +2444,7 @@ pub struct DatabaseGuard<'db, C: Clocks> {
|
||||
_timer: clock::TimerGuard<'db, C, &'static str, fn() -> &'static str>,
|
||||
}
|
||||
|
||||
impl<'db, C: Clocks + Clone> DatabaseGuard<'db, C> {
|
||||
impl<C: Clocks + Clone> DatabaseGuard<'_, C> {
|
||||
/// Tries to flush unwritten changes from the stream directories.
|
||||
///
|
||||
/// * commits any recordings added with `add_recording` that have since been marked as
|
||||
@@ -2459,14 +2459,14 @@ impl<'db, C: Clocks + Clone> DatabaseGuard<'db, C> {
|
||||
}
|
||||
}
|
||||
|
||||
impl<'db, C: Clocks + Clone> ::std::ops::Deref for DatabaseGuard<'db, C> {
|
||||
impl<C: Clocks + Clone> ::std::ops::Deref for DatabaseGuard<'_, C> {
|
||||
type Target = LockedDatabase;
|
||||
fn deref(&self) -> &LockedDatabase {
|
||||
&self.db
|
||||
}
|
||||
}
|
||||
|
||||
impl<'db, C: Clocks + Clone> ::std::ops::DerefMut for DatabaseGuard<'db, C> {
|
||||
impl<C: Clocks + Clone> ::std::ops::DerefMut for DatabaseGuard<'_, C> {
|
||||
fn deref_mut(&mut self) -> &mut LockedDatabase {
|
||||
&mut self.db
|
||||
}
|
||||
|
||||
@@ -395,10 +395,7 @@ impl Segment {
|
||||
if let Err(e) = f(&it) {
|
||||
return Err(e);
|
||||
}
|
||||
have_frame = match it.next(data) {
|
||||
Err(e) => return Err(e),
|
||||
Ok(hf) => hf,
|
||||
};
|
||||
have_frame = it.next(data)?;
|
||||
}
|
||||
if key_frame < self.key_frames {
|
||||
bail!(
|
||||
|
||||
@@ -985,7 +985,7 @@ impl<F: FileWriter> InnerWriter<F> {
|
||||
}
|
||||
}
|
||||
|
||||
impl<'a, C: Clocks + Clone, D: DirWriter> Drop for Writer<'a, C, D> {
|
||||
impl<C: Clocks + Clone, D: DirWriter> Drop for Writer<'_, C, D> {
|
||||
fn drop(&mut self) {
|
||||
if ::std::thread::panicking() {
|
||||
// This will probably panic again. Don't do it.
|
||||
|
||||
Reference in New Issue
Block a user