Skip to content

Commit

Permalink
Rollup merge of #22977 - kmcallister:issue-15778, r=sfackler
Browse files Browse the repository at this point in the history
 Fixes #15778.

r? @sfackler
  • Loading branch information
Manishearth committed Mar 3, 2015
2 parents 394a9c5 + daef3b9 commit 2e15a7d
Show file tree
Hide file tree
Showing 3 changed files with 80 additions and 0 deletions.
43 changes: 43 additions & 0 deletions src/test/auxiliary/lint_for_crate.rs
@@ -0,0 +1,43 @@
// Copyright 2015 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.

// force-host

#![feature(plugin_registrar)]
#![feature(box_syntax)]

extern crate syntax;
#[macro_use] extern crate rustc;

use syntax::{ast, attr};
use rustc::lint::{Context, LintPass, LintPassObject, LintArray};
use rustc::plugin::Registry;

declare_lint!(CRATE_NOT_OKAY, Warn, "crate not marked with #![crate_okay]");

struct Pass;

impl LintPass for Pass {
fn get_lints(&self) -> LintArray {
lint_array!(CRATE_NOT_OKAY)
}

fn check_crate(&mut self, cx: &Context, krate: &ast::Crate) {
if !attr::contains_name(&krate.attrs, "crate_okay") {
cx.span_lint(CRATE_NOT_OKAY, krate.span,
"crate is not marked with #![crate_okay]");
}
}
}

#[plugin_registrar]
pub fn plugin_registrar(reg: &mut Registry) {
reg.register_lint_pass(box Pass as LintPassObject);
}
18 changes: 18 additions & 0 deletions src/test/compile-fail-fulldeps/issue-15778-fail.rs
@@ -0,0 +1,18 @@
// Copyright 2015 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.

// aux-build:lint_for_crate.rs
// ignore-stage1
// compile-flags: -D crate-not-okay

#![feature(plugin, custom_attribute)] //~ ERROR crate is not marked with #![crate_okay]
#![plugin(lint_for_crate)]

pub fn main() { }
19 changes: 19 additions & 0 deletions src/test/run-pass-fulldeps/issue-15778-pass.rs
@@ -0,0 +1,19 @@
// Copyright 2015 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.

// aux-build:lint_for_crate.rs
// ignore-stage1
// compile-flags: -D crate-not-okay

#![feature(plugin, custom_attribute)]
#![plugin(lint_for_crate)]
#![crate_okay]

pub fn main() { }

0 comments on commit 2e15a7d

Please sign in to comment.