lose "extern crate" everywhere (Rust 2018 edition)

db/Cargo.toml

@@ -12,6 +12,7 @@ nightly = []
 path = "lib.rs"
 
 [dependencies]
+base = { package = "moonfire-base", path = "../base" }
 base64 = "0.10.0"
 blake2-rfc = "0.2.18"
 failure = "0.1.1"
@@ -21,7 +22,6 @@ libc = "0.2"
 libpasta = "0.1.0-rc2"
 log = "0.4"
 lru-cache = "0.1"
-moonfire-base = { path = "../base" }
 mylog = { git = "https://github.com/scottlamb/mylog" }
 openssl = "0.10"
 parking_lot = { version = "0.7", features = [] }

db/auth.rs

@@ -28,13 +28,15 @@
 // You should have received a copy of the GNU General Public License
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-use crate::base::strutil;
+use log::info;
+use base::strutil;
 use blake2_rfc::blake2b::blake2b;
-use failure::Error;
+use failure::{Error, bail, format_err};
 use fnv::FnvHashMap;
+use lazy_static::lazy_static;
 use libpasta;
 use parking_lot::Mutex;
-use rusqlite::{self, Connection, Transaction, types::ToSql};
+use rusqlite::{Connection, Transaction, types::ToSql};
 use std::collections::BTreeMap;
 use std::fmt;
 use std::net::IpAddr;

db/check.rs

@@ -32,11 +32,12 @@
 
 use crate::db::{self, CompositeId, FromSqlUuid};
 use crate::dir;
-use failure::Error;
-use fnv::FnvHashMap;
 use crate::raw;
 use crate::recording;
-use rusqlite::{self, types::ToSql};
+use failure::Error;
+use fnv::FnvHashMap;
+use log::error;
+use rusqlite::types::ToSql;
 use crate::schema;
 use std::os::unix::ffi::OsStrExt;
 use std::fs;

db/db.rs

@@ -52,18 +52,19 @@
 //!     A list of mutations is built up in-memory and occasionally flushed to reduce SSD write
 //!     cycles.
 
+use base::clock::{self, Clocks};
 use crate::auth;
-use crate::base::clock::{self, Clocks};
 use crate::dir;
-use failure::Error;
-use fnv::{self, FnvHashMap, FnvHashSet};
+use crate::raw;
+use crate::recording::{self, TIME_UNITS_PER_SEC};
+use crate::schema;
+use failure::{Error, bail, format_err};
+use fnv::{FnvHashMap, FnvHashSet};
+use log::{error, info, trace};
 use lru_cache::LruCache;
 use openssl::hash;
 use parking_lot::{Mutex,MutexGuard};
-use crate::raw;
-use crate::recording::{self, TIME_UNITS_PER_SEC};
-use rusqlite::{self, types::ToSql};
-use crate::schema;
+use rusqlite::types::ToSql;
 use std::collections::{BTreeMap, VecDeque};
 use std::cell::RefCell;
 use std::cmp;
