is_reported flag

Author: mark-i-m

src/librustc_mir/borrow_check/diagnostics/region_errors.rs

@@ -103,18 +103,10 @@ crate enum RegionErrorKind<'tcx> {
         longer_fr: RegionVid,
         /// The region that should be shorter, but we can't prove it
         shorter_fr: RegionVid,
+        /// Indicates whether this is a reported error. We currently only report the first error
+        /// encountered and leave the rest unreported so as not to overwhelm the user.
+        is_reported: bool,
     },
-
-    /// The same as `RegionError`, but this is an unreported error. We currently only report the
-    /// first error encountered and leave the rest unreported so as not to overwhelm the user.
-    UnreportedError {
-        /// The origin of the region
-        fr_origin: NLLRegionVariableOrigin,
-        /// The region that should outlive `shorter_fr`
-        longer_fr: RegionVid,
-        /// The region that should be shorter, but we can't prove it
-        shorter_fr: RegionVid,
-    }
 }
 
 /// Various pieces of state used when reporting borrow checker errors.

src/librustc_mir/borrow_check/mod.rs

@@ -1648,35 +1648,32 @@ impl<'cx, 'tcx> MirBorrowckCtxt<'cx, 'tcx> {
                 }
 
                 RegionErrorKind::RegionError {
-                    fr_origin, longer_fr, shorter_fr,
+                    fr_origin, longer_fr, shorter_fr, is_reported,
                 } => {
-                    let db = self.nonlexical_regioncx.report_error(
-                        &self.body,
-                        &self.local_names,
-                        &self.upvars,
-                        self.infcx,
-                        self.mir_def_id,
-                        longer_fr,
-                        fr_origin,
-                        shorter_fr,
-                        &mut outlives_suggestion,
-                        &mut region_naming,
-                    );
-
-                    db.buffer(&mut self.errors_buffer);
-                }
+                    if is_reported {
+                        let db = self.nonlexical_regioncx.report_error(
+                            &self.body,
+                            &self.local_names,
+                            &self.upvars,
+                            self.infcx,
+                            self.mir_def_id,
+                            longer_fr,
+                            fr_origin,
+                            shorter_fr,
+                            &mut outlives_suggestion,
+                            &mut region_naming,
+                        );
 
-                RegionErrorKind::UnreportedError {
-                    longer_fr, shorter_fr,
-                    fr_origin: _,
-                } => {
-                    // FIXME: currently we do nothing with these, but perhaps we can do better?
-                    // FIXME: try collecting these constraints on the outlives suggestion builder.
-                    // Does it make the suggestions any better?
-                    debug!(
-                        "Unreported region error: can't prove that {:?}: {:?}",
-                        longer_fr, shorter_fr
-                    );
+                        db.buffer(&mut self.errors_buffer);
+                    } else {
+                        // FIXME: currently we do nothing with these, but perhaps we can do better?
+                        // FIXME: try collecting these constraints on the outlives suggestion
+                        // builder. Does it make the suggestions any better?
+                        debug!(
+                            "Unreported region error: can't prove that {:?}: {:?}",
+                            longer_fr, shorter_fr
+                        );
+                    }
                 }
             }
         }

src/librustc_mir/borrow_check/region_infer/mod.rs

@@ -1399,6 +1399,7 @@ impl<'tcx> RegionInferenceContext<'tcx> {
                     longer_fr: *longer_fr,
                     shorter_fr: *shorter_fr,
                     fr_origin: NLLRegionVariableOrigin::FreeRegion,
+                    is_reported: true,
                 });
             }
         }
@@ -1464,6 +1465,7 @@ impl<'tcx> RegionInferenceContext<'tcx> {
                     longer_fr,
                     shorter_fr: representative,
                     fr_origin: NLLRegionVariableOrigin::FreeRegion,
+                    is_reported: true,
                 });
             }
             return;
@@ -1482,17 +1484,11 @@ impl<'tcx> RegionInferenceContext<'tcx> {
                 // We only report the first region error. Subsequent errors are hidden so as
                 // not to overwhelm the user, but we do record them so as to potentially print
                 // better diagnostics elsewhere...
-                if error_reported {
-                    errors_buffer.push(RegionErrorKind::UnreportedError {
-                        longer_fr, shorter_fr,
-                        fr_origin: NLLRegionVariableOrigin::FreeRegion,
-                    });
-                } else {
-                    errors_buffer.push(RegionErrorKind::RegionError {
-                        longer_fr, shorter_fr,
-                        fr_origin: NLLRegionVariableOrigin::FreeRegion,
-                    });
-                }
+                errors_buffer.push(RegionErrorKind::RegionError {
+                    longer_fr, shorter_fr,
+                    fr_origin: NLLRegionVariableOrigin::FreeRegion,
+                    is_reported: !error_reported,
+                });
 
                 error_reported = true;
             }