diff options
| author | Wesley Wiser <wwiser@gmail.com> | 2015-07-10 08:19:21 -0400 |
|---|---|---|
| committer | Wesley Wiser <wwiser@gmail.com> | 2015-07-10 19:40:46 -0400 |
| commit | 93ddee6cee6816843035575ddf0bf0309021ebc5 (patch) | |
| tree | fcba0de278934ca2d48a6239ba059b0aaeba2b0f /src/compiletest | |
| parent | 29c0c956bf8ba9d6cdb1723d40685514bc9c17ef (diff) | |
| download | rust-93ddee6cee6816843035575ddf0bf0309021ebc5.tar.gz rust-93ddee6cee6816843035575ddf0bf0309021ebc5.zip | |
Change some instances of .connect() to .join()
Diffstat (limited to 'src/compiletest')
| -rw-r--r-- | src/compiletest/runtest.rs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/compiletest/runtest.rs b/src/compiletest/runtest.rs index 93054f39790..5b62f29b824 100644 --- a/src/compiletest/runtest.rs +++ b/src/compiletest/runtest.rs @@ -344,7 +344,7 @@ fn run_debuginfo_gdb_test(config: &Config, props: &TestProps, testfile: &Path) { check_lines, breakpoint_lines } = parse_debugger_commands(testfile, "gdb"); - let mut cmds = commands.connect("\n"); + let mut cmds = commands.join("\n"); // compile test file (it should have 'compile-flags:-g' in the header) let compiler_run_result = compile_test(config, props, testfile); @@ -799,7 +799,7 @@ fn cleanup_debug_info_options(options: &Option<String>) -> Option<String> { split_maybe_args(options).into_iter() .filter(|x| !options_to_remove.contains(x)) .collect::<Vec<String>>() - .connect(" "); + .join(" "); Some(new_options) } @@ -1412,7 +1412,7 @@ fn make_cmdline(libpath: &str, prog: &str, args: &[String]) -> String { // Linux and mac don't require adjusting the library search path if cfg!(unix) { - format!("{} {}", prog, args.connect(" ")) + format!("{} {}", prog, args.join(" ")) } else { // Build the LD_LIBRARY_PATH variable as it would be seen on the command line // for diagnostic purposes @@ -1420,7 +1420,7 @@ fn make_cmdline(libpath: &str, prog: &str, args: &[String]) -> String { format!("{}=\"{}\"", util::lib_path_env_var(), util::make_new_path(path)) } - format!("{} {} {}", lib_path_cmd_prefix(libpath), prog, args.connect(" ")) + format!("{} {} {}", lib_path_cmd_prefix(libpath), prog, args.join(" ")) } } |
