io::Write::write_fmt: panic if the formatter fails when the stream do…

…es not fail

library/alloc/src/fmt.rs

@@ -630,7 +630,9 @@ pub fn format(args: Arguments<'_>) -> string::String {
  fn format_inner(args: Arguments<'_>) -> string::String {
  let capacity = args.estimated_capacity();
  let mut output = string::String::with_capacity(capacity);
- output.write_fmt(args).expect("a formatting trait implementation returned an error");
+ output
+ .write_fmt(args)
+ .expect("a formatting trait implementation returned an error when the underlying stream did not");
  output
  }
 

library/std/src/io/mod.rs

@@ -1839,7 +1839,11 @@ pub trait Write {
  if output.error.is_err() {
  output.error
  } else {
- Err(error::const_io_error!(ErrorKind::Uncategorized, "formatter error"))
+ // This shouldn't happen: the underlying stream did not error, but somehow
+ // the formatter still errored?
+ panic!(
+ "a formatting trait implementation returned an error when the underlying stream did not"
+ );
  }
  }
  }

tests/ui/write-fmt-errors.rs

@@ -1,9 +1,11 @@
 //@ run-pass
+//@ needs-unwind
 
 #![feature(io_error_uncategorized)]
 
 use std::fmt;
 use std::io::{self, Error, Write, sink};
+use std::panic::catch_unwind;
 
 struct ErrorDisplay;
 
@@ -15,7 +17,6 @@ impl fmt::Display for ErrorDisplay {
 
 struct ErrorWriter;
 
-const FORMAT_ERROR: io::ErrorKind = io::ErrorKind::Uncategorized;
 const WRITER_ERROR: io::ErrorKind = io::ErrorKind::NotConnected;
 
 impl Write for ErrorWriter {
@@ -27,22 +28,22 @@ impl Write for ErrorWriter {
 }
 
 fn main() {
- // Test that the error from the formatter is propagated.
- let res = write!(sink(), "{} {} {}", 1, ErrorDisplay, "bar");
- assert!(res.is_err(), "formatter error did not propagate");
- assert_eq!(res.unwrap_err().kind(), FORMAT_ERROR);
-
  // Test that an underlying error is propagated
  let res = write!(ErrorWriter, "abc");
  assert!(res.is_err(), "writer error did not propagate");
 
- // Writer error
+ // Test that the error from the formatter is detected.
+ let res = catch_unwind(|| write!(sink(), "{} {} {}", 1, ErrorDisplay, "bar"));
+ let err = res.expect_err("formatter error did not lead to panic").downcast::<&str>().unwrap();
+ assert!(err.contains("formatting trait implementation returned an error"), "unexpected panic: {}", err);
+
+ // Writer error when there's some string before the first `{}`
  let res = write!(ErrorWriter, "abc {}", ErrorDisplay);
  assert!(res.is_err(), "writer error did not propagate");
  assert_eq!(res.unwrap_err().kind(), WRITER_ERROR);
 
- // Formatter error
- let res = write!(ErrorWriter, "{} abc", ErrorDisplay);
- assert!(res.is_err(), "formatter error did not propagate");
- assert_eq!(res.unwrap_err().kind(), FORMAT_ERROR);
+ // Formatter error when the `{}` comes first
+ let res = catch_unwind(|| write!(ErrorWriter, "{} abc", ErrorDisplay));
+ let err = res.expect_err("formatter error did not lead to panic").downcast::<&str>().unwrap();
+ assert!(err.contains("formatting trait implementation returned an error"), "unexpected panic: {}", err);
 }