From 4bcfaeb33ede812d8163755051ae667f0b9dcc4f Mon Sep 17 00:00:00 2001
From: Folyd <lyshuhow@gmail.com>
Date: Wed, 9 Mar 2022 01:13:16 +0800
Subject: [PATCH] chore: replace `Never` with `Infallible` (#612)

Co-authored-by: Eliza Weisman <eliza@buoyant.io>
---
 tower/src/discover/error.rs          | 12 ------------
 tower/src/discover/list.rs           |  5 +++--
 tower/src/discover/mod.rs            |  1 -
 tower/src/limit/concurrency/never.rs | 12 ------------
 tower/src/retry/never.rs             | 13 -------------
 5 files changed, 3 insertions(+), 40 deletions(-)
 delete mode 100644 tower/src/discover/error.rs
 delete mode 100644 tower/src/limit/concurrency/never.rs
 delete mode 100644 tower/src/retry/never.rs

diff --git a/tower/src/discover/error.rs b/tower/src/discover/error.rs
deleted file mode 100644
index cec3de46..00000000
--- a/tower/src/discover/error.rs
+++ /dev/null
@@ -1,12 +0,0 @@
-use std::{error::Error, fmt};
-
-#[derive(Debug)]
-pub enum Never {}
-
-impl fmt::Display for Never {
-    fn fmt(&self, _: &mut fmt::Formatter) -> fmt::Result {
-        match *self {}
-    }
-}
-
-impl Error for Never {}
diff --git a/tower/src/discover/list.rs b/tower/src/discover/list.rs
index b4198025..363bdd57 100644
--- a/tower/src/discover/list.rs
+++ b/tower/src/discover/list.rs
@@ -1,6 +1,7 @@
-use super::{error::Never, Change};
+use super::Change;
 use futures_core::Stream;
 use pin_project_lite::pin_project;
+use std::convert::Infallible;
 use std::iter::{Enumerate, IntoIterator};
 use std::{
     pin::Pin,
@@ -41,7 +42,7 @@ impl<T, U> Stream for ServiceList<T>
 where
     T: IntoIterator<Item = U>,
 {
-    type Item = Result<Change<usize, U>, Never>;
+    type Item = Result<Change<usize, U>, Infallible>;
 
     fn poll_next(self: Pin<&mut Self>, _: &mut Context<'_>) -> Poll<Option<Self::Item>> {
         match self.project().inner.next() {
diff --git a/tower/src/discover/mod.rs b/tower/src/discover/mod.rs
index 3b3ba212..ec51f158 100644
--- a/tower/src/discover/mod.rs
+++ b/tower/src/discover/mod.rs
@@ -33,7 +33,6 @@
 //!
 //! [`TryStream`]: https://docs.rs/futures/latest/futures/stream/trait.TryStream.html
 
-mod error;
 mod list;
 
 pub use self::list::ServiceList;
diff --git a/tower/src/limit/concurrency/never.rs b/tower/src/limit/concurrency/never.rs
deleted file mode 100644
index 3bb12aae..00000000
--- a/tower/src/limit/concurrency/never.rs
+++ /dev/null
@@ -1,12 +0,0 @@
-use std::fmt;
-#[derive(Debug)]
-/// An error that can never occur.
-pub enum Never {}
-
-impl fmt::Display for Never {
-    fn fmt(&self, _: &mut fmt::Formatter) -> fmt::Result {
-        match *self {}
-    }
-}
-
-impl std::error::Error for Never {}
diff --git a/tower/src/retry/never.rs b/tower/src/retry/never.rs
deleted file mode 100644
index af7264b3..00000000
--- a/tower/src/retry/never.rs
+++ /dev/null
@@ -1,13 +0,0 @@
-use std::fmt;
-
-#[derive(Debug)]
-/// An error that can never occur.
-pub enum Never {}
-
-impl fmt::Display for Never {
-    fn fmt(&self, _: &mut fmt::Formatter) -> fmt::Result {
-        match *self {}
-    }
-}
-
-impl std::error::Error for Never {}