fixes for new rules for lifetimes and destructors.

note that some of these cases may actually be fixes to latent bugs, in
some sense (depending on what our guarantees are about e.g. what a
hashmap should be allowed to access in its own destructor).

Author: pnkfelix

src/libregex/vm.rs

@@ -120,8 +120,10 @@ impl<'r, 't> Nfa<'r, 't> {
         };
         let mut matched = false;
         let ninsts = self.prog.insts.len();
-        let mut clist = &mut Threads::new(self.which, ninsts, ncaps);
-        let mut nlist = &mut Threads::new(self.which, ninsts, ncaps);
+        let mut cthread = Threads::new(self.which, ninsts, ncaps);
+        let mut nthread = Threads::new(self.which, ninsts, ncaps);
+        let mut clist = &mut cthread;
+        let mut nlist = &mut nthread;
 
         let mut groups: Vec<_> = repeat(None).take(ncaps * 2).collect();
 

src/test/auxiliary/issue-2631-a.rs

@@ -19,5 +19,6 @@ pub type header_map = HashMap<String, Rc<RefCell<Vec<Rc<String>>>>>;
 
 // the unused ty param is necessary so this gets monomorphized
 pub fn request<T>(req: &header_map) {
-  let _x = req["METHOD".to_string()].clone().borrow().clone()[0].clone();
+  let data = req["METHOD".to_string()].clone();
+  let _x = data.borrow().clone()[0].clone();
 }

src/test/run-pass/issue-13304.rs

@@ -37,7 +37,8 @@ fn parent() {
 }
 
 fn child() {
-    for line in io::stdin().lock().lines() {
+    let mut stdin = io::stdin();
+    for line in stdin.lock().lines() {
         println!("{}", line.unwrap());
-    }
+    };
 }

src/test/run-pass/issue-14456.rs

@@ -27,7 +27,8 @@ fn main() {
 fn child() {
     io::stdout().write_line("foo").unwrap();
     io::stderr().write_line("bar").unwrap();
-    assert_eq!(io::stdin().lock().read_line().err().unwrap().kind, io::EndOfFile);
+    let mut stdin = io::stdin();
+    assert_eq!(stdin.lock().read_line().err().unwrap().kind, io::EndOfFile);
 }
 
 fn test() {

src/test/run-pass/issue-3026.rs

@@ -17,7 +17,7 @@ extern crate collections;
 use std::collections::HashMap;
 
 pub fn main() {
-    let mut buggy_map: HashMap<uint, &uint> = HashMap::new();
     let x = box 1;
+    let mut buggy_map: HashMap<uint, &uint> = HashMap::new();
     buggy_map.insert(42, &*x);
 }

src/test/run-pass/multidispatch-conditional-impl-not-considered.rs

@@ -29,5 +29,5 @@ impl Bar {
 
 fn main() {
     let b = RefCell::new(Bar);
-    b.borrow().foo()
+    b.borrow().foo();
 }