Rollup merge of rust-lang#33496 - silvo38:master, r=apasel422

Manishearth · Manishearth · commit 181a6300e2d6 · 2016-05-09T12:49:45.000-07:00
Fix minor typo in E0312
diff --git a/src/librustc/infer/error_reporting.rs b/src/librustc/infer/error_reporting.rs
@@ -735,7 +735,7 @@ impl<'a, 'tcx> ErrorReporting<'tcx> for InferCtxt<'a, 'tcx> {
             }
             infer::Reborrow(span) => {
                 let mut err = struct_span_err!(self.tcx.sess, span, E0312,
-                    "lifetime of reference outlines \
+                    "lifetime of reference outlives \
                      lifetime of borrowed content...");
                 self.tcx.note_and_explain_region(&mut err,
                     "...the reference is valid for ",

Original file line number	Diff line number	Diff line change
`@@ -735,7 +735,7 @@ impl<'a, 'tcx> ErrorReporting<'tcx> for InferCtxt<'a, 'tcx> {`
`735`	`735`	`}`
`736`	`736`	`infer::Reborrow(span) => {`
`737`	`737`	`let mut err = struct_span_err!(self.tcx.sess, span, E0312,`
`738`		`- "lifetime of reference outlines \`
	`738`	`+ "lifetime of reference outlives \`
`739`	`739`	`lifetime of borrowed content...");`
`740`	`740`	`self.tcx.note_and_explain_region(&mut err,`
`741`	`741`	`"...the reference is valid for ",`