From 72dc29c260cb6730449ed789c8a0ab4292acb7b0 Mon Sep 17 00:00:00 2001
From: Camille GILLOT <gillot.camille@gmail.com>
Date: Sun, 31 Oct 2021 18:39:39 +0100
Subject: [PATCH] Handle `allow(elided_lifetimes_in_paths)`.

---
 .../rustc_resolve/src/late/diagnostics.rs     | 57 +++++++++----------
 .../in-band-lifetimes/elided-lifetimes.fixed  |  8 +++
 .../ui/in-band-lifetimes/elided-lifetimes.rs  |  8 +++
 .../in-band-lifetimes/elided-lifetimes.stderr |  2 +-
 4 files changed, 44 insertions(+), 31 deletions(-)

diff --git a/compiler/rustc_resolve/src/late/diagnostics.rs b/compiler/rustc_resolve/src/late/diagnostics.rs
index 2186a9a73c58..d140c2da9bda 100644
--- a/compiler/rustc_resolve/src/late/diagnostics.rs
+++ b/compiler/rustc_resolve/src/late/diagnostics.rs
@@ -1951,38 +1951,35 @@ impl<'tcx> LifetimeContext<'_, 'tcx> {
     }
 
     crate fn report_elided_lifetime_in_ty(&self, lifetime_refs: &[&hir::Lifetime]) {
-        let missing_lifetimes = lifetime_refs
-            .iter()
-            .filter(|a| matches!(a, hir::Lifetime { name: hir::LifetimeName::ImplicitMissing, .. }))
-            .count();
+        let Some(missing_lifetime) = lifetime_refs.iter().find(|lt| {
+            lt.name == hir::LifetimeName::ImplicitMissing
+        }) else { return };
 
-        if missing_lifetimes > 0 {
-            let mut spans: Vec<_> = lifetime_refs.iter().map(|lt| lt.span).collect();
-            spans.sort();
-            let mut spans_dedup = spans.clone();
-            spans_dedup.dedup();
-            let spans_with_counts: Vec<_> = spans_dedup
-                .into_iter()
-                .map(|sp| (sp, spans.iter().filter(|nsp| *nsp == &sp).count()))
-                .collect();
+        let mut spans: Vec<_> = lifetime_refs.iter().map(|lt| lt.span).collect();
+        spans.sort();
+        let mut spans_dedup = spans.clone();
+        spans_dedup.dedup();
+        let spans_with_counts: Vec<_> = spans_dedup
+            .into_iter()
+            .map(|sp| (sp, spans.iter().filter(|nsp| *nsp == &sp).count()))
+            .collect();
 
-            self.tcx.struct_span_lint_hir(
-                rustc_session::lint::builtin::ELIDED_LIFETIMES_IN_PATHS,
-                hir::CRATE_HIR_ID,
-                spans,
-                |lint| {
-                    let mut db = lint.build("hidden lifetime parameters in types are deprecated");
-                    self.add_missing_lifetime_specifiers_label(
-                        &mut db,
-                        spans_with_counts,
-                        &FxHashSet::from_iter([kw::UnderscoreLifetime]),
-                        Vec::new(),
-                        &[],
-                    );
-                    db.emit()
-                },
-            );
-        }
+        self.tcx.struct_span_lint_hir(
+            rustc_session::lint::builtin::ELIDED_LIFETIMES_IN_PATHS,
+            missing_lifetime.hir_id,
+            spans,
+            |lint| {
+                let mut db = lint.build("hidden lifetime parameters in types are deprecated");
+                self.add_missing_lifetime_specifiers_label(
+                    &mut db,
+                    spans_with_counts,
+                    &FxHashSet::from_iter([kw::UnderscoreLifetime]),
+                    Vec::new(),
+                    &[],
+                );
+                db.emit()
+            },
+        );
     }
 
     // FIXME(const_generics): This patches over an ICE caused by non-'static lifetimes in const
diff --git a/src/test/ui/in-band-lifetimes/elided-lifetimes.fixed b/src/test/ui/in-band-lifetimes/elided-lifetimes.fixed
index 35e0701103c5..87a79b881377 100644
--- a/src/test/ui/in-band-lifetimes/elided-lifetimes.fixed
+++ b/src/test/ui/in-band-lifetimes/elided-lifetimes.fixed
@@ -96,6 +96,14 @@ macro_rules! anytuple_ref_ty {
     }
 }
 
+#[allow(elided_lifetimes_in_paths)]
+mod blah {
+    struct Thing<'a>(&'a i32);
+    struct Bar<T>(T);
+
+    fn foo(b: Bar<Thing>) {}
+}
+
 fn main() {
     let honesty = RefCell::new((4, 'e'));
     let loyalty: Ref<'_, (u32, char)> = honesty.borrow();
diff --git a/src/test/ui/in-band-lifetimes/elided-lifetimes.rs b/src/test/ui/in-band-lifetimes/elided-lifetimes.rs
index 4ad6141eda58..28323a22427b 100644
--- a/src/test/ui/in-band-lifetimes/elided-lifetimes.rs
+++ b/src/test/ui/in-band-lifetimes/elided-lifetimes.rs
@@ -96,6 +96,14 @@ macro_rules! anytuple_ref_ty {
     }
 }
 
+#[allow(elided_lifetimes_in_paths)]
+mod blah {
+    struct Thing<'a>(&'a i32);
+    struct Bar<T>(T);
+
+    fn foo(b: Bar<Thing>) {}
+}
+
 fn main() {
     let honesty = RefCell::new((4, 'e'));
     let loyalty: Ref<(u32, char)> = honesty.borrow();
diff --git a/src/test/ui/in-band-lifetimes/elided-lifetimes.stderr b/src/test/ui/in-band-lifetimes/elided-lifetimes.stderr
index b6994a3673ab..2e65461b321e 100644
--- a/src/test/ui/in-band-lifetimes/elided-lifetimes.stderr
+++ b/src/test/ui/in-band-lifetimes/elided-lifetimes.stderr
@@ -90,7 +90,7 @@ LL |         fn $fn_name(gift: &str) -> $type_name<'_> {
    |                                    ~~~~~~~~~~~~~~
 
 error: hidden lifetime parameters in types are deprecated
-  --> $DIR/elided-lifetimes.rs:101:22
+  --> $DIR/elided-lifetimes.rs:109:22
    |
 LL |     let loyalty: Ref<(u32, char)> = honesty.borrow();
    |                      ^ expected named lifetime parameter