about summary refs log tree commit diff
path: root/src/libsyntax_ext
diff options
context:
space:
mode:
authorNiko Matsakis <niko@alum.mit.edu>2016-04-29 18:08:02 -0400
committerNiko Matsakis <niko@alum.mit.edu>2016-05-02 11:49:26 -0400
commit2ba5fac1a460de9936b85f9459668b0992f21f06 (patch)
tree4dbd67a088eb46a03c06dedb2790509ae38a8ccf /src/libsyntax_ext
parent5974e5b294ee3b67054a31eae2a4b9bab950a119 (diff)
downloadrust-2ba5fac1a460de9936b85f9459668b0992f21f06.tar.gz
rust-2ba5fac1a460de9936b85f9459668b0992f21f06.zip
fix rebase flaws
Diffstat (limited to 'src/libsyntax_ext')
-rw-r--r--src/libsyntax_ext/deriving/mod.rs6
1 files changed, 3 insertions, 3 deletions
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();