Rollup merge of rust-lang#104995 - jyn514:lint-errors, r=Manishearth

Don't silently ignore errors that happen during rendering This caught a real, existing bug. Found in rust-lang#104994
matthiaskrgr · Nov 29, 2022 · 8937a2e · 8937a2e
2 parents de1af83 + 6a25bfa
commit 8937a2e
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 1 deletion.
diff --git a/src/librustdoc/lib.rs b/src/librustdoc/lib.rs
@@ -689,7 +689,7 @@ fn run_renderer<'tcx, T: formats::FormatRenderer<'tcx>>(
     tcx: TyCtxt<'tcx>,
 ) -> MainResult {
     match formats::run_format::<T>(krate, renderopts, cache, tcx) {
-        Ok(_) => Ok(()),
+        Ok(_) => tcx.sess.has_errors().map_or(Ok(()), Err),
         Err(e) => {
             let mut msg =
                 tcx.sess.struct_err(&format!("couldn't generate documentation: {}", e.error));

diff --git a/src/test/rustdoc/const-evalutation-ice.rs → src/test/rustdoc-ui/const-evalutation-ice.rs b/src/test/rustdoc/const-evalutation-ice.rs → src/test/rustdoc-ui/const-evalutation-ice.rs
@@ -8,3 +8,4 @@ pub struct S {
 }
 
 pub const N: usize = 0 - (mem::size_of::<S>() != 4) as usize;
+//~^ ERROR evaluation of constant value failed
diff --git a/src/test/rustdoc-ui/const-evalutation-ice.stderr b/src/test/rustdoc-ui/const-evalutation-ice.stderr
@@ -0,0 +1,9 @@
+error[E0080]: evaluation of constant value failed
+  --> $DIR/const-evalutation-ice.rs:10:22
+   |
+LL | pub const N: usize = 0 - (mem::size_of::<S>() != 4) as usize;
+   |                      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ attempt to compute `0_usize - 1_usize`, which would overflow
+
+error: aborting due to previous error
+
+For more information about this error, try `rustc --explain E0080`.
Original file line number	Diff line number	Diff line change
Expand Up		@@ -8,3 +8,4 @@ pub struct S {
		}

		pub const N: usize = 0 - (mem::size_of::<S>() != 4) as usize;
		//~^ ERROR evaluation of constant value failed