From c55320a3db854089442f36a3cd6cb5ef4bbae2c6 Mon Sep 17 00:00:00 2001
From: Scott Olson <scott@solson.me>
Date: Wed, 6 Apr 2016 19:00:34 -0600
Subject: [PATCH] Update for changes in rustc master.

---
 src/interpreter.rs | 2 +-
 src/lib.rs         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/interpreter.rs b/src/interpreter.rs
index 58a27a46f879..9a03d9c44dfd 100644
--- a/src/interpreter.rs
+++ b/src/interpreter.rs
@@ -1179,7 +1179,7 @@ pub fn get_impl_method<'tcx>(
             }
         }
         None => {
-            tcx.sess.bug(&format!("method {:?} not found in {:?}", name, impl_def_id))
+            bug!("method {:?} not found in {:?}", name, impl_def_id);
         }
     }
 }
diff --git a/src/lib.rs b/src/lib.rs
index ebbeff6d95d4..46b23b589971 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -2,7 +2,7 @@
 
 // From rustc.
 extern crate arena;
-extern crate rustc;
+#[macro_use] extern crate rustc;
 extern crate rustc_data_structures;
 extern crate rustc_mir;
 extern crate syntax;