fix

- remove useless commands from test Makefile - do not unnecessarily remove metadata temporary files because they'll be managed by MaybeTempDir - remove unused FailedRemove error introduced by this PR
rust-lang-ci · Jun 6, 2023 · ade6c36 · ade6c36
1 parent 9b1a1e1
commit ade6c36
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 19 deletions.
diff --git 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
@@ -402,13 +402,6 @@ pub struct FailedCopyToStdout {
     pub err: Error,
 }
 
-#[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
@@ -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
@@ -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)