Skip to content

Add check on find_best_match_for_name and improve help message for undefined macro #31707

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Feb 18, 2016
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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!`?
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm assuming compiletest can't check help messages? Derp, shouldn't this be checking for the "have you added..." line as well?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I added it afterward and I'm still waiting an opinion on it. But if it's good as it is right now, then yes.

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