From 33e0017ebf1036118d35ee5dafd0d46e84eb4e27 Mon Sep 17 00:00:00 2001 From: Alex Crichton Date: Thu, 23 Oct 2014 12:52:20 -0700 Subject: [PATCH] Remove some unused imports --- src/cargo/core/dependency.rs | 2 +- src/cargo/ops/cargo_fetch.rs | 4 +--- src/cargo/ops/cargo_generate_lockfile.rs | 7 +------ src/cargo/ops/cargo_package.rs | 2 +- src/cargo/ops/lockfile.rs | 9 ++------- src/cargo/ops/resolve.rs | 9 ++------- 6 files changed, 8 insertions(+), 25 deletions(-) diff --git a/src/cargo/core/dependency.rs b/src/cargo/core/dependency.rs index edbfdb47793..f877cbadb37 100644 --- a/src/cargo/core/dependency.rs +++ b/src/cargo/core/dependency.rs @@ -114,7 +114,7 @@ impl Dependency { } /// Lock this dependency to depending on the specified package id - pub fn lock_to(mut self, id: &PackageId) -> Dependency { + pub fn lock_to(self, id: &PackageId) -> Dependency { assert_eq!(self.source_id, *id.get_source_id()); assert!(self.req.matches(id.get_version())); self.version_req(VersionReq::exact(id.get_version())) diff --git a/src/cargo/ops/cargo_fetch.rs b/src/cargo/ops/cargo_fetch.rs index 73d52a3ab1e..4c4cb0ebffe 100644 --- a/src/cargo/ops/cargo_fetch.rs +++ b/src/cargo/ops/cargo_fetch.rs @@ -1,11 +1,9 @@ -use core::{MultiShell, Package}; +use core::MultiShell; use core::registry::PackageRegistry; -use core::resolver::{mod, Resolve}; use core::source::Source; use ops; use sources::PathSource; use util::{CargoResult, Config}; -use util::profile; /// Executes `cargo fetch`. pub fn fetch(manifest_path: &Path, diff --git a/src/cargo/ops/cargo_generate_lockfile.rs b/src/cargo/ops/cargo_generate_lockfile.rs index dc75ccbd133..c318b8db971 100644 --- a/src/cargo/ops/cargo_generate_lockfile.rs +++ b/src/cargo/ops/cargo_generate_lockfile.rs @@ -1,16 +1,11 @@ use std::collections::HashSet; -use std::io::File; - -use serialize::{Encodable, Decodable}; -use toml::{mod, Encoder}; use core::PackageId; use core::registry::PackageRegistry; -use core::{MultiShell, Source, Resolve, resolver, Package, SourceId}; +use core::{MultiShell, Source, Resolve, resolver}; use ops; use sources::{PathSource}; use util::config::{Config}; -use util::toml as cargo_toml; use util::{CargoResult, human}; pub struct UpdateOptions<'a> { diff --git a/src/cargo/ops/cargo_package.rs b/src/cargo/ops/cargo_package.rs index d0234e3c45f..99444fdabb4 100644 --- a/src/cargo/ops/cargo_package.rs +++ b/src/cargo/ops/cargo_package.rs @@ -7,7 +7,7 @@ use flate2::{GzBuilder, BestCompression}; use flate2::reader::GzDecoder; use core::source::{Source, SourceId}; -use core::{Package, MultiShell, Dependency}; +use core::{Package, MultiShell}; use sources::PathSource; use util::{CargoResult, human, internal, ChainError, Require}; use ops; diff --git a/src/cargo/ops/lockfile.rs b/src/cargo/ops/lockfile.rs index 24c60cd42e3..441c11d46db 100644 --- a/src/cargo/ops/lockfile.rs +++ b/src/cargo/ops/lockfile.rs @@ -1,15 +1,10 @@ -use std::collections::HashSet; use std::io::File; use serialize::{Encodable, Decodable}; use toml::{mod, Encoder}; -use core::registry::PackageRegistry; -use core::{MultiShell, Source, Resolve, resolver, Package, SourceId}; -use core::PackageId; -use sources::{PathSource}; -use util::config::{Config}; -use util::{CargoResult, human}; +use core::{Resolve, resolver, Package, SourceId}; +use util::CargoResult; use util::toml as cargo_toml; pub fn load_pkg_lockfile(pkg: &Package) -> CargoResult> { diff --git a/src/cargo/ops/resolve.rs b/src/cargo/ops/resolve.rs index 51af6bcec43..7f2a9fd2176 100644 --- a/src/cargo/ops/resolve.rs +++ b/src/cargo/ops/resolve.rs @@ -1,15 +1,10 @@ use std::collections::{HashMap, HashSet}; -use semver::VersionReq; - -use core::{MultiShell, Package, PackageId}; +use core::{Package, PackageId}; use core::registry::PackageRegistry; use core::resolver::{mod, Resolve}; -use core::source::Source; use ops; -use sources::PathSource; -use util::{CargoResult, Config}; -use util::profile; +use util::CargoResult; /// Resolve all dependencies for the specified `package` using the previous /// lockfile as a guide if present.