From 2ba5fac1a460de9936b85f9459668b0992f21f06 Mon Sep 17 00:00:00 2001 From: Niko Matsakis Date: Fri, 29 Apr 2016 18:08:02 -0400 Subject: fix rebase flaws --- src/libsyntax_ext/deriving/mod.rs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/libsyntax_ext/deriving') diff --git a/src/libsyntax_ext/deriving/mod.rs b/src/libsyntax_ext/deriving/mod.rs index 4ca3196b9c5..91c272c59c4 100644 --- a/src/libsyntax_ext/deriving/mod.rs +++ b/src/libsyntax_ext/deriving/mod.rs @@ -204,9 +204,9 @@ macro_rules! derive_traits { sp, feature_gate::EXPLAIN_DERIVE_UNDERSCORE, ); if option_env!("CFG_DISABLE_UNSTABLE_FEATURES").is_none() { - w.fileline_help( - sp, &format!("add #![feature(custom_derive)] to \ - the crate attributes to enable") + w.help( + &format!("add #![feature(custom_derive)] to \ + the crate attributes to enable") ); } w.emit(); -- cgit 1.4.1-3-g733a5