Skip to content

Commit

Permalink
Merge pull request #398 from dtolnay/ra_hir_def
Browse files Browse the repository at this point in the history
Resolve possible inference disruption by removing unneeded From impl
  • Loading branch information
KodrAus committed Jun 4, 2020
2 parents 4fb398b + f3cce30 commit c5c8e48
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 9 deletions.
6 changes: 0 additions & 6 deletions src/kv/error.rs
Expand Up @@ -41,12 +41,6 @@ impl From<fmt::Error> for Error {
}
}

impl From<Error> for fmt::Error {
fn from(_: Error) -> Self {
fmt::Error
}
}

#[cfg(feature = "std")]
mod std_support {
use super::*;
Expand Down
4 changes: 2 additions & 2 deletions src/kv/value/internal/fmt.rs
Expand Up @@ -65,15 +65,15 @@ pub(in kv::value) use self::fmt::{Arguments, Debug, Display};

impl<'v> fmt::Debug for kv::Value<'v> {
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
self.visit(&mut FmtVisitor(f))?;
self.visit(&mut FmtVisitor(f)).map_err(|_| fmt::Error)?;

Ok(())
}
}

impl<'v> fmt::Display for kv::Value<'v> {
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
self.visit(&mut FmtVisitor(f))?;
self.visit(&mut FmtVisitor(f)).map_err(|_| fmt::Error)?;

Ok(())
}
Expand Down
2 changes: 1 addition & 1 deletion src/lib.rs
Expand Up @@ -747,7 +747,7 @@ struct KeyValues<'a>(&'a dyn kv::Source);
impl<'a> fmt::Debug for KeyValues<'a> {
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
let mut visitor = f.debug_map();
self.0.visit(&mut visitor)?;
self.0.visit(&mut visitor).map_err(|_| fmt::Error)?;
visitor.finish()
}
}
Expand Down

0 comments on commit c5c8e48

Please sign in to comment.