Skip to content

Commit cc1d7f7

Browse files
committed
---
yaml --- r: 272757 b: refs/heads/beta c: 4cffa9b h: refs/heads/master i: 272755: 562dc2a
1 parent 4879ae7 commit cc1d7f7

File tree

4 files changed

+12
-53
lines changed

4 files changed

+12
-53
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ refs/tags/0.9: 36870b185fc5f5486636d4515f0e22677493f225
2323
refs/tags/0.10: ac33f2b15782272ae348dbd7b14b8257b2148b5a
2424
refs/tags/0.11.0: e1247cb1d0d681be034adb4b558b5a0c0d5720f9
2525
refs/tags/0.12.0: f0c419429ef30723ceaf6b42f9b5a2aeb5d2e2d1
26-
refs/heads/beta: c5bdc35b606505940333fc605daae2532ca5710c
26+
refs/heads/beta: 4cffa9b4e3f8a733cf77de844489afa2ccaef5d0
2727
refs/tags/1.0.0-alpha: e42bd6d93a1d3433c486200587f8f9e12590a4d7
2828
refs/heads/tmp: e06d2ad9fcd5027bcaac5b08fc9aa39a49d0ecd3
2929
refs/tags/1.0.0-alpha.2: 4c705f6bc559886632d3871b04f58aab093bfa2f

branches/beta/src/test/compile-fail/coherence-cow-2.rs

Lines changed: 0 additions & 27 deletions
This file was deleted.

branches/beta/src/test/compile-fail/coherence-cow-no-cover.rs

Lines changed: 0 additions & 23 deletions
This file was deleted.

branches/beta/src/test/compile-fail/coherence-cow-1.rs renamed to branches/beta/src/test/compile-fail/coherence-cow.rs

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@
88
// option. This file may not be copied, modified, or distributed
99
// except according to those terms.
1010

11+
// revisions: a b c
12+
1113
// aux-build:coherence_lib.rs
1214

1315
// pretty-expanded FIXME #23616
@@ -22,7 +24,14 @@ use lib::{Remote,Pair};
2224

2325
pub struct Cover<T>(T);
2426

25-
impl<T> Remote for Pair<T,Cover<T>> { }
26-
//~^ ERROR E0210
27+
#[cfg(a)]
28+
impl<T> Remote for Pair<T,Cover<T>> { } //[a]~ ERROR E0210
29+
30+
#[cfg(b)]
31+
impl<T> Remote for Pair<Cover<T>,T> { } //[b]~ ERROR E0210
32+
33+
#[cfg(c)]
34+
impl<T,U> Remote for Pair<Cover<T>,U> { }
35+
//[c]~^ ERROR type parameter `T` must be used as the type parameter for some local type
2736

2837
fn main() { }

0 commit comments

Comments
 (0)