Added stmt_expr_attribute feature gate
This commit is contained in:
parent
c56b47ab8c
commit
296c3613ca
11 changed files with 469 additions and 63 deletions
151
src/test/compile-fail/stmt_expr_attrs_no_feature.rs
Normal file
151
src/test/compile-fail/stmt_expr_attrs_no_feature.rs
Normal file
|
|
@ -0,0 +1,151 @@
|
|||
// 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.
|
||||
|
||||
#![feature(custom_attribute)]
|
||||
#![feature(associated_consts)]
|
||||
|
||||
macro_rules! stmt_mac {
|
||||
() => {
|
||||
fn b() {}
|
||||
}
|
||||
}
|
||||
|
||||
fn main() {
|
||||
#[attr]
|
||||
fn a() {}
|
||||
|
||||
#[attr] //~ ERROR 15701
|
||||
{
|
||||
|
||||
}
|
||||
|
||||
#[attr] //~ ERROR 15701
|
||||
5;
|
||||
|
||||
#[attr] //~ ERROR 15701
|
||||
stmt_mac!();
|
||||
}
|
||||
|
||||
// Check that cfg works right
|
||||
|
||||
#[cfg(unset)]
|
||||
fn c() {
|
||||
#[attr]
|
||||
5;
|
||||
}
|
||||
|
||||
#[cfg(not(unset))]
|
||||
fn j() {
|
||||
#[attr] //~ ERROR 15701
|
||||
5;
|
||||
}
|
||||
|
||||
#[cfg_attr(not(unset), cfg(unset))]
|
||||
fn d() {
|
||||
#[attr]
|
||||
8;
|
||||
}
|
||||
|
||||
#[cfg_attr(not(unset), cfg(not(unset)))]
|
||||
fn i() {
|
||||
#[attr] //~ ERROR 15701
|
||||
8;
|
||||
}
|
||||
|
||||
// check that macro expansion and cfg works right
|
||||
|
||||
macro_rules! item_mac {
|
||||
($e:ident) => {
|
||||
fn $e() {
|
||||
#[attr] //~ ERROR 15701
|
||||
42;
|
||||
|
||||
#[cfg(unset)]
|
||||
fn f() {
|
||||
#[attr]
|
||||
5;
|
||||
}
|
||||
|
||||
#[cfg(not(unset))]
|
||||
fn k() {
|
||||
#[attr] //~ ERROR 15701
|
||||
5;
|
||||
}
|
||||
|
||||
#[cfg_attr(not(unset), cfg(unset))]
|
||||
fn g() {
|
||||
#[attr]
|
||||
8;
|
||||
}
|
||||
|
||||
#[cfg_attr(not(unset), cfg(not(unset)))]
|
||||
fn h() {
|
||||
#[attr] //~ ERROR 15701
|
||||
8;
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
item_mac!(e);
|
||||
|
||||
// check that the gate visitor works right:
|
||||
|
||||
extern {
|
||||
#[cfg(unset)]
|
||||
fn x(a: [u8; #[attr] 5]);
|
||||
fn y(a: [u8; #[attr] 5]); //~ ERROR 15701
|
||||
}
|
||||
|
||||
struct Foo;
|
||||
impl Foo {
|
||||
#[cfg(unset)]
|
||||
const X: u8 = #[attr] 5;
|
||||
const Y: u8 = #[attr] 5; //~ ERROR 15701
|
||||
}
|
||||
|
||||
trait Bar {
|
||||
#[cfg(unset)]
|
||||
const X: [u8; #[attr] 5];
|
||||
const Y: [u8; #[attr] 5]; //~ ERROR 15701
|
||||
}
|
||||
|
||||
struct Joyce {
|
||||
#[cfg(unset)]
|
||||
field: [u8; #[attr] 5],
|
||||
field2: [u8; #[attr] 5] //~ ERROR 15701
|
||||
}
|
||||
|
||||
struct Walky(
|
||||
#[cfg(unset)] [u8; #[attr] 5],
|
||||
[u8; #[attr] 5] //~ ERROR 15701
|
||||
);
|
||||
|
||||
enum Mike {
|
||||
Happy(
|
||||
#[cfg(unset)] [u8; #[attr] 5],
|
||||
[u8; #[attr] 5] //~ ERROR 15701
|
||||
),
|
||||
Angry {
|
||||
#[cfg(unset)]
|
||||
field: [u8; #[attr] 5],
|
||||
field2: [u8; #[attr] 5] //~ ERROR 15701
|
||||
}
|
||||
}
|
||||
|
||||
fn pat() {
|
||||
match 5 {
|
||||
#[cfg(unset)]
|
||||
5 => #[attr] (),
|
||||
6 => #[attr] (), //~ ERROR 15701
|
||||
_ => (),
|
||||
}
|
||||
}
|
||||
|
|
@ -13,6 +13,7 @@
|
|||
#![feature(custom_attribute)]
|
||||
#![feature(box_syntax)]
|
||||
#![feature(placement_in_syntax)]
|
||||
#![feature(stmt_expr_attributes)]
|
||||
|
||||
fn main() { }
|
||||
|
||||
|
|
|
|||
|
|
@ -9,6 +9,7 @@
|
|||
// except according to those terms.
|
||||
|
||||
#![deny(non_snake_case)]
|
||||
#![feature(stmt_expr_attributes)]
|
||||
|
||||
fn main() {
|
||||
let a = 413;
|
||||
|
|
|
|||
22
src/test/run-pass/stmt_expr_attr_macro_parse.rs
Normal file
22
src/test/run-pass/stmt_expr_attr_macro_parse.rs
Normal file
|
|
@ -0,0 +1,22 @@
|
|||
// 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.
|
||||
|
||||
macro_rules! m {
|
||||
($e:expr) => {
|
||||
"expr includes attr"
|
||||
};
|
||||
(#[$attr:meta] $e:expr) => {
|
||||
"expr excludes attr"
|
||||
}
|
||||
}
|
||||
|
||||
fn main() {
|
||||
assert_eq!(m!(#[attr] 1 + 1), "expr includes attr");
|
||||
}
|
||||
Loading…
Add table
Add a link
Reference in a new issue