Optimize write with as_const_str for shorter code
This commit is contained in:
parent
62415e2a95
commit
3d0d0ce740
@ -201,16 +201,24 @@ trait SpecWriteFmt {
|
||||
impl<W: Write + ?Sized> SpecWriteFmt for &mut W {
|
||||
#[inline]
|
||||
default fn spec_write_fmt(mut self, args: Arguments<'_>) -> Result {
|
||||
if let Some(s) = args.as_const_str() {
|
||||
self.write_str(s)
|
||||
} else {
|
||||
write(&mut self, args)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
impl<W: Write> SpecWriteFmt for &mut W {
|
||||
#[inline]
|
||||
fn spec_write_fmt(self, args: Arguments<'_>) -> Result {
|
||||
if let Some(s) = args.as_const_str() {
|
||||
self.write_str(s)
|
||||
} else {
|
||||
write(self, args)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
self.spec_write_fmt(args)
|
||||
}
|
||||
@ -430,6 +438,14 @@ pub const fn as_str(&self) -> Option<&'static str> {
|
||||
_ => None,
|
||||
}
|
||||
}
|
||||
|
||||
/// Same as [`Arguments::as_str`], but will only return `Some(s)` if it can be determined at compile time.
|
||||
#[must_use]
|
||||
#[inline]
|
||||
fn as_const_str(&self) -> Option<&'static str> {
|
||||
let s = self.as_str();
|
||||
if core::intrinsics::is_val_statically_known(s.is_some()) { s } else { None }
|
||||
}
|
||||
}
|
||||
|
||||
#[stable(feature = "rust1", since = "1.0.0")]
|
||||
@ -1102,14 +1118,8 @@ pub trait UpperExp {
|
||||
/// ```
|
||||
///
|
||||
/// [`write!`]: crate::write!
|
||||
#[inline]
|
||||
#[stable(feature = "rust1", since = "1.0.0")]
|
||||
pub fn write(output: &mut dyn Write, args: Arguments<'_>) -> Result {
|
||||
if let Some(s) = args.as_str() { output.write_str(s) } else { write_internal(output, args) }
|
||||
}
|
||||
|
||||
/// Actual implementation of the [`write()`], but without the simple string optimization.
|
||||
fn write_internal(output: &mut dyn Write, args: Arguments<'_>) -> Result {
|
||||
let mut formatter = Formatter::new(output);
|
||||
let mut idx = 0;
|
||||
|
||||
@ -1588,8 +1598,9 @@ pub fn write_str(&mut self, data: &str) -> Result {
|
||||
/// assert_eq!(format!("{:0>8}", Foo(2)), "Foo 2");
|
||||
/// ```
|
||||
#[stable(feature = "rust1", since = "1.0.0")]
|
||||
#[inline]
|
||||
pub fn write_fmt(&mut self, fmt: Arguments<'_>) -> Result {
|
||||
write(self.buf, fmt)
|
||||
if let Some(s) = fmt.as_const_str() { self.buf.write_str(s) } else { write(self.buf, fmt) }
|
||||
}
|
||||
|
||||
/// Flags for formatting
|
||||
@ -2278,10 +2289,15 @@ fn write_char(&mut self, c: char) -> Result {
|
||||
self.buf.write_char(c)
|
||||
}
|
||||
|
||||
#[inline]
|
||||
fn write_fmt(&mut self, args: Arguments<'_>) -> Result {
|
||||
if let Some(s) = args.as_const_str() {
|
||||
self.buf.write_str(s)
|
||||
} else {
|
||||
write(self.buf, args)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
#[stable(feature = "rust1", since = "1.0.0")]
|
||||
impl Display for Error {
|
||||
|
Loading…
Reference in New Issue
Block a user