From 2e1b98d34f105f4632b30bcd5c51e40cb7a1b637 Mon Sep 17 00:00:00 2001 From: Ben Blum <bblum@andrew.cmu.edu> Date: Mon, 13 Aug 2012 21:53:41 -0400 Subject: [PATCH] Change borrowck error 'the the block' -> 'the block' --- src/rustc/util/ppaux.rs | 2 +- src/test/compile-fail/borrowck-confuse-region.rs | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/rustc/util/ppaux.rs b/src/rustc/util/ppaux.rs index 98bae1fa6c0..d471abbd4b6 100644 --- a/src/rustc/util/ppaux.rs +++ b/src/rustc/util/ppaux.rs @@ -50,7 +50,7 @@ fn explain_region(cx: ctxt, region: ty::region) -> ~str { some(ast_map::node_block(blk)) => { fmt!{"the lifetime %s as defined on %s", bound_region_to_str(cx, br), - explain_span(cx, ~"the block", blk.span)} + explain_span(cx, ~"block", blk.span)} } some(_) | none => { // this really should not happen diff --git a/src/test/compile-fail/borrowck-confuse-region.rs b/src/test/compile-fail/borrowck-confuse-region.rs index cb78ca00fd2..5183b4b39e5 100644 --- a/src/test/compile-fail/borrowck-confuse-region.rs +++ b/src/test/compile-fail/borrowck-confuse-region.rs @@ -8,7 +8,7 @@ fn get() -> &int { let x = 3; return &x; - //~^ ERROR illegal borrow: borrowed pointer must be valid for the lifetime & as defined on the the block at 8:17, but the borrowed value is only valid for the block at 8:17 + //~^ ERROR illegal borrow: borrowed pointer must be valid for the lifetime & as defined on the block at 8:17, but the borrowed value is only valid for the block at 8:17 } -fn main() {} \ No newline at end of file +fn main() {}