1
Fork 0

use fmt::Result where applicable

This commit is contained in:
Andre Bogus 2018-05-09 01:41:44 +02:00
parent 8ff4b42064
commit e333725664
13 changed files with 20 additions and 20 deletions

View file

@ -67,7 +67,7 @@ impl Fingerprint {
} }
impl ::std::fmt::Display for Fingerprint { impl ::std::fmt::Display for Fingerprint {
fn fmt(&self, formatter: &mut ::std::fmt::Formatter) -> Result<(), ::std::fmt::Error> { fn fmt(&self, formatter: &mut ::std::fmt::Formatter) -> ::std::fmt::Result {
write!(formatter, "{:x}-{:x}", self.0, self.1) write!(formatter, "{:x}-{:x}", self.0, self.1)
} }
} }

View file

@ -175,7 +175,7 @@ impl<Node: Idx> DominatorTree<Node> {
} }
impl<Node: Idx> fmt::Debug for DominatorTree<Node> { impl<Node: Idx> fmt::Debug for DominatorTree<Node> {
fn fmt(&self, fmt: &mut fmt::Formatter) -> Result<(), fmt::Error> { fn fmt(&self, fmt: &mut fmt::Formatter) -> fmt::Result {
fmt::Debug::fmt(&DominatorTreeNode { fmt::Debug::fmt(&DominatorTreeNode {
tree: self, tree: self,
node: self.root, node: self.root,
@ -190,7 +190,7 @@ struct DominatorTreeNode<'tree, Node: Idx> {
} }
impl<'tree, Node: Idx> fmt::Debug for DominatorTreeNode<'tree, Node> { impl<'tree, Node: Idx> fmt::Debug for DominatorTreeNode<'tree, Node> {
fn fmt(&self, fmt: &mut fmt::Formatter) -> Result<(), fmt::Error> { fn fmt(&self, fmt: &mut fmt::Formatter) -> fmt::Result {
let subtrees: Vec<_> = self.tree let subtrees: Vec<_> = self.tree
.children(self.node) .children(self.node)
.iter() .iter()

View file

@ -1002,7 +1002,7 @@ impl<O, T: ?Sized> Debug for OwningRef<O, T>
where O: Debug, where O: Debug,
T: Debug, T: Debug,
{ {
fn fmt(&self, f: &mut fmt::Formatter) -> Result<(), fmt::Error> { fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
write!(f, write!(f,
"OwningRef {{ owner: {:?}, reference: {:?} }}", "OwningRef {{ owner: {:?}, reference: {:?} }}",
self.owner(), self.owner(),
@ -1014,7 +1014,7 @@ impl<O, T: ?Sized> Debug for OwningRefMut<O, T>
where O: Debug, where O: Debug,
T: Debug, T: Debug,
{ {
fn fmt(&self, f: &mut fmt::Formatter) -> Result<(), fmt::Error> { fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
write!(f, write!(f,
"OwningRefMut {{ owner: {:?}, reference: {:?} }}", "OwningRefMut {{ owner: {:?}, reference: {:?} }}",
self.owner(), self.owner(),
@ -1047,7 +1047,7 @@ unsafe impl<O, T: ?Sized> Sync for OwningRefMut<O, T>
where O: Sync, for<'a> (&'a mut T): Sync {} where O: Sync, for<'a> (&'a mut T): Sync {}
impl Debug for Erased { impl Debug for Erased {
fn fmt(&self, f: &mut fmt::Formatter) -> Result<(), fmt::Error> { fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
write!(f, "<Erased>",) write!(f, "<Erased>",)
} }
} }

View file

@ -232,7 +232,7 @@ impl FatalError {
} }
impl fmt::Display for FatalError { impl fmt::Display for FatalError {
fn fmt(&self, f: &mut fmt::Formatter) -> Result<(), fmt::Error> { fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
write!(f, "parser fatal error") write!(f, "parser fatal error")
} }
} }
@ -249,7 +249,7 @@ impl error::Error for FatalError {
pub struct ExplicitBug; pub struct ExplicitBug;
impl fmt::Display for ExplicitBug { impl fmt::Display for ExplicitBug {
fn fmt(&self, f: &mut fmt::Formatter) -> Result<(), fmt::Error> { fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
write!(f, "parser internal bug") write!(f, "parser internal bug")
} }
} }

View file

@ -1185,7 +1185,7 @@ impl<'tcx> RegionDefinition<'tcx> {
} }
impl fmt::Debug for Constraint { impl fmt::Debug for Constraint {
fn fmt(&self, formatter: &mut fmt::Formatter) -> Result<(), fmt::Error> { fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
write!( write!(
formatter, formatter,
"({:?}: {:?} @ {:?}) due to {:?}", "({:?}: {:?} @ {:?}) due to {:?}",

View file

@ -174,7 +174,7 @@ struct Elaborator<'a, 'b: 'a, 'tcx: 'b> {
} }
impl<'a, 'b, 'tcx> fmt::Debug for Elaborator<'a, 'b, 'tcx> { impl<'a, 'b, 'tcx> fmt::Debug for Elaborator<'a, 'b, 'tcx> {
fn fmt(&self, _f: &mut fmt::Formatter) -> Result<(), fmt::Error> { fn fmt(&self, _f: &mut fmt::Formatter) -> fmt::Result {
Ok(()) Ok(())
} }
} }

View file

@ -2579,7 +2579,7 @@ fn item_function(w: &mut fmt::Formatter, cx: &Context, it: &clean::Item,
} }
fn render_implementor(cx: &Context, implementor: &Impl, w: &mut fmt::Formatter, fn render_implementor(cx: &Context, implementor: &Impl, w: &mut fmt::Formatter,
implementor_dups: &FxHashMap<&str, (DefId, bool)>) -> Result<(), fmt::Error> { implementor_dups: &FxHashMap<&str, (DefId, bool)>) -> fmt::Result {
write!(w, "<li><table class='table-display'><tbody><tr><td><code>")?; write!(w, "<li><table class='table-display'><tbody><tr><td><code>")?;
// If there's already another implementor that has the same abbridged name, use the // If there's already another implementor that has the same abbridged name, use the
// full path, for example in `std::iter::ExactSizeIterator` // full path, for example in `std::iter::ExactSizeIterator`
@ -2612,7 +2612,7 @@ fn render_implementor(cx: &Context, implementor: &Impl, w: &mut fmt::Formatter,
fn render_impls(cx: &Context, w: &mut fmt::Formatter, fn render_impls(cx: &Context, w: &mut fmt::Formatter,
traits: &[&&Impl], traits: &[&&Impl],
containing_item: &clean::Item) -> Result<(), fmt::Error> { containing_item: &clean::Item) -> fmt::Result {
for i in traits { for i in traits {
let did = i.trait_did().unwrap(); let did = i.trait_did().unwrap();
let assoc_link = AssocItemLink::GotoSource(did, &i.inner_impl().provided_trait_methods); let assoc_link = AssocItemLink::GotoSource(did, &i.inner_impl().provided_trait_methods);

View file

@ -1460,7 +1460,7 @@ impl<P: AsRef<Path>> iter::Extend<P> for PathBuf {
#[stable(feature = "rust1", since = "1.0.0")] #[stable(feature = "rust1", since = "1.0.0")]
impl fmt::Debug for PathBuf { impl fmt::Debug for PathBuf {
fn fmt(&self, formatter: &mut fmt::Formatter) -> Result<(), fmt::Error> { fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
fmt::Debug::fmt(&**self, formatter) fmt::Debug::fmt(&**self, formatter)
} }
} }

View file

@ -48,13 +48,13 @@ impl Error {
} }
impl fmt::Debug for Error { impl fmt::Debug for Error {
fn fmt(&self, f: &mut fmt::Formatter) -> result::Result<(), fmt::Error> { fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
f.write_str(self.text()) f.write_str(self.text())
} }
} }
impl fmt::Display for Error { impl fmt::Display for Error {
fn fmt(&self, f: &mut fmt::Formatter) -> result::Result<(), fmt::Error> { fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
f.write_str(self.text()) f.write_str(self.text())
} }
} }

View file

@ -56,7 +56,7 @@ pub struct CodePoint {
/// Example: `U+1F4A9` /// Example: `U+1F4A9`
impl fmt::Debug for CodePoint { impl fmt::Debug for CodePoint {
#[inline] #[inline]
fn fmt(&self, formatter: &mut fmt::Formatter) -> Result<(), fmt::Error> { fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
write!(formatter, "U+{:04X}", self.value) write!(formatter, "U+{:04X}", self.value)
} }
} }
@ -144,7 +144,7 @@ impl ops::DerefMut for Wtf8Buf {
/// Example: `"a\u{D800}"` for a string with code points [U+0061, U+D800] /// Example: `"a\u{D800}"` for a string with code points [U+0061, U+D800]
impl fmt::Debug for Wtf8Buf { impl fmt::Debug for Wtf8Buf {
#[inline] #[inline]
fn fmt(&self, formatter: &mut fmt::Formatter) -> Result<(), fmt::Error> { fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
fmt::Debug::fmt(&**self, formatter) fmt::Debug::fmt(&**self, formatter)
} }
} }

View file

@ -989,7 +989,7 @@ mod strcursor {
} }
impl<'a> std::fmt::Debug for StrCursor<'a> { impl<'a> std::fmt::Debug for StrCursor<'a> {
fn fmt(&self, fmt: &mut std::fmt::Formatter) -> Result<(), std::fmt::Error> { fn fmt(&self, fmt: &mut std::fmt::Formatter) -> std::fmt::Result {
write!(fmt, "StrCursor({:?} | {:?})", self.slice_before(), self.slice_after()) write!(fmt, "StrCursor({:?} | {:?})", self.slice_before(), self.slice_after())
} }
} }

View file

@ -15,7 +15,7 @@ use std::{env, fmt, process, sync, thread};
struct SlowFmt(u32); struct SlowFmt(u32);
impl fmt::Debug for SlowFmt { impl fmt::Debug for SlowFmt {
fn fmt(&self, f: &mut fmt::Formatter) -> Result<(), fmt::Error> { fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
thread::sleep_ms(3); thread::sleep_ms(3);
self.0.fmt(f) self.0.fmt(f)
} }

View file

@ -15,7 +15,7 @@ union U {
} }
impl fmt::Display for U { impl fmt::Display for U {
fn fmt(&self, f: &mut fmt::Formatter) -> Result<(), fmt::Error> { fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
unsafe { write!(f, "Oh hai {}", self.a) } unsafe { write!(f, "Oh hai {}", self.a) }
} }
} }