changed: remove 2015-style extern crate

Cargo.lock

@@ -144,7 +144,6 @@ dependencies = [
  "notify",
  "rnix",
  "serde",
- "serde_derive",
  "serde_json",
  "signal-hook",
  "smol_str",
@@ -770,6 +769,9 @@ name = "serde"
 version = "1.0.118"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "06c64263859d87aa2eb554587e2d23183398d617427327cf2b3d0ed8c69e4800"
+dependencies = [
+ "serde_derive",
+]
 
 [[package]]
 name = "serde_derive"

Cargo.toml

@@ -14,8 +14,7 @@ edition = "2018"
 clap = "3.0.0-beta.2"
 tokio = { version = "0.3.5", features = [ "full" ] }
 serde_json = "1.0.48"
-serde_derive = "1.0.104"
-serde = "1.0.104"
+serde = { version = "1.0.104", features = [ "derive" ] }
 merge = "0.1.0"
 whoami = "0.9.0"
 log = "0.4"
@@ -37,4 +36,4 @@ smol_str = "=0.1.16"
 
 [lib]
 name = "deploy"
-path = "src/lib.rs"
+path = "src/lib.rs"

src/bin/activate.rs

@@ -20,10 +20,7 @@ use notify::{RecommendedWatcher, RecursiveMode, Watcher};
 
 use thiserror::Error;
 
-#[macro_use]
-extern crate log;
-
-extern crate serde_derive;
+use log::{debug, error, info, warn};
 
 /// Remote activation utility for deploy-rs
 #[derive(Clap, Debug)]

src/bin/deploy.rs

@@ -7,16 +7,11 @@ use std::io::{stdin, stdout, Write};
 
 use clap::Clap;
 
+use log::{debug, error, info, warn};
+use serde::Serialize;
 use std::process::Stdio;
-use tokio::process::Command;
-
 use thiserror::Error;
-
-#[macro_use]
-extern crate log;
-
-#[macro_use]
-extern crate serde_derive;
+use tokio::process::Command;
 
 /// Simple Rust rewrite of a simple Nix Flake deployment tool
 #[derive(Clap, Debug)]

src/data.rs

@@ -3,7 +3,7 @@
 // SPDX-License-Identifier: MPL-2.0
 
 use merge::Merge;
-
+use serde::Deserialize;
 use std::collections::HashMap;
 
 #[derive(Deserialize, Debug, Clone, Merge)]

src/deploy.rs

@@ -3,10 +3,10 @@
 //
 // SPDX-License-Identifier: MPL-2.0
 
+use log::{debug, info};
 use std::borrow::Cow;
-use tokio::process::Command;
-
 use thiserror::Error;
+use tokio::process::Command;
 
 struct ActivateCommandData<'a> {
     sudo: &'a Option<String>,

src/lib.rs

@@ -11,12 +11,6 @@ use thiserror::Error;
 
 use flexi_logger::*;
 
-#[macro_use]
-extern crate log;
-
-#[macro_use]
-extern crate serde_derive;
-
 pub fn make_lock_path(temp_path: &str, closure: &str) -> String {
     let lock_hash =
         &closure["/nix/store/".len()..closure.find('-').unwrap_or_else(|| closure.len())];

src/push.rs

@@ -2,11 +2,11 @@
 //
 // SPDX-License-Identifier: MPL-2.0
 
+use log::{debug, info};
 use std::path::Path;
 use std::process::Stdio;
-use tokio::process::Command;
-
 use thiserror::Error;
+use tokio::process::Command;
 
 #[derive(Error, Debug)]
 pub enum PushProfileError {