cleanup some awkward Option call chains

This commit is contained in:
Scott Lamb
2021-05-06 09:47:07 -07:00
parent 33e8359b01
commit 80ec7ab1d0
3 changed files with 5 additions and 5 deletions

View File

@@ -76,7 +76,7 @@ pub fn run(args: &Args) -> Result<i32, Error> {
let (sid, _) = l.make_session(
creation,
uid,
args.domain.as_ref().map(|d| d.as_bytes().to_owned()),
args.domain.clone().map(String::into_bytes),
flags,
permissions,
)?;

View File

@@ -260,7 +260,7 @@ pub async fn run(args: &Args) -> Result<i32, Error> {
let rotate_offset_sec = streamer::ROTATE_INTERVAL_SEC * i as i64 / streams as i64;
let syncer = syncers.get(&sample_file_dir_id).unwrap();
let object_detector = match stream.type_ {
db::StreamType::SUB => object_detector.as_ref().map(|a| Arc::clone(a)),
db::StreamType::SUB => object_detector.clone(),
_ => None,
};
let mut streamer = streamer::Streamer::new(