From 388defad2d754cf9fc6ec69d67692f437393fd03 Mon Sep 17 00:00:00 2001
From: Inokentiy Babushkin <twk@twki.de>
Date: Sun, 15 Apr 2018 15:47:56 +0200
Subject: [PATCH] Simplified name mapping in auto trait handling.

---
 src/librustc/traits/auto_trait.rs  | 8 +++-----
 src/librustdoc/clean/auto_trait.rs | 2 +-
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/src/librustc/traits/auto_trait.rs b/src/librustc/traits/auto_trait.rs
index 4d52d7132df..db8f59ce954 100644
--- a/src/librustc/traits/auto_trait.rs
+++ b/src/librustc/traits/auto_trait.rs
@@ -55,7 +55,7 @@ impl<A> AutoTraitResult<A> {
 pub struct AutoTraitInfo<'cx> {
     pub full_user_env: ty::ParamEnv<'cx>,
     pub region_data: RegionConstraintData<'cx>,
-    pub names_map: FxHashMap<String, String>,
+    pub names_map: FxHashSet<String>,
     pub vid_to_region: FxHashMap<ty::RegionVid, ty::Region<'cx>>,
 }
 
@@ -206,12 +206,10 @@ impl<'a, 'tcx> AutoTraitFinder<'a, 'tcx> {
                 )
             });
 
-            let names_map: FxHashMap<String, String> = generics
+            let names_map: FxHashSet<String> = generics
                 .regions
                 .iter()
-                .map(|l| (l.name.to_string(), l.name.to_string()))
-                // TODO(twk): Lifetime branding and why is this map a set?!
-                //     l.clean(self.cx) was present in the original code
+                .map(|l| l.name.to_string())
                 .collect();
 
             let body_ids: FxHashSet<_> = infcx
diff --git a/src/librustdoc/clean/auto_trait.rs b/src/librustdoc/clean/auto_trait.rs
index 58ee42402d5..f8c0c404430 100644
--- a/src/librustdoc/clean/auto_trait.rs
+++ b/src/librustdoc/clean/auto_trait.rs
@@ -290,7 +290,7 @@ impl<'a, 'tcx, 'rcx> AutoTraitFinder<'a, 'tcx, 'rcx> {
                     let names_map =
                         info.names_map
                             .drain()
-                            .map(|(name, lifetime)| (name, Lifetime(lifetime)))
+                            .map(|name| (name.clone(), Lifetime(name)))
                             .collect();
                     let lifetime_predicates =
                         self.handle_lifetimes(&region_data, &names_map);