about summary refs log tree commit diff
diff options
context:
space:
mode:
authorTim Neumann <mail@timnn.me>2016-09-26 17:21:45 +0200
committerTim Neumann <mail@timnn.me>2016-09-26 17:21:45 +0200
commitf0e1738e5188b53d6af809481bea58f578bfdbe2 (patch)
tree5a79373bc614f4e86935aa316064a3bcc1224a58
parentcf1fc2ce13793290240374f1e49613a5b8ce598c (diff)
downloadrust-f0e1738e5188b53d6af809481bea58f578bfdbe2.tar.gz
rust-f0e1738e5188b53d6af809481bea58f578bfdbe2.zip
fix rebase fallout
-rw-r--r--src/librustc_resolve/macros.rs4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/librustc_resolve/macros.rs b/src/librustc_resolve/macros.rs
index 37cb2861c1c..9240c35bfe4 100644
--- a/src/librustc_resolve/macros.rs
+++ b/src/librustc_resolve/macros.rs
@@ -146,9 +146,9 @@ impl<'a> Resolver<'a> {
 
     fn insert_custom_derive(&mut self, name: &str, ext: Rc<MultiItemModifier>, sp: Span) {
         if !self.session.features.borrow().rustc_macro {
-            let diagnostic = &self.session.parse_sess.span_diagnostic;
+            let sess = &self.session.parse_sess;
             let msg = "loading custom derive macro crates is experimentally supported";
-            emit_feature_err(diagnostic, "rustc_macro", sp, feature_gate::GateIssue::Language, msg);
+            emit_feature_err(sess, "rustc_macro", sp, feature_gate::GateIssue::Language, msg);
         }
         if self.derive_modes.insert(token::intern(name), ext).is_some() {
             self.session.span_err(sp, &format!("cannot shadow existing derive mode `{}`", name));