From ef485c6fa97a562b0bc559ffbe38fee9bf1f745b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Beno=C3=AEt=20du=20Garreau?= <bdgdlm@outlook.com>
Date: Tue, 7 Apr 2020 14:51:47 +0200
Subject: [PATCH] Impl Error for Infallible

---
 src/libstd/error.rs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/libstd/error.rs b/src/libstd/error.rs
index 24b57f12e8df4..3b4cb859dd425 100644
--- a/src/libstd/error.rs
+++ b/src/libstd/error.rs
@@ -14,6 +14,7 @@
 // reconsider what crate these items belong in.
 
 use core::array;
+use core::convert::Infallible;
 
 use crate::alloc::{AllocErr, LayoutErr};
 use crate::any::TypeId;
@@ -474,7 +475,7 @@ impl Error for string::FromUtf16Error {
 }
 
 #[stable(feature = "str_parse_error2", since = "1.8.0")]
-impl Error for string::ParseError {
+impl Error for Infallible {
     fn description(&self) -> &str {
         match *self {}
     }