Auto merge of #2682 - srinivasreddy:refactor_2, r=alexcrichton

remove deprecated attr - change connect() to join()

diff --cc tests/support/mod.rs
Simple merge

diff --cc tests/test_bad_manifest_path.rs
index 9c95fa8ab81eb913b9508811b0b024cad93c3331,0d8eb777e8f14623283f742e4483cb13a9f519a9..88ea145d9182730a0c7f879e614b43a67700f9cd
--- 1/tests/test_bad_manifest_path.rs
--- 2/tests/test_bad_manifest_path.rs
+++ b/tests/test_bad_manifest_path.rs
@@@ -12,11 -12,11 +12,11 @@@ fn assert_not_a_cargo_toml(command: &st
                   .arg("--manifest-path").arg(manifest_path_argument)
                   .cwd(p.root().parent().unwrap()),
                  execs().with_status(101)
 -                       .with_stderr(&format!("[ERROR] the manifest-path must be a path \
 -                                             to a Cargo.toml file")));
 +                       .with_stderr("[ERROR] the manifest-path must be a path \
 +                                             to a Cargo.toml file"));
  }
  
- #[allow(deprecated)] // connect => join in 1.3
+ 
  fn assert_cargo_toml_doesnt_exist(command: &str, manifest_path_argument: &str) {
      let p = project("foo");
      let expected_path = manifest_path_argument