fix some bugs

Author: heisen-li

src/cargo/util/command_prelude.rs

@@ -614,7 +614,7 @@ pub trait ArgMatchesExt {
     }
 
     fn index(&self) -> CargoResult<Option<String>> {
-        let index =  self._value_of("index").map(|s| s.to_string());
+        let index = self._value_of("index").map(|s| s.to_string());
         Ok(index)
     }
 

tests/testsuite/login.rs

@@ -1,9 +1,7 @@
 //! Tests for the `cargo login` command.
 
-use cargo::core::Shell;
-use cargo::util::config::Config;
 use cargo_test_support::install::cargo_home;
-use cargo_test_support::registry::{self, registry_url};
+use cargo_test_support::registry;
 use cargo_test_support::{cargo_process, paths, t};
 use std::fs::{self, OpenOptions};
 use std::io::prelude::*;
@@ -18,11 +16,6 @@ fn setup_new_credentials() {
     setup_new_credentials_at(config);
 }
 
-fn setup_new_credentials_toml() {
-    let config = cargo_home().join("credentials.toml");
-    setup_new_credentials_at(config);
-}
-
 fn setup_new_credentials_at(config: PathBuf) {
     t!(fs::create_dir_all(config.parent().unwrap()));
     t!(fs::write(

tests/testsuite/publish.rs

@@ -2,7 +2,7 @@
 
 use cargo_test_support::git::{self, repo};
 use cargo_test_support::paths;
-use cargo_test_support::registry::{self, registry_path, registry_url, Package};
+use cargo_test_support::registry::{self, registry_url, Package};
 use cargo_test_support::{basic_manifest, no_such_file_err_msg, project, publish};
 use std::fs;