From 3f7b112b161dd77d5095417856df327aa50179f4 Mon Sep 17 00:00:00 2001
From: Tim Chevalier <chevalier@alum.wellesley.edu>
Date: Sat, 8 Dec 2012 23:39:52 -0800
Subject: [PATCH] Update and un-xfail crate-method-reexport-grrrrrrr2

Closes #3155
---
 src/test/auxiliary/crate-method-reexport-grrrrrrr2.rs | 4 +---
 src/test/run-pass/crate-method-reexport-grrrrrrr.rs   | 7 +++----
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/src/test/auxiliary/crate-method-reexport-grrrrrrr2.rs b/src/test/auxiliary/crate-method-reexport-grrrrrrr2.rs
index 9ab96f45a34..32cb8bda996 100644
--- a/src/test/auxiliary/crate-method-reexport-grrrrrrr2.rs
+++ b/src/test/auxiliary/crate-method-reexport-grrrrrrr2.rs
@@ -22,9 +22,7 @@ mod name_pool {
 mod rust {
     #[legacy_exports];
 
-    import name_pool::add;
-    // FIXME #3155: this is a hack
-    import name_pool::__extensions__;
+    use name_pool::add;
     export add;
     export rt;
     export cx;
diff --git a/src/test/run-pass/crate-method-reexport-grrrrrrr.rs b/src/test/run-pass/crate-method-reexport-grrrrrrr.rs
index 35c31798e59..a80a21ade8a 100644
--- a/src/test/run-pass/crate-method-reexport-grrrrrrr.rs
+++ b/src/test/run-pass/crate-method-reexport-grrrrrrr.rs
@@ -2,15 +2,14 @@
 // name_pool::methods impl in the other crate is reachable from this
 // crate.
 
-// xfail-test
 // xfail-fast
 // aux-build:crate-method-reexport-grrrrrrr2.rs
 
-use crate_method_reexport_grrrrrrr2;
+extern mod crate_method_reexport_grrrrrrr2;
 
 fn main() {
-    import crate_method_reexport_grrrrrrr2::rust::add;
-    import crate_method_reexport_grrrrrrr2::rust::cx;
+    use crate_method_reexport_grrrrrrr2::rust::add;
+    use crate_method_reexport_grrrrrrr2::rust::cx;
     let x = @();
     x.cx();
     let y = ();