Skip to content

Commit

Permalink
Auto merge of #2636 - sanxiyn:unused-trait-import, r=alexcrichton
Browse files Browse the repository at this point in the history
Remove unused trait imports
  • Loading branch information
bors committed May 3, 2016
2 parents 401209f + ad369c9 commit 26288f7
Show file tree
Hide file tree
Showing 10 changed files with 4 additions and 11 deletions.
4 changes: 2 additions & 2 deletions Makefile.in
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
CFG_RELEASE_NUM=0.11.0
CFG_RELEASE_LABEL=

OPENSSL_VERS=1.0.2g
OPENSSL_SHA256=b784b1b3907ce39abf4098702dade6365522a253ad1552e267a9a0e89594aa33
OPENSSL_VERS=1.0.2h
OPENSSL_SHA256=1d4007e53aad94a5b2002fe045ee7bb0b3d98f1a47f8b2bc851dcd1c74332919

include config.mk

Expand Down
1 change: 0 additions & 1 deletion src/cargo/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ extern crate toml;
extern crate url;

use std::env;
use std::error::Error;
use std::io::prelude::*;
use std::io;
use rustc_serialize::{Decodable, Encodable};
Expand Down
1 change: 0 additions & 1 deletion src/cargo/ops/cargo_clean.rs
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ use std::fs;
use std::path::Path;

use core::{Package, Profiles};
use core::source::Source;
use util::{CargoResult, human, ChainError, Config};
use ops::{self, Layout, Context, BuildConfig, Kind, Unit};

Expand Down
2 changes: 1 addition & 1 deletion src/cargo/ops/cargo_install.rs
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ use std::path::{Path, PathBuf};
use tempdir::TempDir;
use toml;

use core::{SourceId, Source, Package, Registry, Dependency, PackageIdSpec};
use core::{SourceId, Source, Package, Dependency, PackageIdSpec};
use core::PackageId;
use ops::{self, CompileFilter};
use sources::{GitSource, PathSource, RegistrySource};
Expand Down
1 change: 0 additions & 1 deletion src/cargo/ops/cargo_new.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
use std::env;
use std::fs;
use std::io::prelude::*;
use std::path::Path;
use std::collections::BTreeMap;

Expand Down
2 changes: 1 addition & 1 deletion src/cargo/ops/cargo_run.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
use std::path::Path;

use ops::{self, ExecEngine, CompileFilter};
use ops::{self, CompileFilter};
use util::{self, CargoResult, process, ProcessError};
use core::Package;

Expand Down
1 change: 0 additions & 1 deletion src/cargo/ops/cargo_rustc/custom_build.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
use std::collections::{HashMap, BTreeSet, HashSet};
use std::fs;
use std::io::prelude::*;
use std::path::{PathBuf, Path};
use std::str;
use std::sync::{Mutex, Arc};
Expand Down
1 change: 0 additions & 1 deletion src/cargo/ops/cargo_rustc/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ use std::collections::HashMap;
use std::env;
use std::ffi::{OsStr, OsString};
use std::fs;
use std::io::prelude::*;
use std::path::{self, PathBuf};
use std::sync::Arc;

Expand Down
1 change: 0 additions & 1 deletion src/cargo/ops/registry.rs
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
use std::collections::HashMap;
use std::env;
use std::fs::{self, File};
use std::io::prelude::*;
use std::iter::repeat;
use std::path::{Path, PathBuf};

Expand Down
1 change: 0 additions & 1 deletion src/cargo/sources/path.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
use std::fmt::{self, Debug, Formatter};
use std::fs;
use std::io::prelude::*;
use std::path::{Path, PathBuf};

use filetime::FileTime;
Expand Down

0 comments on commit 26288f7

Please sign in to comment.