Skip to content

Commit c5c8e48

Browse files
authored
Merge pull request #398 from dtolnay/ra_hir_def
Resolve possible inference disruption by removing unneeded From impl
2 parents 4fb398b + f3cce30 commit c5c8e48

File tree

3 files changed

+3
-9
lines changed

3 files changed

+3
-9
lines changed

src/kv/error.rs

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -41,12 +41,6 @@ impl From<fmt::Error> for Error {
4141
}
4242
}
4343

44-
impl From<Error> for fmt::Error {
45-
fn from(_: Error) -> Self {
46-
fmt::Error
47-
}
48-
}
49-
5044
#[cfg(feature = "std")]
5145
mod std_support {
5246
use super::*;

src/kv/value/internal/fmt.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,15 +65,15 @@ pub(in kv::value) use self::fmt::{Arguments, Debug, Display};
6565

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

7070
Ok(())
7171
}
7272
}
7373

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

7878
Ok(())
7979
}

src/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -747,7 +747,7 @@ struct KeyValues<'a>(&'a dyn kv::Source);
747747
impl<'a> fmt::Debug for KeyValues<'a> {
748748
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
749749
let mut visitor = f.debug_map();
750-
self.0.visit(&mut visitor)?;
750+
self.0.visit(&mut visitor).map_err(|_| fmt::Error)?;
751751
visitor.finish()
752752
}
753753
}

0 commit comments

Comments
 (0)