From 7091fe39720b6a41b1eb08044fccd23d37d3166f Mon Sep 17 00:00:00 2001
From: John Gallagher <jgallagher@bignerdranch.com>
Date: Tue, 7 Oct 2014 22:18:12 -0400
Subject: [PATCH] Remove use of `final` and `override` (now reserved)

---
 src/librustc/middle/trans/reflect.rs | 8 ++++----
 src/libstd/io/timer.rs               | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/librustc/middle/trans/reflect.rs b/src/librustc/middle/trans/reflect.rs
index bff1a0400a9..ebdd2eb6354 100644
--- a/src/librustc/middle/trans/reflect.rs
+++ b/src/librustc/middle/trans/reflect.rs
@@ -436,20 +436,20 @@ pub fn emit_calls_to_trait_visit_ty<'blk, 'tcx>(bcx: Block<'blk, 'tcx>,
                                                 visitor_trait_id: DefId)
                                                 -> Block<'blk, 'tcx> {
     let fcx = bcx.fcx;
-    let final = fcx.new_temp_block("final");
+    let final_bcx = fcx.new_temp_block("final");
     let tydesc_ty = ty::get_tydesc_ty(bcx.tcx()).unwrap();
     let tydesc_ty = type_of(bcx.ccx(), tydesc_ty);
     let visitor_items = ty::trait_items(bcx.tcx(), visitor_trait_id);
     let mut r = Reflector {
         visitor_val: visitor_val,
         visitor_items: visitor_items.as_slice(),
-        final_bcx: final,
+        final_bcx: final_bcx,
         tydesc_ty: tydesc_ty,
         bcx: bcx
     };
     r.visit_ty(t);
-    Br(r.bcx, final.llbb);
-    return final;
+    Br(r.bcx, final_bcx.llbb);
+    return final_bcx;
 }
 
 pub fn ast_fn_style_constant(fn_style: ast::FnStyle) -> uint {
diff --git a/src/libstd/io/timer.rs b/src/libstd/io/timer.rs
index 55d4073154e..e7df0285540 100644
--- a/src/libstd/io/timer.rs
+++ b/src/libstd/io/timer.rs
@@ -308,7 +308,7 @@ mod test {
     }
 
     #[test]
-    fn override() {
+    fn test_override() {
         let mut timer = Timer::new().unwrap();
         let orx = timer.oneshot(Duration::milliseconds(100));
         let prx = timer.periodic(Duration::milliseconds(100));