Skip to content

Commit fdd3372

Browse files
committed
---
yaml --- r: 277426 b: refs/heads/try c: 78a8127 h: refs/heads/master
1 parent acbbc1e commit fdd3372

File tree

5 files changed

+71
-1
lines changed

5 files changed

+71
-1
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
refs/heads/master: 6dbb0e86aec11050480beb76eade6fb805010ba7
33
refs/heads/snap-stage3: 235d77457d80b549dad3ac36d94f235208a1eafb
4-
refs/heads/try: 9faf7962cb73e543575c5646c8f010cbd9953e54
4+
refs/heads/try: 78a8127ff0138dbda870e78d68809f455eec5f20
55
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
66
refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
77
refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
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+
#![feature(pub_restricted, type_macros)]
12+
13+
mod foo {
14+
type T = ();
15+
struct S1(pub(foo) (), pub(T), pub(crate) (), pub(((), T)));
16+
struct S2(pub((foo)) ()); //~ ERROR expected one of `+` or `,`, found `(`
17+
//~| ERROR expected one of `+`, `;`, or `where`, found `(`
18+
}
Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
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+
#![feature(pub_restricted, type_macros)]
12+
13+
macro_rules! define_struct {
14+
($t:ty) => {
15+
struct S1(pub $t);
16+
struct S2(pub (foo) ());
17+
struct S3(pub $t ()); //~ ERROR expected one of `+` or `,`, found `(`
18+
//~| ERROR expected one of `+`, `;`, or `where`, found `(`
19+
}
20+
}
21+
22+
mod foo {
23+
define_struct! { (foo) }
24+
}
Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
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+
#![feature(pub_restricted, type_macros)]
12+
13+
macro_rules! define_struct {
14+
($t:ty) => {
15+
struct S1(pub($t));
16+
struct S2(pub (foo) ());
17+
struct S3(pub($t) ()); //~ ERROR expected one of `+` or `,`, found `(`
18+
//~| ERROR expected one of `+`, `;`, or `where`, found `(`
19+
}
20+
}
21+
22+
mod foo {
23+
define_struct! { foo }
24+
}

branches/try/src/test/compile-fail/privacy/restricted/ty-params.rs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,4 +17,8 @@ macro_rules! m {
1717
struct S<T>(T);
1818
m!{ S<u8> } //~ ERROR type or lifetime parameters in visibility path
1919

20+
mod foo {
21+
struct S(pub(foo<T>) ()); //~ ERROR type or lifetime parameters in visibility path
22+
}
23+
2024
fn main() {}

0 commit comments

Comments
 (0)