From 1a439d286530a020bbf7683011f07227e236bd7f Mon Sep 17 00:00:00 2001
From: Josh Stone <jistone@redhat.com>
Date: Mon, 4 May 2020 11:52:15 -0700
Subject: [PATCH] Simplify the error Registry methods a little

---
 src/librustc_errors/registry.rs | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/src/librustc_errors/registry.rs b/src/librustc_errors/registry.rs
index 32700c6500bc8..b1d770d5bd523 100644
--- a/src/librustc_errors/registry.rs
+++ b/src/librustc_errors/registry.rs
@@ -10,12 +10,12 @@ pub struct Registry {
 
 impl Registry {
     pub fn new(long_descriptions: &[(&'static str, Option<&'static str>)]) -> Registry {
-        Registry { long_descriptions: long_descriptions.iter().cloned().collect() }
+        Registry { long_descriptions: long_descriptions.iter().copied().collect() }
     }
 
     /// This will panic if an invalid error code is passed in
     pub fn find_description(&self, code: &str) -> Option<&'static str> {
-        self.try_find_description(code).unwrap()
+        self.long_descriptions[code]
     }
     /// Returns `InvalidErrorCode` if the code requested does not exist in the
     /// registry. Otherwise, returns an `Option` where `None` means the error
@@ -24,9 +24,6 @@ impl Registry {
         &self,
         code: &str,
     ) -> Result<Option<&'static str>, InvalidErrorCode> {
-        if !self.long_descriptions.contains_key(code) {
-            return Err(InvalidErrorCode);
-        }
-        Ok(*self.long_descriptions.get(code).unwrap())
+        self.long_descriptions.get(code).copied().ok_or(InvalidErrorCode)
     }
 }