---

yaml
---
r: 277531
b: refs/heads/try
c: 1ff1887
h: refs/heads/master
i:
  277529: fbbd37e
  277527: 9365eca

Author: nikomatsakis

[refs]

@@ -1,7 +1,7 @@
 ---
 refs/heads/master: 6dbb0e86aec11050480beb76eade6fb805010ba7
 refs/heads/snap-stage3: 235d77457d80b549dad3ac36d94f235208a1eafb
-refs/heads/try: e416518e6862335a9c99f4c9dfe23192bac3cab8
+refs/heads/try: 1ff1887cc9537cf45c2bc405ce0b026ef9a2246a
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/try/src/libsyntax/ext/expand.rs

@@ -222,7 +222,7 @@ fn expand_mac_invoc<T, F, G>(mac: ast::Mac,
                 pth.span,
                 &format!("macro undefined: '{}!'",
                         &extname));
-            fld.cx.suggest_macro_name(&extname.as_str(), pth.span, &mut err);
+            fld.cx.suggest_macro_name(&extname.as_str(), &mut err);
             err.emit();
 
             // let compilation continue
@@ -355,8 +355,8 @@ fn contains_macro_use(fld: &mut MacroExpander, attrs: &[ast::Attribute]) -> bool
                                         "macro_escape is a deprecated synonym for macro_use");
             is_use = true;
             if let ast::AttrStyle::Inner = attr.node.style {
-                err.fileline_help(attr.span, "consider an outer attribute, \
-                                              #[macro_use] mod ...").emit();
+                err.help("consider an outer attribute, \
+                          #[macro_use] mod ...").emit();
             } else {
                 err.emit();
             }