auto merge of #15441 : P1start/rust/lifetime-suggest, r=pcwalton

bors · bors · commit ea037d02deb7 · 2014-07-06T05:46:36.000Z
Closes #15433.
diff --git a/src/librustc/middle/typeck/infer/error_reporting.rs b/src/librustc/middle/typeck/infer/error_reporting.rs
@@ -676,10 +676,10 @@ impl<'a> ErrorReporting for InferCtxt<'a> {
                                var_origins: &[RegionVariableOrigin],
                                trace_origins: &[(TypeTrace, ty::type_err)],
                                same_regions: &[SameRegions]) {
-        self.give_suggestion(same_regions);
         for vo in var_origins.iter() {
             self.report_inference_failure(vo.clone());
         }
+        self.give_suggestion(same_regions);
         for &(ref trace, terr) in trace_origins.iter() {
             self.report_type_error(trace.clone(), &terr);
         }

Original file line number	Diff line number	Diff line change
`@@ -676,10 +676,10 @@ impl<'a> ErrorReporting for InferCtxt<'a> {`
`676`	`676`	`var_origins: &[RegionVariableOrigin],`
`677`	`677`	`trace_origins: &[(TypeTrace, ty::type_err)],`
`678`	`678`	`same_regions: &[SameRegions]) {`
`679`		`- self.give_suggestion(same_regions);`
`680`	`679`	`for vo in var_origins.iter() {`
`681`	`680`	`self.report_inference_failure(vo.clone());`
`682`	`681`	`}`
	`682`	`+ self.give_suggestion(same_regions);`
`683`	`683`	`for &(ref trace, terr) in trace_origins.iter() {`
`684`	`684`	`self.report_type_error(trace.clone(), &terr);`
`685`	`685`	`}`