auto merge of #12896 : alexcrichton/rust/goodbye-extra, r=brson

This commit shreds all remnants of libextra from the compiler and standard
distribution. Two modules, c_vec/tempfile, were moved into libstd after some
cleanup, and the other modules were moved to separate crates as seen fit.

Closes #8784
Closes #12413
Closes #12576

1 files changed, 6 insertions, 6 deletions

diff --git a/src/libtest/lib.rs b/src/libtest/lib.rs
index b4561b3075d..8d573f0dc3e 100644
--- a/src/libtest/lib.rs
+++ b/src/libtest/lib.rs
@@ -29,19 +29,17 @@
 #[crate_type = "rlib"];
 #[crate_type = "dylib"];
 
-#[feature(asm)];
+#[feature(asm, macro_rules)];
 #[allow(deprecated_owned_vector)];
 
 extern crate collections;
-extern crate extra;
 extern crate getopts;
 extern crate serialize;
 extern crate term;
 extern crate time;
 
 use collections::TreeMap;
-use extra::stats::Stats;
-use extra::stats;
+use stats::Stats;
 use time::precise_time_ns;
 use getopts::{OptGroup, optflag, optopt};
 use serialize::{json, Decodable};
@@ -68,9 +66,11 @@ pub mod test {
              MetricChange, Improvement, Regression, LikelyNoise,
              StaticTestFn, StaticTestName, DynTestName, DynTestFn,
              run_test, test_main, test_main_static, filter_tests,
-             parse_opts};
+             parse_opts, StaticBenchFn};
 }
 
+pub mod stats;
+
 // The name of a test. By convention this follows the rules for rust
 // paths; i.e. it should be a series of identifiers separated by double
 // colons. This way if some test runner wants to arrange the tests
@@ -1309,7 +1309,7 @@ mod tests {
                Metric, MetricMap, MetricAdded, MetricRemoved,
                Improvement, Regression, LikelyNoise,
                StaticTestName, DynTestName, DynTestFn};
-    use extra::tempfile::TempDir;
+    use std::io::TempDir;
 
     #[test]
     pub fn do_not_run_ignored_tests() {