From fe575e1b63895e7b8ffbc2586c641b339ae71749 Mon Sep 17 00:00:00 2001 From: Scott Lamb Date: Wed, 24 Jul 2019 21:52:55 -0700 Subject: [PATCH] stop using sync::ONCE_INIT This addressed a deprecation warning on nightly (will be in Rust 1.38). Use parking_lot instead, which in theory is faster (although I doubt it's significant here). --- db/testutil.rs | 4 ++-- src/stream.rs | 3 +-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/db/testutil.rs b/db/testutil.rs index bce0231..9f42cb7 100644 --- a/db/testutil.rs +++ b/db/testutil.rs @@ -35,14 +35,14 @@ use fnv::FnvHashMap; use mylog; use rusqlite; use std::env; -use std::sync::{self, Arc}; +use std::sync::Arc; use std::thread; use tempdir::TempDir; use time; use uuid::Uuid; use crate::writer; -static INIT: sync::Once = sync::ONCE_INIT; +static INIT: parking_lot::Once = parking_lot::Once::new(); /// id of the camera created by `TestDb::new` below. pub const TEST_CAMERA_ID: i32 = 1; diff --git a/src/stream.rs b/src/stream.rs index e8a3440..a617bc0 100644 --- a/src/stream.rs +++ b/src/stream.rs @@ -36,9 +36,8 @@ use lazy_static::lazy_static; use log::{debug, info, warn}; use std::ffi::CString; use std::result::Result; -use std::sync; -static START: sync::Once = sync::ONCE_INIT; +static START: parking_lot::Once = parking_lot::Once::new(); lazy_static! { pub static ref FFMPEG: Ffmpeg = Ffmpeg::new();