Move mir-opt tests to toplevel

Cargo.lock

@@ -611,6 +611,7 @@ dependencies = [
  "diff",
  "env_logger 0.7.1",
  "getopts",
+ "glob",
  "lazy_static",
  "libc",
  "log",

fuckyou.rb

@@ -1,7 +0,0 @@
-Dir.glob('src/test/mir-opt/**/*.rs').each do |f|
-  puts f
-  t = File.read(f)
-  b = File.basename(f, ".rs")
-  t.gsub!(/\/\/ EMIT_MIR rustc/, "// EMIT_MIR " + b)
-  File.open(f, "w") { |f| f.puts t }
-end

omg.mir

@@ -1,2 +0,0 @@
-// EMIT_MIR rustc.OMG
-test 123

src/librustc_mir/util/pretty.rs

@@ -197,8 +197,15 @@ fn dump_path(
     };
 
     let file_name = format!(
-        "{}.{}{}{}{}.{}.{}.{}", crate_name,
+        "{}.{}{}{}{}.{}.{}.{}",
-        item_name, shim_disambiguator, promotion_id, pass_num, pass_name, disambiguator, extension,
+        crate_name,
+        item_name,
+        shim_disambiguator,
+        promotion_id,
+        pass_num,
+        pass_name,
+        disambiguator,
+        extension,
     );
 
     file_path.push(&file_name);