From 410f8509b5ef5286195200eb5806e9fa1777b58e Mon Sep 17 00:00:00 2001
From: Michael Woerister <michaelwoerister@posteo>
Date: Wed, 29 Nov 2017 12:42:59 +0100
Subject: [PATCH] incr.comp.: Use the awesome new '_ in a few places.

---
 src/librustc/dep_graph/graph.rs       |  8 ++++----
 src/librustc/ty/maps/config.rs        | 12 ++++++------
 src/librustc/ty/maps/on_disk_cache.rs | 22 +++++++++++-----------
 3 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/src/librustc/dep_graph/graph.rs b/src/librustc/dep_graph/graph.rs
index e8e284236c8..96d6b0f79cf 100644
--- a/src/librustc/dep_graph/graph.rs
+++ b/src/librustc/dep_graph/graph.rs
@@ -461,10 +461,10 @@ impl DepGraph {
         self.data.as_ref().and_then(|data| data.colors.borrow().get(dep_node).cloned())
     }
 
-    pub fn try_mark_green<'a, 'tcx>(&self,
-                                    tcx: TyCtxt<'a, 'tcx, 'tcx>,
-                                    dep_node: &DepNode)
-                                    -> Option<DepNodeIndex> {
+    pub fn try_mark_green<'tcx>(&self,
+                                tcx: TyCtxt<'_, 'tcx, 'tcx>,
+                                dep_node: &DepNode)
+                                -> Option<DepNodeIndex> {
         debug!("try_mark_green({:?}) - BEGIN", dep_node);
         let data = self.data.as_ref().unwrap();
 
diff --git a/src/librustc/ty/maps/config.rs b/src/librustc/ty/maps/config.rs
index ffddde557da..496284ad9c9 100644
--- a/src/librustc/ty/maps/config.rs
+++ b/src/librustc/ty/maps/config.rs
@@ -31,9 +31,9 @@ pub(super) trait QueryDescription<'tcx>: QueryConfig {
         false
     }
 
-    fn try_load_from_disk<'a>(_: TyCtxt<'a, 'tcx, 'tcx>,
-                              _: SerializedDepNodeIndex)
-                              -> Option<Self::Value> {
+    fn try_load_from_disk(_: TyCtxt<'_, 'tcx, 'tcx>,
+                          _: SerializedDepNodeIndex)
+                          -> Option<Self::Value> {
         bug!("QueryDescription::load_from_disk() called for unsupport query.")
     }
 }
@@ -556,9 +556,9 @@ impl<'tcx> QueryDescription<'tcx> for queries::typeck_tables_of<'tcx> {
         def_id.is_local()
     }
 
-    fn try_load_from_disk<'a>(tcx: TyCtxt<'a, 'tcx, 'tcx>,
-                              id: SerializedDepNodeIndex)
-                              -> Option<Self::Value> {
+    fn try_load_from_disk(tcx: TyCtxt<'_, 'tcx, 'tcx>,
+                          id: SerializedDepNodeIndex)
+                          -> Option<Self::Value> {
         let typeck_tables: Option<ty::TypeckTables<'tcx>> = tcx
             .on_disk_query_result_cache
             .try_load_query_result(tcx, id);
diff --git a/src/librustc/ty/maps/on_disk_cache.rs b/src/librustc/ty/maps/on_disk_cache.rs
index ca0c3bafea8..c0daba5cace 100644
--- a/src/librustc/ty/maps/on_disk_cache.rs
+++ b/src/librustc/ty/maps/on_disk_cache.rs
@@ -291,10 +291,10 @@ impl<'sess> OnDiskCache<'sess> {
 
     /// Returns the cached query result if there is something in the cache for
     /// the given SerializedDepNodeIndex. Otherwise returns None.
-    pub fn try_load_query_result<'a, 'tcx, T>(&self,
-                                              tcx: TyCtxt<'a, 'tcx, 'tcx>,
-                                              dep_node_index: SerializedDepNodeIndex)
-                                              -> Option<T>
+    pub fn try_load_query_result<'tcx, T>(&self,
+                                          tcx: TyCtxt<'_, 'tcx, 'tcx>,
+                                          dep_node_index: SerializedDepNodeIndex)
+                                          -> Option<T>
         where T: Decodable
     {
         self.load_indexed(tcx,
@@ -319,13 +319,13 @@ impl<'sess> OnDiskCache<'sess> {
         x.extend(diagnostics.into_iter());
     }
 
-    fn load_indexed<'a, 'tcx, T>(&self,
-                                 tcx: TyCtxt<'a, 'tcx, 'tcx>,
-                                 dep_node_index: SerializedDepNodeIndex,
-                                 index: &FxHashMap<SerializedDepNodeIndex,
-                                                   AbsoluteBytePos>,
-                                 debug_tag: &'static str)
-                                 -> Option<T>
+    fn load_indexed<'tcx, T>(&self,
+                             tcx: TyCtxt<'_, 'tcx, 'tcx>,
+                             dep_node_index: SerializedDepNodeIndex,
+                             index: &FxHashMap<SerializedDepNodeIndex,
+                                               AbsoluteBytePos>,
+                             debug_tag: &'static str)
+                             -> Option<T>
         where T: Decodable
     {
         let pos = if let Some(&pos) = index.get(&dep_node_index) {