change check logic

Author: estebank

compiler/rustc_trait_selection/src/error_reporting/infer/need_type_info.rs

@@ -579,7 +579,8 @@ impl<'a, 'tcx> TypeErrCtxt<'a, 'tcx> {
             }
         }
 
-        let time_version = self.detect_old_time_crate_version(failure_span, &mut infer_subdiags);
+        let time_version =
+            self.detect_old_time_crate_version(failure_span, &kind, &mut infer_subdiags);
 
         match error_code {
             TypeAnnotationNeeded::E0282 => self.dcx().create_err(AnnotationRequired {
@@ -625,47 +626,33 @@ impl<'a, 'tcx> TypeErrCtxt<'a, 'tcx> {
     fn detect_old_time_crate_version(
         &self,
         span: Option<Span>,
-        /// We will clear the non-actionable suggestion from the error to reduce noise.
+        kind: &InferSourceKind<'_>,
+        // We will clear the non-actionable suggestion from the error to reduce noise.
         infer_subdiags: &mut Vec<SourceKindSubdiag<'_>>,
     ) -> Option<()> {
         if self.infcx.tcx.crate_name(LOCAL_CRATE) != sym::time {
             // Only relevant when building the `time` crate.
             return None;
         }
-        let Some(span) = span else { return None };
+        let Some(span) = span else {
+            return None;
+        };
+        let InferSourceKind::LetBinding { pattern_name, .. } = kind else {
+            return None;
+        };
+        let Some(name) = pattern_name else {
+            return None;
+        };
+        if name.as_str() != "items" {
+            return None;
+        }
         let FileName::Real(file) = self.infcx.tcx.sess.source_map().span_to_filename(span) else {
             return None;
         };
-        let path = file.local_path_if_available();
-        let mut components = path.components();
-        // We will take the filename of the error and see if it is of the form
-        // `.../registry/src/index.crates.io-.../time-0...`, in order to detect the specific case
-        // we care about.
-        while let Some(component) = components.next() {
-            let std::path::Component::Normal(component) = component else {
-                continue;
-            };
-            if component == "registry"
-                && let Some(next) = components.next()
-                && let std::path::Component::Normal(next) = next
-                && next == "src"
-                && let Some(next) = components.next()
-                && let std::path::Component::Normal(next) = next
-                && next.to_string_lossy().starts_with("index.")
-                && let Some(next) = components.next()
-                && let std::path::Component::Normal(next) = next
-                && let next = next.to_string_lossy()
-                && next.starts_with("time-0.")
-                && let Some(version) = next.split('-').skip(1).next()
-                && let mut segments = version.split('.')
-                && let Some(major) = segments.next()
-                && major == "0"
-                && let Some(minor) = segments.next()
-                && minor == "3"
-            {
-                infer_subdiags.clear();
-                return Some(());
-            }
+        let path = file.local_path_if_available().to_string_lossy();
+        if path.contains("format_description") && path.contains("parse") {
+            infer_subdiags.clear();
+            return Some(());
         }
         None
     }