---

yaml
---
r: 147645
b: refs/heads/try2
c: 9ff65b5
h: refs/heads/master
i:
  147643: 8c924be
v: v3

Author: pcwalton

[refs]

@@ -5,7 +5,7 @@ refs/heads/snap-stage3: 78a7676898d9f80ab540c6df5d4c9ce35bb50463
 refs/heads/try: 519addf6277dbafccbb4159db4b710c37eaa2ec5
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
-refs/heads/try2: a5d976297285ad837e5c7e3a4ce5e9d01d3848c5
+refs/heads/try2: 9ff65b503f0ecb00e5ddcda1776b1c55b123fc46
 refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/try2/src/librustc/front/test.rs

@@ -14,6 +14,7 @@
 use driver::session;
 use front::config;
 
+use std::cell::RefCell;
 use std::vec;
 use syntax::ast_util::*;
 use syntax::attr::AttrMetaMethods;
@@ -38,7 +39,7 @@ struct Test {
 
 struct TestCtxt {
     sess: session::Session,
-    path: ~[ast::Ident],
+    path: RefCell<~[ast::Ident]>,
     ext_cx: @ExtCtxt,
     testfns: ~[Test],
     is_extra: bool,
@@ -78,9 +79,12 @@ impl fold::ast_fold for TestHarnessGenerator {
     }
 
     fn fold_item(&self, i: @ast::item) -> SmallVector<@ast::item> {
-        self.cx.path.push(i.ident);
+        {
+            let mut path = self.cx.path.borrow_mut();
+            path.get().push(i.ident);
+        }
         debug!("current path: {}",
-               ast_util::path_name_i(self.cx.path.clone()));
+               ast_util::path_name_i(self.cx.path.get()));
 
         if is_test_fn(self.cx, i) || is_bench_fn(i) {
             match i.node {
@@ -95,7 +99,7 @@ impl fold::ast_fold for TestHarnessGenerator {
                     debug!("this is a test function");
                     let test = Test {
                         span: i.span,
-                        path: self.cx.path.clone(),
+                        path: self.cx.path.get(),
                         bench: is_bench_fn(i),
                         ignore: is_ignored(self.cx, i),
                         should_fail: should_fail(i)
@@ -108,7 +112,10 @@ impl fold::ast_fold for TestHarnessGenerator {
         }
 
         let res = fold::noop_fold_item(i, self);
-        self.cx.path.pop();
+        {
+            let mut path = self.cx.path.borrow_mut();
+            path.get().pop();
+        }
         res
     }
 
@@ -147,7 +154,7 @@ fn generate_test_harness(sess: session::Session, crate: ast::Crate)
     let cx: @mut TestCtxt = @mut TestCtxt {
         sess: sess,
         ext_cx: ExtCtxt::new(sess.parse_sess, sess.opts.cfg.clone()),
-        path: ~[],
+        path: RefCell::new(~[]),
         testfns: ~[],
         is_extra: is_extra(&crate),
         config: crate.config.clone(),