Skip to content

Commit a201348

Browse files
Update pretty test for derive attributes
Remove attr-variant-data.rs since it relies on quirks in legacy custom derive resolution (undefined derives only print a warning). Add a new test which uses a defined proc macro derive, and tests pretty printing of proc macro derive attributes.
1 parent fbdd038 commit a201348

File tree

3 files changed

+65
-51
lines changed

3 files changed

+65
-51
lines changed

src/test/pretty/attr-derive.rs

+43
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
// Copyright 2012 The Rust Project Developers. See the COPYRIGHT
2+
// file at the top-level directory of this distribution and at
3+
// http://rust-lang.org/COPYRIGHT.
4+
//
5+
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
6+
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
7+
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
8+
// option. This file may not be copied, modified, or distributed
9+
// except according to those terms.
10+
11+
// aux-build:derive-foo.rs
12+
// ignore-stage1
13+
// pp-exact
14+
// Testing that both the inner item and next outer item are
15+
// preserved, and that the first outer item parsed in main is not
16+
// accidentally carried over to each inner function
17+
18+
#[macro_use]
19+
extern crate derive_foo;
20+
21+
#[derive(Foo)]
22+
struct X;
23+
24+
#[derive(Foo)]
25+
#[Bar]
26+
struct Y;
27+
28+
#[derive(Foo)]
29+
struct WithRef {
30+
x: X,
31+
#[Bar]
32+
y: Y,
33+
}
34+
35+
#[derive(Foo)]
36+
enum Enum {
37+
38+
#[Bar]
39+
Asdf,
40+
Qwerty,
41+
}
42+
43+
fn main() { }

src/test/pretty/attr-variant-data.rs

-51
This file was deleted.
+22
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
// Copyright 2016 The Rust Project Developers. See the COPYRIGHT
2+
// file at the top-level directory of this distribution and at
3+
// http://rust-lang.org/COPYRIGHT.
4+
//
5+
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
6+
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
7+
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
8+
// option. This file may not be copied, modified, or distributed
9+
// except according to those terms.
10+
11+
// no-prefer-dynamic
12+
13+
#![crate_type = "proc-macro"]
14+
15+
extern crate proc_macro;
16+
17+
use proc_macro::TokenStream;
18+
19+
#[proc_macro_derive(Foo, attributes(Bar))]
20+
pub fn derive(input: TokenStream) -> TokenStream {
21+
"".parse().unwrap()
22+
}

0 commit comments

Comments
 (0)