@@ -1922,9 +1923,7 @@ impl<'db, C: Clocks + Clone> ::std::ops::DerefMut for DatabaseGuard<'db, C> {
 
 #[cfg(test)]
 mod tests {
-    extern crate tempdir;
-
-    use crate::base::clock;
+    use base::clock;
     use crate::recording::{self, TIME_UNITS_PER_SEC};
     use rusqlite::Connection;
     use std::collections::BTreeMap;

db/dir.rs

@@ -33,9 +33,10 @@
 //! This includes opening files for serving, rotating away old files, and saving new files.
 
 use crate::db::CompositeId;
-use failure::{Error, Fail};
-use libc::{self, c_char};
-use protobuf::{self, Message};
+use failure::{Error, Fail, bail, format_err};
+use libc::c_char;
+use log::warn;
+use protobuf::Message;
 use crate::schema;
 use std::ffi;
 use std::fs;

db/lib.rs

@@ -30,26 +30,6 @@
 
 #![cfg_attr(all(feature="nightly", test), feature(test))]
 
-extern crate base64;
-extern crate blake2_rfc;
-#[macro_use] extern crate failure;
-extern crate fnv;
-#[macro_use] extern crate lazy_static;
-extern crate libc;
-extern crate libpasta;
-#[macro_use] extern crate log;
-extern crate lru_cache;
-extern crate moonfire_base as base;
-extern crate mylog;
-extern crate openssl;
-extern crate parking_lot;
-extern crate protobuf;
-extern crate regex;
-extern crate rusqlite;
-extern crate tempdir;
-extern crate time;
-extern crate uuid;
-
 pub mod auth;
 pub mod check;
 mod coding;

db/raw.rs

@@ -31,10 +31,10 @@
 //! Raw database access: SQLite statements which do not touch any cached state.
 
 use crate::db::{self, CompositeId, FromSqlUuid};
-use failure::{Error, ResultExt};
+use failure::{Error, ResultExt, bail};
 use fnv::FnvHashSet;
 use crate::recording;
-use rusqlite::{self, types::ToSql};
+use rusqlite::types::ToSql;
 use std::ops::Range;
 use uuid::Uuid;
 

db/recording.rs

@@ -30,7 +30,9 @@
 
 use crate::coding::{append_varint32, decode_varint32, unzigzag32, zigzag32};
 use crate::db;
-use failure::Error;
+use failure::{Error, bail, format_err};
+use lazy_static::lazy_static;
+use log::trace;
 use regex::Regex;
 use std::ops;
 use std::fmt;
@@ -505,7 +507,7 @@ impl Segment {
 
 #[cfg(test)]
 mod tests {
-    use crate::base::clock::RealClocks;
+    use base::clock::RealClocks;
     use super::*;
     use crate::testutil::{self, TestDb};
 
@@ -743,12 +745,12 @@ mod tests {
 #[cfg(all(test, feature="nightly"))]
 mod bench {
     extern crate test;
-    use self::test::Bencher;
+
     use super::*;
 
     /// Benchmarks the decoder, which is performance-critical for .mp4 serving.
     #[bench]
-    fn bench_decoder(b: &mut Bencher) {
+    fn bench_decoder(b: &mut test::Bencher) {
         let data = include_bytes!("testdata/video_sample_index.bin");
         b.bytes = data.len() as u64;
         b.iter(|| {

db/testutil.rs

@@ -28,7 +28,7 @@
 // You should have received a copy of the GNU General Public License
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-use crate::base::clock::Clocks;
+use base::clock::Clocks;
 use crate::db;
 use crate::dir;
 use fnv::FnvHashMap;

db/upgrade/mod.rs

@@ -33,8 +33,9 @@
 /// See `guide/schema.md` for more information.
 
 use crate::db;
-use failure::Error;
-use rusqlite::{self, types::ToSql};
+use failure::{Error, bail};
+use log::info;
+use rusqlite::types::ToSql;
 
 mod v0_to_v1;
 mod v1_to_v2;

db/upgrade/v0_to_v1.rs

@@ -31,9 +31,10 @@
 /// Upgrades a version 0 schema to a version 1 schema.
 
 use crate::db;
-use failure::Error;
 use crate::recording;
-use rusqlite::{self, types::ToSql};
+use failure::Error;
+use log::warn;
+use rusqlite::types::ToSql;
 use std::collections::HashMap;
 
 pub fn run(_args: &super::Args, tx: &rusqlite::Transaction) -> Result<(), Error> {

db/upgrade/v1_to_v2.rs

@@ -31,9 +31,9 @@
 /// Upgrades a version 1 schema to a version 2 schema.
 
 use crate::dir;
-use failure::Error;
+use failure::{Error, bail, format_err};
 use libc;
-use rusqlite::{self, types::ToSql};
+use rusqlite::types::ToSql;
 use crate::schema::DirMeta;
 use std::fs;
 use std::os::unix::ffi::OsStrExt;

db/upgrade/v2_to_v3.rs

@@ -40,7 +40,7 @@ use crate::schema;
 use std::io::{self, Write};
 use std::mem;
 use std::sync::Arc;
-use rusqlite::{self, types::ToSql};
+use rusqlite::types::ToSql;
 use uuid::Uuid;
 
 /// Opens the sample file dir.

db/writer.rs

@@ -32,13 +32,14 @@
 //!
 //! This includes opening files for serving, rotating away old files, and saving new files.
 
-use crate::base::clock::{self, Clocks};
+use base::clock::{self, Clocks};
 use crate::db::{self, CompositeId};
 use crate::dir;
-use failure::Error;
+use crate::recording;
+use failure::{Error, bail, format_err};
 use fnv::FnvHashMap;
 use parking_lot::Mutex;
-use crate::recording;
+use log::{debug, info, trace, warn};
 use openssl::hash;
 use std::cmp;
 use std::io;
@@ -741,10 +742,11 @@ impl<'a, C: Clocks + Clone, D: DirWriter> Drop for Writer<'a, C, D> {
 
 #[cfg(test)]
 mod tests {
-    use crate::base::clock::SimulatedClocks;
+    use base::clock::SimulatedClocks;
     use crate::db::{self, CompositeId};
-    use parking_lot::Mutex;
     use crate::recording;
+    use parking_lot::Mutex;
+    use log::warn;
     use std::collections::VecDeque;
     use std::io;
     use std::sync::Arc;