about summary refs log tree commit diff
path: root/src/rustc/middle
diff options
context:
space:
mode:
authorNiko Matsakis <niko@alum.mit.edu>2012-07-31 21:08:24 -0700
committerNiko Matsakis <niko@alum.mit.edu>2012-07-31 22:00:19 -0700
commita334deb5d58c455e20fececea649c4997c6867ca (patch)
tree7b176ebcfd37e07d86e91d576293be2ccb62a716 /src/rustc/middle
parentc5437c0bbf65204390762acfc544fb29b3150619 (diff)
change how we print and explain region types
Diffstat (limited to 'src/rustc/middle')
-rw-r--r--src/rustc/middle/ty.rs10
1 files changed, 4 insertions, 6 deletions
diff --git a/src/rustc/middle/ty.rs b/src/rustc/middle/ty.rs
index 71e0fedef61..aba8d250b20 100644
--- a/src/rustc/middle/ty.rs
+++ b/src/rustc/middle/ty.rs
@@ -9,8 +9,7 @@ import syntax::ast_util::{is_local, local_def, split_class_items,
                           new_def_hash};
 import syntax::codemap::span;
 import metadata::csearch;
-import util::ppaux::region_to_str;
-import util::ppaux::vstore_to_str;
+import util::ppaux::{region_to_str, explain_region, vstore_to_str};
 import middle::lint;
 import middle::lint::{get_lint_level, allow};
 import syntax::ast::*;
@@ -2590,10 +2589,9 @@ fn type_err_to_str(cx: ctxt, err: type_err) -> ~str {
             ~" but found " + mode_to_str(a_mode);
       }
       terr_regions_differ(subregion, superregion) {
-        ret fmt!{"references with lifetime %s do not necessarily \
-                  outlive references with lifetime %s",
-                 region_to_str(cx, subregion),
-                 region_to_str(cx, superregion)};
+        ret fmt!{"%s does not necessarily outlive %s",
+                 explain_region(cx, subregion),
+                 explain_region(cx, superregion)};
       }
       terr_vstores_differ(k, e_vs, a_vs) {
         ret fmt!{"%s storage differs: expected %s but found %s",