Skip to content

Commit

Permalink
Auto merge of #31707 - GuillaumeGomez:macro_name, r=sfackler
Browse files Browse the repository at this point in the history
I'm wondering if instead of a second help message, a note would be better. I let it up to reviewers.
  • Loading branch information
bors committed Feb 17, 2016
2 parents 2051a92 + eca0ab2 commit 4d3eebf
Show file tree
Hide file tree
Showing 2 changed files with 31 additions and 1 deletion.
7 changes: 6 additions & 1 deletion src/libsyntax/ext/base.rs
Original file line number Diff line number Diff line change
Expand Up @@ -760,7 +760,12 @@ impl<'a> ExtCtxt<'a> {
err: &mut DiagnosticBuilder<'a>) {
let names = &self.syntax_env.names;
if let Some(suggestion) = find_best_match_for_name(names.iter(), name, None) {
err.fileline_help(span, &format!("did you mean `{}!`?", suggestion));
if suggestion != name {
err.fileline_help(span, &format!("did you mean `{}!`?", suggestion));
} else {
err.fileline_help(span, &format!("have you added the `#[macro_use]` on the \
module/import?"));
}
}
}
}
Expand Down
25 changes: 25 additions & 0 deletions src/test/compile-fail/macro_undefined.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
// Copyright 2014 The Rust Project Developers. See the COPYRIGHT
// file at the top-level directory of this distribution and at
// http://rust-lang.org/COPYRIGHT.
//
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
// option. This file may not be copied, modified, or distributed
// except according to those terms.

// Test macro_undefined issue

mod m {
#[macro_export]
macro_rules! kl {
() => ()
}
}

fn main() {
k!(); //~ ERROR macro undefined: 'k!'
//~^ HELP did you mean `kl!`?
kl!(); //~ ERROR macro undefined: 'kl!'
//~^ HELP have you added the `#[macro_use]` on the module/import?
}

0 comments on commit 4d3eebf

Please sign in to comment.