MyFavMirrors/moonfire-nvr
1
0
Fork 0
mirror of https://github.com/scottlamb/moonfire-nvr.git synced 2025-04-21 19:24:06 -04:00
Code Issues Packages Projects Releases Wiki Activity

move strutil to base crate

Browse Source 
I plan to use strutil::hex in db/auth.rs.
This commit is contained in:
Scott Lamb 2018-03-30 08:53:59 -07:00
parent 0701121586
commit 97d831e054
5 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
base/lib.rs
View File

@ -35,3 +35,4 @@ extern crate parking_lot;
extern crate time; extern crate time;
pub mod clock; pub mod clock;
pub mod strutil;

0
src/strutil.rs → base/strutil.rs
View File

1
src/main.rs
View File

@ -72,7 +72,6 @@ mod mp4;
mod slices; mod slices;
mod stream; mod stream;
mod streamer; mod streamer;
mod strutil;
mod web; mod web;
/// Commandline usage string. This is in the particular format expected by the `docopt` crate. /// Commandline usage string. This is in the particular format expected by the `docopt` crate.

4
src/mp4.rs
View File

@ -78,6 +78,7 @@
extern crate time; extern crate time;
use base::strutil;
use byteorder::{BigEndian, ByteOrder, WriteBytesExt}; use byteorder::{BigEndian, ByteOrder, WriteBytesExt};
use db::recording::{self, TIME_UNITS_PER_SEC}; use db::recording::{self, TIME_UNITS_PER_SEC};
use db::{self, dir}; use db::{self, dir};
@ -98,7 +99,6 @@ use std::io;
use std::ops::Range; use std::ops::Range;
use std::mem; use std::mem;
use std::sync::Arc; use std::sync::Arc;
use strutil;
/// This value should be incremented any time a change is made to this file that causes different /// This value should be incremented any time a change is made to this file that causes different
/// bytes to be output for a particular set of `Mp4Builder` options. Incrementing this value will /// bytes to be output for a particular set of `Mp4Builder` options. Incrementing this value will
@ -1517,6 +1517,7 @@ impl http_serve::Entity for File {
/// to verify the output is byte-for-byte as expected. /// to verify the output is byte-for-byte as expected.
#[cfg(test)] #[cfg(test)]
mod tests { mod tests {
use base::strutil;
use byteorder::{BigEndian, ByteOrder}; use byteorder::{BigEndian, ByteOrder};
use clock::RealClocks; use clock::RealClocks;
use db::recording::{self, TIME_UNITS_PER_SEC}; use db::recording::{self, TIME_UNITS_PER_SEC};
@ -1531,7 +1532,6 @@ mod tests {
use std::ops::Range; use std::ops::Range;
use std::path::Path; use std::path::Path;
use std::str; use std::str;
use strutil;
use super::*; use super::*;
use stream::{self, Opener, Stream}; use stream::{self, Opener, Stream};

2
src/web.rs
View File

@ -30,6 +30,7 @@
extern crate hyper; extern crate hyper;
use base::strutil;
use core::borrow::Borrow; use core::borrow::Borrow;
use core::str::FromStr; use core::str::FromStr;
use db::{self, recording}; use db::{self, recording};
@ -54,7 +55,6 @@ use std::fs;
use std::ops::Range; use std::ops::Range;
use std::path::PathBuf; use std::path::PathBuf;
use std::sync::Arc; use std::sync::Arc;
use strutil;
use url::form_urlencoded; use url::form_urlencoded;
use uuid::Uuid; use uuid::Uuid;