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

Fix minor typo in E0312
Manishearth · May 9, 2016 · 6436b60 · 6436b60
2 parents 35cc6b0 + a7439ad
commit 6436b60
Showing 1 changed file with 1 addition and 1 deletion.
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 ",