From ac3ae07e7a82a689453aa693e475d9bed76b55ca Mon Sep 17 00:00:00 2001
From: Chris Gregory <czipperz@gmail.com>
Date: Tue, 2 Jul 2019 06:34:47 -0700
Subject: [PATCH] Use mem::take in compiletest

This reverts commit 1443abcdefc53dac3d5041d7362da3e13ae787d0.
---
 src/tools/compiletest/src/main.rs    | 1 +
 src/tools/compiletest/src/runtest.rs | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/tools/compiletest/src/main.rs b/src/tools/compiletest/src/main.rs
index 597fdf2d95e30..517f2a362f554 100644
--- a/src/tools/compiletest/src/main.rs
+++ b/src/tools/compiletest/src/main.rs
@@ -1,4 +1,5 @@
 #![crate_name = "compiletest"]
+#![feature(mem_take)]
 #![feature(test)]
 #![feature(vec_remove_item)]
 #![deny(warnings, rust_2018_idioms)]
diff --git a/src/tools/compiletest/src/runtest.rs b/src/tools/compiletest/src/runtest.rs
index 35caf82dd7128..6053b538ff322 100644
--- a/src/tools/compiletest/src/runtest.rs
+++ b/src/tools/compiletest/src/runtest.rs
@@ -3608,7 +3608,7 @@ fn nocomment_mir_line(line: &str) -> &str {
 
 fn read2_abbreviated(mut child: Child) -> io::Result<Output> {
     use crate::read2::read2;
-    use std::mem::replace;
+    use std::mem::take;
 
     const HEAD_LEN: usize = 160 * 1024;
     const TAIL_LEN: usize = 256 * 1024;
@@ -3632,7 +3632,7 @@ fn read2_abbreviated(mut child: Child) -> io::Result<Output> {
                         return;
                     }
                     let tail = bytes.split_off(new_len - TAIL_LEN).into_boxed_slice();
-                    let head = replace(bytes, Vec::new());
+                    let head = take(bytes);
                     let skipped = new_len - HEAD_LEN - TAIL_LEN;
                     ProcOutput::Abbreviated {
                         head,