Parcourir la source

Remove redundant extern crate imports

timvisee il y a 4 ans
Parent
commit
549657df21
8 fichiers modifiés avec 14 ajouts et 27 suppressions
  1. 1 1
      src/action/upload.rs
  2. 1 1
      src/archive/archive.rs
  3. 1 1
      src/archive/archiver.rs
  4. 0 2
      src/archive/mod.rs
  5. 0 2
      src/cmd/handler.rs
  6. 6 8
      src/history.rs
  7. 1 3
      src/progress.rs
  8. 4 9
      src/util.rs

+ 1 - 1
src/action/upload.rs

@@ -289,7 +289,7 @@ impl<'a> Upload<'a> {
 
                     // Prompt the user to continue, quit if the user answered no
                     if !prompt_yes("Continue uploading?", Some(true), &matcher_main) {
-                        println!("Upload cancelled");
+                        eprintln!("Upload cancelled");
                         quit();
                     }
                 }

+ 1 - 1
src/archive/archive.rs

@@ -1,7 +1,7 @@
 use std::io::{Error as IoError, Read};
 use std::path::Path;
 
-use super::tar::Archive as TarArchive;
+use tar::Archive as TarArchive;
 
 pub type Result<T> = ::std::result::Result<T, IoError>;
 

+ 1 - 1
src/archive/archiver.rs

@@ -2,7 +2,7 @@ use std::fs::File;
 use std::io::{Error as IoError, Write};
 use std::path::Path;
 
-use super::tar::Builder as TarBuilder;
+use tar::Builder as TarBuilder;
 
 pub type Result<T> = ::std::result::Result<T, IoError>;
 

+ 0 - 2
src/archive/mod.rs

@@ -1,4 +1,2 @@
-extern crate tar;
-
 pub mod archive;
 pub mod archiver;

+ 0 - 2
src/cmd/handler.rs

@@ -1,5 +1,3 @@
-extern crate directories;
-
 #[cfg(feature = "infer-command")]
 use std::ffi::OsString;
 

+ 6 - 8
src/history.rs

@@ -1,16 +1,14 @@
-extern crate toml;
-extern crate version_compare;
-
 use std::fs;
 use std::io::Error as IoError;
 use std::path::PathBuf;
 
-use self::toml::de::Error as DeError;
-use self::toml::ser::Error as SerError;
-use self::version_compare::{CompOp, VersionCompare};
 use failure::Fail;
-use ffsend_api::file::remote_file::{FileParseError, RemoteFile};
-use ffsend_api::url::Url;
+use ffsend_api::{
+    file::remote_file::{FileParseError, RemoteFile},
+    url::Url,
+};
+use toml::{de::Error as DeError, ser::Error as SerError};
+use version_compare::{CompOp, VersionCompare};
 
 use crate::util::{print_error, print_warning};
 

+ 1 - 3
src/progress.rs

@@ -1,10 +1,8 @@
-extern crate pbr;
-
 use std::io::{stderr, Stderr};
 use std::time::Duration;
 
-use self::pbr::{ProgressBar as Pbr, Units};
 use ffsend_api::pipe::ProgressReporter;
+use pbr::{ProgressBar as Pbr, Units};
 
 /// The refresh rate of the progress bar, in milliseconds.
 const PROGRESS_BAR_FPS_MILLIS: u64 = 200;

+ 4 - 9
src/util.rs

@@ -1,10 +1,5 @@
 #[cfg(feature = "clipboard-crate")]
 extern crate clip;
-extern crate colored;
-extern crate directories;
-extern crate fs2;
-extern crate open;
-extern crate regex;
 #[cfg(feature = "clipboard-bin")]
 extern crate which;
 
@@ -26,11 +21,10 @@ use std::process::{Command, Stdio};
 
 #[cfg(feature = "clipboard-crate")]
 use self::clip::{ClipboardContext, ClipboardProvider};
-use self::colored::*;
-#[cfg(feature = "history")]
-use self::directories::ProjectDirs;
-use self::fs2::available_space;
 use chrono::Duration;
+use colored::*;
+#[cfg(feature = "history")]
+use directories::ProjectDirs;
 use failure::{err_msg, Fail};
 #[cfg(feature = "clipboard-crate")]
 use failure::{Compat, Error};
@@ -40,6 +34,7 @@ use ffsend_api::{
     reqwest,
     url::Url,
 };
+use fs2::available_space;
 use rand::distributions::Alphanumeric;
 use rand::{thread_rng, Rng};
 use regex::Regex;