4 files changed, 2 insertions, 19 deletions
diff --git a/compiler/rustc_metadata/messages.ftl b/compiler/rustc_metadata/messages.ftl
index d6b08d840e3..13b3dac85d1 100644
--- a/compiler/rustc_metadata/messages.ftl
+++ b/compiler/rustc_metadata/messages.ftl
@@ -78,9 +78,6 @@ metadata_failed_create_file =
 metadata_failed_create_tempdir =
     couldn't create a temp dir: {$err}
 
-metadata_failed_remove =
-    failed to remove {$filename}: {$err}
-
 metadata_failed_write_error =
     failed to write {$filename}: {$err}
 
diff --git a/compiler/rustc_metadata/src/errors.rs b/compiler/rustc_metadata/src/errors.rs
index e110c68321d..fca06c0f47c 100644
--- a/compiler/rustc_metadata/src/errors.rs
+++ b/compiler/rustc_metadata/src/errors.rs
@@ -403,13 +403,6 @@ pub struct FailedCopyToStdout {
 }
 
 #[derive(Diagnostic)]
-#[diag(metadata_failed_remove)]
-pub struct FailedRemove {
-    pub filename: PathBuf,
-    pub err: Error,
-}
-
-#[derive(Diagnostic)]
 #[diag(metadata_binary_output_to_tty)]
 pub struct BinaryOutputToTty;
 
diff --git a/compiler/rustc_metadata/src/fs.rs b/compiler/rustc_metadata/src/fs.rs
index 5be99c8e4c0..238f963ed46 100644
--- a/compiler/rustc_metadata/src/fs.rs
+++ b/compiler/rustc_metadata/src/fs.rs
@@ -1,6 +1,6 @@
 use crate::errors::{
     BinaryOutputToTty, FailedCopyToStdout, FailedCreateEncodedMetadata, FailedCreateFile,
-    FailedCreateTempdir, FailedRemove, FailedWriteError,
+    FailedCreateTempdir, FailedWriteError,
 };
 use crate::{encode_metadata, EncodedMetadata};
 
@@ -109,13 +109,6 @@ pub fn encode_and_write_metadata(tcx: TyCtxt<'_>) -> (EncodedMetadata, bool) {
             tcx.sess.emit_fatal(FailedCreateEncodedMetadata { err });
         });
 
-    // Delete the temporary metadata file if output is stdout
-    if need_metadata_file && out_filename.is_stdout() {
-        if let Err(err) = fs::remove_file(&metadata_filename) {
-            tcx.sess.emit_err(FailedRemove { filename: metadata_filename, err });
-        }
-    }
-
     let need_metadata_module = metadata_kind == MetadataKind::Compressed;
 
     (metadata, need_metadata_module)
diff --git a/tests/run-make/emit-to-stdout/Makefile b/tests/run-make/emit-to-stdout/Makefile
index b7455965cff..80e9b6a4ded 100644
--- a/tests/run-make/emit-to-stdout/Makefile
+++ b/tests/run-make/emit-to-stdout/Makefile
@@ -32,7 +32,7 @@ obj: $(OUT)
 # it there.
 metadata: $(OUT)
 	cp $(SRC) $(OUT)
-	(cd $(OUT); pwd; ls -d; $(RUSTC) --emit metadata=- $(SRC) 1>/dev/ptmx 2>$(OUT)/$@ || true)
+	(cd $(OUT); $(RUSTC) --emit metadata=- $(SRC) 1>/dev/ptmx 2>$(OUT)/$@ || true)
 	diff $(OUT)/$@ emit-metadata.stderr
 
 link: $(OUT)