Skip to content
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

stability lint: ignore code from macro expansion #15726

Merged
merged 1 commit into from
Jul 18, 2014
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
3 changes: 3 additions & 0 deletions src/librustc/lint/builtin.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1433,6 +1433,9 @@ impl LintPass for Stability {
}

fn check_expr(&mut self, cx: &Context, e: &ast::Expr) {
// if the expression was produced by a macro expansion,
if e.span.expn_info.is_some() { return }

let id = match e.node {
ast::ExprPath(..) | ast::ExprStruct(..) => {
match cx.tcx.def_map.borrow().find(&e.id) {
Expand Down
8 changes: 8 additions & 0 deletions src/test/auxiliary/lint_stability.rs
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,9 @@
#![crate_id="lint_stability#0.1"]
#![crate_type = "lib"]

#![feature(macro_rules)]
#![macro_escape]

#[deprecated]
pub fn deprecated() {}
#[deprecated="text"]
Expand Down Expand Up @@ -173,3 +176,8 @@ pub struct StableTupleStruct(pub int);
pub struct FrozenTupleStruct(pub int);
#[locked]
pub struct LockedTupleStruct(pub int);

#[macro_export]
macro_rules! macro_test(
() => (deprecated());
)
11 changes: 9 additions & 2 deletions src/test/compile-fail/lint-stability.rs
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,14 @@
// aux-build:lint_stability.rs
// aux-build:inherited_stability.rs

#![feature(globs)]
#![feature(globs, phase)]
#![deny(unstable)]
#![deny(deprecated)]
#![deny(experimental)]
#![allow(dead_code)]

mod cross_crate {
#[phase(plugin, link)]
extern crate lint_stability;
use self::lint_stability::*;

Expand Down Expand Up @@ -76,7 +77,6 @@ mod cross_crate {
foo.method_locked_text();
foo.trait_locked_text();


let _ = DeprecatedStruct { i: 0 }; //~ ERROR use of deprecated item
let _ = ExperimentalStruct { i: 0 }; //~ ERROR use of experimental item
let _ = UnstableStruct { i: 0 }; //~ ERROR use of unstable item
Expand Down Expand Up @@ -108,6 +108,13 @@ mod cross_crate {
let _ = StableTupleStruct (1);
let _ = FrozenTupleStruct (1);
let _ = LockedTupleStruct (1);

// At the moment, the following just checks that the stability
// level of expanded code does not trigger the
// lint. Eventually, we will want to lint the contents of the
// macro in the module *defining* it. Also, stability levels
// on macros themselves are not yet linted.
macro_test!();
}

fn test_method_param<F: Trait>(foo: F) {
Expand Down