fix rebase flaws

2016-04-29 18:08:02 -04:00
parent 5974e5b294
commit 2ba5fac1a4
3 changed files with 6 additions and 8 deletions
--- 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();