Report I/O errors with emit_fatal not emit_err

saethlin · saethlin · commit 94c43ccd876f · 2024-01-02T07:31:02.000-05:00
diff --git a/compiler/rustc_incremental/src/persist/file_format.rs b/compiler/rustc_incremental/src/persist/file_format.rs
@@ -55,18 +55,12 @@ where
             debug!("save: remove old file");
         }
         Err(err) if err.kind() == io::ErrorKind::NotFound => (),
-        Err(err) => {
-            sess.dcx().emit_err(errors::DeleteOld { name, path: path_buf, err });
-            return;
-        }
+        Err(err) => sess.dcx().emit_fatal(errors::DeleteOld { name, path: path_buf, err }),
     }
 
     let mut encoder = match FileEncoder::new(&path_buf) {
         Ok(encoder) => encoder,
-        Err(err) => {
-            sess.dcx().emit_err(errors::CreateNew { name, path: path_buf, err });
-            return;
-        }
+        Err(err) => sess.dcx().emit_fatal(errors::CreateNew { name, path: path_buf, err }),
     };
 
     write_file_header(&mut encoder, sess);
@@ -80,9 +74,7 @@ where
             );
             debug!("save: data written to disk successfully");
         }
-        Err((path, err)) => {
-            sess.dcx().emit_err(errors::WriteNew { name, path, err });
-        }
+        Err((path, err)) => sess.dcx().emit_fatal(errors::WriteNew { name, path, err }),
     }
 }
 
diff --git a/compiler/rustc_interface/src/queries.rs b/compiler/rustc_interface/src/queries.rs
@@ -332,7 +332,7 @@ impl Compiler {
         // the global context.
         _timer = Some(self.sess.timer("free_global_ctxt"));
         if let Err((path, error)) = queries.finish() {
-            self.sess.dcx().emit_err(errors::FailedWritingFile { path: &path, error });
+            self.sess.dcx().emit_fatal(errors::FailedWritingFile { path: &path, error });
         }
 
         ret
diff --git a/compiler/rustc_metadata/src/rmeta/encoder.rs b/compiler/rustc_metadata/src/rmeta/encoder.rs
@@ -2241,12 +2241,12 @@ pub fn encode_metadata(tcx: TyCtxt<'_>, path: &Path) {
     // If we forget this, compilation can succeed with an incomplete rmeta file,
     // causing an ICE when the rmeta file is read by another compilation.
     if let Err((path, err)) = ecx.opaque.finish() {
-        tcx.dcx().emit_err(FailWriteFile { path: &path, err });
+        tcx.dcx().emit_fatal(FailWriteFile { path: &path, err });
     }
 
     let file = ecx.opaque.file();
     if let Err(err) = encode_root_position(file, root.position.get()) {
-        tcx.dcx().emit_err(FailWriteFile { path: ecx.opaque.path(), err });
+        tcx.dcx().emit_fatal(FailWriteFile { path: ecx.opaque.path(), err });
     }
 
     // Record metadata size for self-profiling

Original file line number	Diff line number	Diff line change
`@@ -55,18 +55,12 @@ where`
`55`	`55`	`debug!("save: remove old file");`
`56`	`56`	`}`
`57`	`57`	`Err(err) if err.kind() == io::ErrorKind::NotFound => (),`
`58`		`- Err(err) => {`
`59`		`- sess.dcx().emit_err(errors::DeleteOld { name, path: path_buf, err });`
`60`		`- return;`
`61`		`- }`
	`58`	`+ Err(err) => sess.dcx().emit_fatal(errors::DeleteOld { name, path: path_buf, err }),`
`62`	`59`	`}`
`63`	`60`
`64`	`61`	`let mut encoder = match FileEncoder::new(&path_buf) {`
`65`	`62`	`Ok(encoder) => encoder,`
`66`		`- Err(err) => {`
`67`		`- sess.dcx().emit_err(errors::CreateNew { name, path: path_buf, err });`
`68`		`- return;`
`69`		`- }`
	`63`	`+ Err(err) => sess.dcx().emit_fatal(errors::CreateNew { name, path: path_buf, err }),`
`70`	`64`	`};`
`71`	`65`
`72`	`66`	`write_file_header(&mut encoder, sess);`
`@@ -80,9 +74,7 @@ where`
`80`	`74`	`);`
`81`	`75`	`debug!("save: data written to disk successfully");`
`82`	`76`	`}`
`83`		`- Err((path, err)) => {`
`84`		`- sess.dcx().emit_err(errors::WriteNew { name, path, err });`
`85`		`- }`
	`77`	`+ Err((path, err)) => sess.dcx().emit_fatal(errors::WriteNew { name, path, err }),`
`86`	`78`	`}`
`87`	`79`	`}`
`88`	`80`
Original file line number	Diff line number	Diff line change
`@@ -332,7 +332,7 @@ impl Compiler {`
`332`	`332`	`// the global context.`
`333`	`333`	`_timer = Some(self.sess.timer("free_global_ctxt"));`
`334`	`334`	`if let Err((path, error)) = queries.finish() {`
`335`		`- self.sess.dcx().emit_err(errors::FailedWritingFile { path: &path, error });`
	`335`	`+ self.sess.dcx().emit_fatal(errors::FailedWritingFile { path: &path, error });`
`336`	`336`	`}`
`337`	`337`
`338`	`338`	`ret`
Original file line number	Diff line number	Diff line change
`@@ -2241,12 +2241,12 @@ pub fn encode_metadata(tcx: TyCtxt<'_>, path: &Path) {`
`2241`	`2241`	`// If we forget this, compilation can succeed with an incomplete rmeta file,`
`2242`	`2242`	`// causing an ICE when the rmeta file is read by another compilation.`
`2243`	`2243`	`if let Err((path, err)) = ecx.opaque.finish() {`
`2244`		`- tcx.dcx().emit_err(FailWriteFile { path: &path, err });`
	`2244`	`+ tcx.dcx().emit_fatal(FailWriteFile { path: &path, err });`
`2245`	`2245`	`}`
`2246`	`2246`
`2247`	`2247`	`let file = ecx.opaque.file();`
`2248`	`2248`	`if let Err(err) = encode_root_position(file, root.position.get()) {`
`2249`		`- tcx.dcx().emit_err(FailWriteFile { path: ecx.opaque.path(), err });`
	`2249`	`+ tcx.dcx().emit_fatal(FailWriteFile { path: ecx.opaque.path(), err });`
`2250`	`2250`	`}`
`2251`	`2251`
`2252`	`2252`	`// Record metadata size for self-profiling`