Skip to content

Commit

Permalink
Use new inner attribute syntax in test framework
Browse files Browse the repository at this point in the history
  • Loading branch information
sfackler committed Mar 29, 2014
1 parent 3eb3a02 commit 9ed33c0
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions src/librustc/front/test.rs
Original file line number Diff line number Diff line change
Expand Up @@ -282,7 +282,7 @@ fn add_test_module(cx: &TestCtxt, m: &ast::Mod) -> ast::Mod {
We're going to be building a module that looks more or less like:
mod __test {
#[!resolve_unexported]
#![!resolve_unexported]
extern crate test (name = "test", vers = "...");
fn main() {
test::test_main_static(::os::args(), tests)
Expand Down Expand Up @@ -326,8 +326,8 @@ fn mk_test_module(cx: &TestCtxt) -> @ast::Item {
// with our list of tests
let mainfn = (quote_item!(&cx.ext_cx,
pub fn main() {
#[allow(deprecated_owned_vector)];
#[main];
#![main]
#![allow(deprecated_owned_vector)]
test::test_main_static(::std::os::args(), TESTS);
}
)).unwrap();
Expand Down

5 comments on commit 9ed33c0

@bors
Copy link
Contributor

@bors bors commented on 9ed33c0 Mar 29, 2014

Choose a reason for hiding this comment

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

saw approval from cmr
at sfackler@9ed33c0

@bors
Copy link
Contributor

@bors bors commented on 9ed33c0 Mar 29, 2014

Choose a reason for hiding this comment

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

merging sfackler/rust/test-attr = 9ed33c0 into auto

@bors
Copy link
Contributor

@bors bors commented on 9ed33c0 Mar 29, 2014

Choose a reason for hiding this comment

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

sfackler/rust/test-attr = 9ed33c0 merged ok, testing candidate = 86890b9

@bors
Copy link
Contributor

@bors bors commented on 9ed33c0 Mar 30, 2014

Choose a reason for hiding this comment

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

@bors
Copy link
Contributor

@bors bors commented on 9ed33c0 Mar 30, 2014

Choose a reason for hiding this comment

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

fast-forwarding master to auto = 86890b9

Please sign in to comment.